From d5018cbb3ad62bab852aa30c207ad765636ac6b8 Mon Sep 17 00:00:00 2001 From: Peter Zimon Date: Wed, 2 Feb 2022 10:57:34 +0100 Subject: [PATCH] Fix tests --- ghost/admin/app/routes/settings/design.js | 11 +++++++++++ ghost/admin/tests/acceptance/settings/amp-test.js | 2 +- .../tests/acceptance/settings/code-injection-test.js | 2 +- ghost/admin/tests/acceptance/settings/general-test.js | 2 +- .../tests/acceptance/settings/integrations-test.js | 4 ++-- ghost/admin/tests/acceptance/settings/labs-test.js | 2 +- ghost/admin/tests/acceptance/settings/slack-test.js | 2 +- .../admin/tests/acceptance/settings/unsplash-test.js | 2 +- ghost/admin/tests/acceptance/settings/zapier-test.js | 2 +- 9 files changed, 20 insertions(+), 9 deletions(-) diff --git a/ghost/admin/app/routes/settings/design.js b/ghost/admin/app/routes/settings/design.js index 7438e0aa60..eb0136f1b5 100644 --- a/ghost/admin/app/routes/settings/design.js +++ b/ghost/admin/app/routes/settings/design.js @@ -8,6 +8,7 @@ export default class SettingsDesignRoute extends AdminRoute { @service settings; @service themeManagement; @service ui; + @service session; model() { // background refresh of preview @@ -22,6 +23,16 @@ export default class SettingsDesignRoute extends AdminRoute { ]); } + beforeModel() { + super.beforeModel(...arguments); + + const user = this.session.user; + + if (!user.isAdmin) { + return this.transitionTo('settings.staff.user', user); + } + } + activate() { this.ui.contextualNavMenu = 'design'; } diff --git a/ghost/admin/tests/acceptance/settings/amp-test.js b/ghost/admin/tests/acceptance/settings/amp-test.js index f1f09ecacf..b74014eb03 100644 --- a/ghost/admin/tests/acceptance/settings/amp-test.js +++ b/ghost/admin/tests/acceptance/settings/amp-test.js @@ -29,7 +29,7 @@ describe('Acceptance: Settings - Integrations - AMP', function () { await authenticateSession(); await visit('/settings/integrations/amp'); - expect(currentURL(), 'currentURL').to.equal('/site'); + expect(currentURL(), 'currentURL').to.equal('/posts'); }); it('redirects to home page when authenticated as author', async function () { diff --git a/ghost/admin/tests/acceptance/settings/code-injection-test.js b/ghost/admin/tests/acceptance/settings/code-injection-test.js index 6cab954461..67e27f431e 100644 --- a/ghost/admin/tests/acceptance/settings/code-injection-test.js +++ b/ghost/admin/tests/acceptance/settings/code-injection-test.js @@ -29,7 +29,7 @@ describe('Acceptance: Settings - Code-Injection', function () { await authenticateSession(); await visit('/settings/code-injection'); - expect(currentURL(), 'currentURL').to.equal('/site'); + expect(currentURL(), 'currentURL').to.equal('/posts'); }); it('redirects to staff page when authenticated as author', async function () { diff --git a/ghost/admin/tests/acceptance/settings/general-test.js b/ghost/admin/tests/acceptance/settings/general-test.js index 2bc1c9b913..fcc40cc339 100644 --- a/ghost/admin/tests/acceptance/settings/general-test.js +++ b/ghost/admin/tests/acceptance/settings/general-test.js @@ -25,7 +25,7 @@ describe('Acceptance: Settings - General', function () { await authenticateSession(); await visit('/settings/general'); - expect(currentURL(), 'currentURL').to.equal('/site'); + expect(currentURL(), 'currentURL').to.equal('/posts'); }); it('redirects to home page when authenticated as author', async function () { diff --git a/ghost/admin/tests/acceptance/settings/integrations-test.js b/ghost/admin/tests/acceptance/settings/integrations-test.js index 723025e574..5ecaf9ff57 100644 --- a/ghost/admin/tests/acceptance/settings/integrations-test.js +++ b/ghost/admin/tests/acceptance/settings/integrations-test.js @@ -29,7 +29,7 @@ describe('Acceptance: Settings - Integrations - Custom', function () { await authenticateSession(); await visit('/settings/integrations'); - expect(currentURL(), 'currentURL').to.equal('/site'); + expect(currentURL(), 'currentURL').to.equal('/posts'); }); it('redirects /integrations/ to home page when authenticated as author', async function () { @@ -66,7 +66,7 @@ describe('Acceptance: Settings - Integrations - Custom', function () { await authenticateSession(); await visit('/settings/integrations/1'); - expect(currentURL(), 'currentURL').to.equal('/site'); + expect(currentURL(), 'currentURL').to.equal('/posts'); }); it('redirects /integrations/:id/ to home page when authenticated as author', async function () { diff --git a/ghost/admin/tests/acceptance/settings/labs-test.js b/ghost/admin/tests/acceptance/settings/labs-test.js index ad84fd7f82..25d6f77ed1 100644 --- a/ghost/admin/tests/acceptance/settings/labs-test.js +++ b/ghost/admin/tests/acceptance/settings/labs-test.js @@ -27,7 +27,7 @@ describe('Acceptance: Settings - Labs', function () { await authenticateSession(); await visit('/settings/labs'); - expect(currentURL(), 'currentURL').to.equal('/site'); + expect(currentURL(), 'currentURL').to.equal('/posts'); }); it('redirects to home page when authenticated as author', async function () { diff --git a/ghost/admin/tests/acceptance/settings/slack-test.js b/ghost/admin/tests/acceptance/settings/slack-test.js index 7bcf36216a..31e89d1d68 100644 --- a/ghost/admin/tests/acceptance/settings/slack-test.js +++ b/ghost/admin/tests/acceptance/settings/slack-test.js @@ -26,7 +26,7 @@ describe('Acceptance: Settings - Integrations - Slack', function () { await authenticateSession(); await visit('/settings/integrations/slack'); - expect(currentURL(), 'currentURL').to.equal('/site'); + expect(currentURL(), 'currentURL').to.equal('/posts'); }); it('redirects to home page when authenticated as author', async function () { diff --git a/ghost/admin/tests/acceptance/settings/unsplash-test.js b/ghost/admin/tests/acceptance/settings/unsplash-test.js index f655e16bd1..5ebfe92f91 100644 --- a/ghost/admin/tests/acceptance/settings/unsplash-test.js +++ b/ghost/admin/tests/acceptance/settings/unsplash-test.js @@ -29,7 +29,7 @@ describe('Acceptance: Settings - Integrations - Unsplash', function () { await authenticateSession(); await visit('/settings/integrations/unsplash'); - expect(currentURL(), 'currentURL').to.equal('/site'); + expect(currentURL(), 'currentURL').to.equal('/posts'); }); it('redirects to home page when authenticated as author', async function () { diff --git a/ghost/admin/tests/acceptance/settings/zapier-test.js b/ghost/admin/tests/acceptance/settings/zapier-test.js index 4dad33f49d..4230fddfc9 100644 --- a/ghost/admin/tests/acceptance/settings/zapier-test.js +++ b/ghost/admin/tests/acceptance/settings/zapier-test.js @@ -28,7 +28,7 @@ describe('Acceptance: Settings - Integrations - Zapier', function () { await authenticateSession(); await visit('/settings/integrations/zapier'); - expect(currentURL(), 'currentURL').to.equal('/site'); + expect(currentURL(), 'currentURL').to.equal('/posts'); }); it('redirects to home page when authenticated as author', async function () {