Currently when a user clicks on an edit notification, we use `appEvents` to
notify the topics controller that it should open up the history modal for the
edited post and the appEvents callback opens up the history modal in the next
Ember runloop (by scheduling an `afterRender` callback).
There are 2 problems with this implementation:
1) the callbacks are fired/executed too early and if the post has never been
loaded from the server (i.e. not in cache), we will not get a modal history
because the method that shows the modal `return`s if it can't find the post:
016efeadf6/app/assets/javascripts/discourse/app/controllers/topic.js (L145-L152)
2) when clicking an edit notification from a non-topic page, you're redirected
to the topic page that contains the edited post and you'll see the history
modal briefly and it'll be closed immediately. The reason for this is because
we attempt to show the history modal before the route transition finishes
completely, and we have cleanup code in `initializers/page-tracking.js` that's
called after every transition and it does several things one of which is
closing any open modals.
The fix in this commit defers showing the history modal until posts are loaded
(whether fresh or cached). It works by storing some bits of information (topic
id, post number, revision number) whenever the user clicks on an edit
notification, and when the user is redirected to the topic (or scrolled to the
edited post if they're already in the topic), the post stream model checks if
we have stored information of an edit notification and requests the history
modal to be shown by the topics controller.
134 lines
3.9 KiB
JavaScript
134 lines
3.9 KiB
JavaScript
import {
|
|
acceptance,
|
|
exists,
|
|
query,
|
|
queryAll,
|
|
} from "discourse/tests/helpers/qunit-helpers";
|
|
import { click, currentRouteName, visit } from "@ember/test-helpers";
|
|
import { test } from "qunit";
|
|
|
|
acceptance("User Routes", function (needs) {
|
|
needs.user();
|
|
|
|
needs.pretender((server, helper) => {
|
|
server.get("/u/eviltrout%2F..%2F..%2F.json", () =>
|
|
helper.response(400, {})
|
|
);
|
|
});
|
|
test("Invalid usernames", async function (assert) {
|
|
try {
|
|
await visit("/u/eviltrout%2F..%2F..%2F/summary");
|
|
} catch (e) {
|
|
if (e.message !== "TransitionAborted") {
|
|
throw e;
|
|
}
|
|
}
|
|
|
|
assert.equal(currentRouteName(), "exception-unknown");
|
|
});
|
|
|
|
test("Unicode usernames", async function (assert) {
|
|
await visit("/u/%E3%83%A9%E3%82%A4%E3%82%AA%E3%83%B3/summary");
|
|
|
|
assert.equal(currentRouteName(), "user.summary");
|
|
});
|
|
|
|
test("Invites", async function (assert) {
|
|
await visit("/u/eviltrout/invited/pending");
|
|
assert.ok($("body.user-invites-page").length, "has the body class");
|
|
});
|
|
|
|
test("Notifications", async function (assert) {
|
|
await visit("/u/eviltrout/notifications");
|
|
assert.ok($("body.user-notifications-page").length, "has the body class");
|
|
|
|
const $links = queryAll(".item.notification a");
|
|
|
|
assert.ok(
|
|
$links[2].href.includes(
|
|
"/u/eviltrout/notifications/likes-received?acting_username=aquaman"
|
|
)
|
|
);
|
|
});
|
|
|
|
test("Root URL - Viewing Self", async function (assert) {
|
|
await visit("/u/eviltrout");
|
|
assert.ok($("body.user-activity-page").length, "has the body class");
|
|
assert.equal(
|
|
currentRouteName(),
|
|
"userActivity.index",
|
|
"it defaults to activity"
|
|
);
|
|
assert.ok(exists(".container.viewing-self"), "has the viewing-self class");
|
|
});
|
|
|
|
test("Viewing Summary", async function (assert) {
|
|
await visit("/u/eviltrout/summary");
|
|
|
|
assert.ok(exists(".replies-section li a"), "replies");
|
|
assert.ok(exists(".topics-section li a"), "topics");
|
|
assert.ok(exists(".links-section li a"), "links");
|
|
assert.ok(exists(".replied-section .user-info"), "liked by");
|
|
assert.ok(exists(".liked-by-section .user-info"), "liked by");
|
|
assert.ok(exists(".liked-section .user-info"), "liked");
|
|
assert.ok(exists(".badges-section .badge-card"), "badges");
|
|
assert.ok(
|
|
exists(".top-categories-section .category-link"),
|
|
"top categories"
|
|
);
|
|
});
|
|
|
|
test("Viewing Drafts", async function (assert) {
|
|
await visit("/u/eviltrout/activity/drafts");
|
|
assert.ok(exists(".user-stream"), "has drafts stream");
|
|
assert.ok(
|
|
exists(".user-stream .user-stream-item-draft-actions"),
|
|
"has draft action buttons"
|
|
);
|
|
|
|
await click(".user-stream button.resume-draft:nth-of-type(1)");
|
|
assert.ok(
|
|
exists(".d-editor-input"),
|
|
"composer is visible after resuming a draft"
|
|
);
|
|
});
|
|
});
|
|
|
|
acceptance(
|
|
"User Routes - Periods in current user's username",
|
|
function (needs) {
|
|
needs.user({ username: "e.il.rout" });
|
|
|
|
test("Periods in current user's username don't act like wildcards", async function (assert) {
|
|
await visit("/u/eviltrout");
|
|
assert.equal(
|
|
query(".user-profile-names .username").textContent.trim(),
|
|
"eviltrout",
|
|
"eviltrout profile is shown"
|
|
);
|
|
|
|
await visit("/u/e.il.rout");
|
|
assert.equal(
|
|
query(".user-profile-names .username").textContent.trim(),
|
|
"e.il.rout",
|
|
"e.il.rout profile is shown"
|
|
);
|
|
});
|
|
}
|
|
);
|
|
|
|
acceptance("User Routes - Moderator viewing warnings", function (needs) {
|
|
needs.user({
|
|
username: "notEviltrout",
|
|
moderator: true,
|
|
staff: true,
|
|
admin: false,
|
|
});
|
|
|
|
test("Messages - Warnings", async function (assert) {
|
|
await visit("/u/eviltrout/messages/warnings");
|
|
assert.ok($("body.user-messages-page").length, "has the body class");
|
|
assert.ok($("div.alert-info").length, "has the permissions alert");
|
|
});
|
|
});
|