diff --git a/templates/partials/packages/comment_form.html b/templates/partials/packages/comment_form.html
new file mode 100644
index 00000000..c1c25f87
--- /dev/null
+++ b/templates/partials/packages/comment_form.html
@@ -0,0 +1,46 @@
+{# `action` is assigned the proper route to use for the form action.
+When `comment` is provided (PackageComment), we display an edit form
+for the comment. Otherwise, we display a new form.
+
+Routes:
+ new comment - /pkgbase/{name}/comments
+ edit comment - /pkgbase/{name}/comments/{id}
+#}
+{% set action = "/pkgbase/%s/comments" | format(pkgbase.Name) %}
+{% if comment %}
+ {% set action = "/pkgbase/%s/comments/%d" | format(pkgbase.Name, comment.ID) %}
+{% endif %}
+
+
diff --git a/templates/partials/packages/comments.html b/templates/partials/packages/comments.html
index 39cfb363..7c8a32e5 100644
--- a/templates/partials/packages/comments.html
+++ b/templates/partials/packages/comments.html
@@ -8,44 +8,7 @@
{% if request.user.is_authenticated() %}
{% endif %}
@@ -99,29 +62,28 @@ function handleEditCommentClick(event) {
// The div class="article-content" which contains the comment
const edit_form = parent_element.nextElementSibling;
- const params = new URLSearchParams({
- type: "get-comment-form",
- arg: comment_id,
- base_id: {{ pkgbase.ID }},
- pkgbase_name: {{ pkgbase.Name }}
- });
-
- const url = '/rpc?' + params.toString();
+ const url = "/pkgbase/{{ pkgbase.Name }}/comments/" + comment_id + "/form";
add_busy_indicator(event.target);
fetch(url, {
- method: 'GET'
+ method: 'GET',
+ credentials: 'same-origin'
+ })
+ .then(function(response) {
+ if (!response.ok) {
+ throw Error(response.statusText);
+ }
+ return response.json();
})
- .then(function(response) { return response.json(); })
.then(function(data) {
remove_busy_indicator(event.target);
- if (data.success) {
- edit_form.innerHTML = data.form;
- edit_form.querySelector('textarea').focus();
- } else {
- alert(data.error);
- }
+ edit_form.innerHTML = data.form;
+ edit_form.querySelector('textarea').focus();
+ })
+ .catch(function(error) {
+ remove_busy_indicator(event.target);
+ console.error(error);
});
}
diff --git a/test/test_packages_routes.py b/test/test_packages_routes.py
index 2190dc18..1bfa5fc0 100644
--- a/test/test_packages_routes.py
+++ b/test/test_packages_routes.py
@@ -73,6 +73,7 @@ def setup():
PackageVote.__tablename__,
PackageNotification.__tablename__,
PackageComaintainer.__tablename__,
+ PackageComment.__tablename__,
OfficialProvider.__tablename__
)
@@ -930,3 +931,135 @@ def test_pkgbase_voters(client: TestClient, maintainer: User, package: Package):
root = parse_root(resp.text)
rows = root.xpath('//div[@class="box"]//ul/li')
assert len(rows) == 1
+
+
+def test_pkgbase_comment_not_found(client: TestClient, maintainer: User,
+ package: Package):
+ cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+ comment_id = 12345 # A non-existing comment.
+ endpoint = f"/pkgbase/{package.PackageBase.Name}/comments/{comment_id}"
+ with client as request:
+ resp = request.post(endpoint, data={
+ "comment": "Failure"
+ }, cookies=cookies)
+ assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_pkgbase_comment_form_unauthorized(client: TestClient, user: User,
+ maintainer: User, package: Package):
+ now = int(datetime.utcnow().timestamp())
+ with db.begin():
+ comment = db.create(PackageComment, PackageBase=package.PackageBase,
+ User=maintainer, Comments="Test",
+ RenderedComment=str(), CommentTS=now)
+
+ cookies = {"AURSID": user.login(Request(), "testPassword")}
+ pkgbasename = package.PackageBase.Name
+ endpoint = f"/pkgbase/{pkgbasename}/comments/{comment.ID}/form"
+ with client as request:
+ resp = request.get(endpoint, cookies=cookies)
+ assert resp.status_code == int(HTTPStatus.UNAUTHORIZED)
+
+
+def test_pkgbase_comment_form_not_found(client: TestClient, maintainer: User,
+ package: Package):
+ cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+ comment_id = 12345 # A non-existing comment.
+ pkgbasename = package.PackageBase.Name
+ endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}/form"
+ with client as request:
+ resp = request.get(endpoint, cookies=cookies)
+ assert resp.status_code == int(HTTPStatus.NOT_FOUND)
+
+
+def test_pkgbase_comments_missing_comment(client: TestClient, maintainer: User,
+ package: Package):
+ cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+ endpoint = f"/pkgbase/{package.PackageBase.Name}/comments"
+ with client as request:
+ resp = request.post(endpoint, cookies=cookies)
+ assert resp.status_code == int(HTTPStatus.EXPECTATION_FAILED)
+
+
+def test_pkgbase_comments(client: TestClient, maintainer: User,
+ package: Package):
+ cookies = {"AURSID": maintainer.login(Request(), "testPassword")}
+ pkgbasename = package.PackageBase.Name
+ endpoint = f"/pkgbase/{pkgbasename}/comments"
+ with client as request:
+ resp = request.post(endpoint, data={
+ "comment": "Test comment.",
+ "enable_notifications": True
+ }, cookies=cookies)
+ assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+ expected_prefix = f"/pkgbase/{pkgbasename}"
+ prefix_len = len(expected_prefix)
+ assert resp.headers.get("location")[:prefix_len] == expected_prefix
+
+ with client as request:
+ resp = request.get(resp.headers.get("location"))
+ assert resp.status_code == int(HTTPStatus.OK)
+
+ root = parse_root(resp.text)
+ headers = root.xpath('//h4[@class="comment-header"]')
+ bodies = root.xpath('//div[@class="article-content"]/div/p')
+
+ assert len(headers) == 1
+ assert len(bodies) == 1
+
+ assert bodies[0].text.strip() == "Test comment."
+
+ # Clear up the PackageNotification. This doubles as testing
+ # that the notification was created and clears it up so we can
+ # test enabling it during edit.
+ pkgbase = package.PackageBase
+ db_notif = pkgbase.notifications.filter(
+ PackageNotification.UserID == maintainer.ID
+ ).first()
+ with db.begin():
+ db.session.delete(db_notif)
+
+ # Now, let's edit the comment we just created.
+ comment_id = int(headers[0].attrib["id"].split("-")[-1])
+ endpoint = f"/pkgbase/{pkgbasename}/comments/{comment_id}"
+ with client as request:
+ resp = request.post(endpoint, data={
+ "comment": "Edited comment.",
+ "enable_notifications": True
+ }, cookies=cookies)
+ assert resp.status_code == int(HTTPStatus.SEE_OTHER)
+
+ with client as request:
+ resp = request.get(resp.headers.get("location"))
+ assert resp.status_code == int(HTTPStatus.OK)
+
+ root = parse_root(resp.text)
+ headers = root.xpath('//h4[@class="comment-header"]')
+ bodies = root.xpath('//div[@class="article-content"]/div/p')
+
+ assert len(headers) == 1
+ assert len(bodies) == 1
+
+ assert bodies[0].text.strip() == "Edited comment."
+
+ # Ensure that a notification was created.
+ db_notif = pkgbase.notifications.filter(
+ PackageNotification.UserID == maintainer.ID
+ ).first()
+ assert db_notif is not None
+
+ # Don't supply a comment; should return EXPECTATION_FAILED.
+ with client as request:
+ fail_resp = request.post(endpoint, cookies=cookies)
+ assert fail_resp.status_code == int(HTTPStatus.EXPECTATION_FAILED)
+
+ # Now, test the form route, which should return form markup
+ # via JSON.
+ endpoint = f"{endpoint}/form"
+ with client as request:
+ resp = request.get(endpoint, cookies=cookies)
+ assert resp.status_code == int(HTTPStatus.OK)
+
+ data = resp.json()
+ assert "form" in data
Add Comment
- + {% include "partials/packages/comment_form.html" %}