github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-04 03:26:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Use the correct property for checking if redesigned user menu is enabled (#18394)

Browse Source 
The correct attribute for the new user menu feature flag is `redesigned_user_menu_enabled`, not `enable_redesigned_user_menu`.
This commit is contained in:
Osama Sayegh 2022-09-28 10:50:52 +03:00 committed by GitHub
parent 4b561277a9
commit 51cabf0f26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/initializers/subscribe-user-notifications.js
View File

@ -25,7 +25,7 @@ export default {
const siteSettings = container.lookup("service:site-settings");
if (user) {
const channel = user.enable_redesigned_user_menu
const channel = user.redesigned_user_menu_enabled
? `/reviewable_counts/${user.id}`
: "/reviewable_counts";

2
app/assets/javascripts/discourse/app/routes/review-index.js
View File

@ -65,7 +65,7 @@ export default DiscourseRoute.extend({
}
});
const channel = this.currentUser.enable_redesigned_user_menu
const channel = this.currentUser.redesigned_user_menu_enabled
? `/reviewable_counts/${this.currentUser.id}`
: "/reviewable_counts";

35
app/assets/javascripts/discourse/tests/acceptance/review-test.js
View File

@ -2,8 +2,10 @@ import {
acceptance,
count,
exists,
loggedInUser,
publishToMessageBus,
query,
updateCurrentUser,
visible,
} from "discourse/tests/helpers/qunit-helpers";
import { click, fillIn, visit } from "@ember/test-helpers";
@ -210,7 +212,8 @@ acceptance("Review", function (needs) {
);
});
test("Reviewables can become stale", async function (assert) {
test("Reviewables can become stale when redesigned_user_menu_enabled is false", async function (assert) {
updateCurrentUser({ redesigned_user_menu_enabled: false });
await visit("/review");
const reviewable = query(`[data-reviewable-id="1234"]`);
@ -238,4 +241,34 @@ acceptance("Review", function (needs) {
assert.strictEqual(count(".stale-help"), 0);
});
test("Reviewables can become stale when redesigned_user_menu_enabled is true", async function (assert) {
updateCurrentUser({ redesigned_user_menu_enabled: true });
await visit("/review");
const reviewable = query(`[data-reviewable-id="1234"]`);
assert.notOk(reviewable.className.includes("reviewable-stale"));
assert.strictEqual(
count(`[data-reviewable-id="1234"] .status .pending`),
1
);
assert.ok(!exists(".stale-help"));
await publishToMessageBus(`/reviewable_counts/${loggedInUser().id}`, {
review_count: 1,
updates: {
1234: { last_performing_username: "foo", status: 1 },
},
});
assert.ok(reviewable.className.includes("reviewable-stale"));
assert.strictEqual(count("[data-reviewable-id=1234] .status .approved"), 1);
assert.strictEqual(count(".stale-help"), 1);
assert.ok(query(".stale-help").innerText.includes("foo"));
await visit("/");
await visit("/review"); // reload review
assert.strictEqual(count(".stale-help"), 0);
});
});