diff --git a/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js b/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js index f18a630e109..1b7fde0127c 100644 --- a/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js +++ b/app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js @@ -86,9 +86,9 @@ export default { session.darkColorScheme = !window.matchMedia("(prefers-color-scheme: dark)").matches && - getComputedStyle(document.documentElement) - .getPropertyValue("--scheme-type") - .trim() === "dark"; + getComputedStyle(document.documentElement) + .getPropertyValue("--scheme-type") + .trim() === "dark"; session.highlightJsPath = setupData.highlightJsPath; session.svgSpritePath = setupData.svgSpritePath; diff --git a/test/javascripts/acceptance/post-admin-menu-test.js b/test/javascripts/acceptance/post-admin-menu-test.js index c17e96bb7fa..6ca78479884 100644 --- a/test/javascripts/acceptance/post-admin-menu-test.js +++ b/test/javascripts/acceptance/post-admin-menu-test.js @@ -7,8 +7,14 @@ QUnit.test("Enter as a anon user", async assert => { await click(".show-more-actions"); assert.ok(exists("#topic"), "The topic was rendered"); - assert.ok(exists("#post_1 .post-controls .edit"), "The edit button was not rendered"); - assert.ok(!exists(".show-post-admin-menu"), "The wrench button was not rendered"); + assert.ok( + exists("#post_1 .post-controls .edit"), + "The edit button was not rendered" + ); + assert.ok( + !exists(".show-post-admin-menu"), + "The wrench button was not rendered" + ); }); acceptance("Post - Admin Menu", { loggedIn: true }); @@ -18,6 +24,9 @@ QUnit.test("Enter as a user with group moderator permissions", async assert => { await click(".show-more-actions"); await click(".show-post-admin-menu"); - assert.ok(exists("#post_1 .post-controls .edit"), "The edit button was rendered"); + assert.ok( + exists("#post_1 .post-controls .edit"), + "The edit button was rendered" + ); assert.ok(exists(".add-notice"), "The add notice button was rendered"); }); diff --git a/test/javascripts/acceptance/topic-admin-menu-test.js b/test/javascripts/acceptance/topic-admin-menu-test.js index a00a89be629..5244f2d0b7c 100644 --- a/test/javascripts/acceptance/topic-admin-menu-test.js +++ b/test/javascripts/acceptance/topic-admin-menu-test.js @@ -5,10 +5,12 @@ acceptance("Topic - Admin Menu Anonymous Users", { loggedIn: false }); QUnit.test("Enter as a regular user", async assert => { await visit("/t/internationalization-localization/280"); assert.ok(exists("#topic"), "The topic was rendered"); - assert.ok(!exists(".toggle-admin-menu"), "The admin menu button was not rendered"); + assert.ok( + !exists(".toggle-admin-menu"), + "The admin menu button was not rendered" + ); }); - acceptance("Topic - Admin Menu", { loggedIn: true }); QUnit.test("Enter as a user with group moderator permissions", async assert => { @@ -19,10 +21,16 @@ QUnit.test("Enter as a user with group moderator permissions", async assert => { assert.ok(exists(".toggle-admin-menu"), "The admin menu button was rendered"); }); -QUnit.test("Enter as a user with moderator and admin permissions", async assert => { - updateCurrentUser({ moderator: true, admin: true, trust_level: 4 }); +QUnit.test( + "Enter as a user with moderator and admin permissions", + async assert => { + updateCurrentUser({ moderator: true, admin: true, trust_level: 4 }); - await visit("/t/internationalization-localization/280"); - assert.ok(exists("#topic"), "The topic was rendered"); - assert.ok(exists(".toggle-admin-menu"), "The admin menu button was rendered"); -}); + await visit("/t/internationalization-localization/280"); + assert.ok(exists("#topic"), "The topic was rendered"); + assert.ok( + exists(".toggle-admin-menu"), + "The admin menu button was rendered" + ); + } +); diff --git a/test/javascripts/fixtures/group-fixtures.js b/test/javascripts/fixtures/group-fixtures.js index f92cf258f48..2b1b070dc9d 100644 --- a/test/javascripts/fixtures/group-fixtures.js +++ b/test/javascripts/fixtures/group-fixtures.js @@ -1290,7 +1290,7 @@ export default { mentionable: true, messageable: true, can_see_members: true, - can_admin_group: true, + can_admin_group: true }, extras: { visible_group_names: ["alternative-group"] diff --git a/test/javascripts/fixtures/topic.js b/test/javascripts/fixtures/topic.js index 0a39bae2de5..c4ba2e604f0 100644 --- a/test/javascripts/fixtures/topic.js +++ b/test/javascripts/fixtures/topic.js @@ -5085,7 +5085,8 @@ export default { username: "group_moderator", avatar_template: "/images/avatar.png", created_at: "2020-07-24T17:48:55.419Z", - cooked: "
Here is my new topic. I am a group category moderator!
", + cooked: + "Here is my new topic. I am a group category moderator!
", post_number: 1, post_type: 1, updated_at: "2020-07-24T17:48:55.419Z", @@ -5290,18 +5291,9 @@ export default { reviewable_score_pending_count: 0 } ], - stream: [ - 41, - 42, - 43 - ] + stream: [41, 42, 43] }, - timeline_lookup: [ - [ - 1, - 0 - ] - ], + timeline_lookup: [[1, 0]], id: 2480, title: "A Topic with Group Category Moderators", fancy_title: "A Topic with Group Category Moderators",