tqt
/
Ghost-Admin
mirror of https://github.com/TryGhost/Ghost-Admin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed staff tests 

- fixed all staff related tests after Admin route restructure
This commit is contained in:
Peter Zimon 2021-11-04 09:40:24 +01:00
parent 031032d110
commit 4f799e4c81
17 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/gh-nav-menu/footer.hbs
View File

@ -32,7 +32,7 @@
</LinkTo>
</li>
<li role="presentation">
<LinkTo @route="staff.user" @model={{this.session.user.slug}} @classNames="dropdown-item" @role="menuitem" @tabindex="-1" data-test-nav="user-profile">
<LinkTo @route="settings.staff.user" @model={{this.session.user.slug}} @classNames="dropdown-item" @role="menuitem" @tabindex="-1" data-test-nav="user-profile">
Your profile
</LinkTo>
</li>

2
app/components/gh-search-input.js
View File

@ -97,7 +97,7 @@ export default Component.extend({
if (selected.category === 'Users') {
let id = selected.id.replace('user.', '');
this.router.transitionTo('staff.user', id);
this.router.transitionTo('settings.staff.user', id);
}
if (selected.category === 'Tags') {

2
app/controllers/settings/staff/user.js
View File

@ -398,7 +398,7 @@ export default Controller.extend({
this.notifications.closeAlerts('user.delete');
this.store.unloadAll('post');
this.transitionToRoute('staff');
this.transitionToRoute('settings.staff');
} catch (error) {
this.notifications.showAlert('The user could not be deleted. Please try again.', {type: 'error', key: 'user.delete.failed'});
throw error;

2
app/controllers/staff/user.js
View File

@ -398,7 +398,7 @@ export default Controller.extend({
this.notifications.closeAlerts('user.delete');
this.store.unloadAll('post');
this.transitionToRoute('staff');
this.transitionToRoute('settings.staff');
} catch (error) {
this.notifications.showAlert('The user could not be deleted. Please try again.', {type: 'error', key: 'user.delete.failed'});
throw error;

4
app/mixins/current-user-settings.js
View File

@ -3,13 +3,13 @@ import Mixin from '@ember/object/mixin';
export default Mixin.create({
transitionAuthor(user) {
if (user.isAuthorOrContributor) {
return this.transitionTo('staff.user', user);
return this.transitionTo('settings.staff.user', user);
}
},
transitionEditor(user) {
if (user.isEditor) {
return this.transitionTo('staff');
return this.transitionTo('settings.staff');
}
}
});

2
tests/acceptance/authentication-test.js
View File

@ -56,7 +56,7 @@ describe('Acceptance: Authentication', function () {
}));
await authenticateSession();
await visit('/staff');
await visit('/settings/staff');
// running `visit(url)` inside windowProxy.replaceLocation breaks
// the async behaviour so we need to run `visit` here to simulate

10
tests/acceptance/settings/amp-test.js
View File

@ -29,7 +29,7 @@ describe('Acceptance: Settings - Integrations - AMP', function () {
await authenticateSession();
await visit('/integrations/amp');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects to staff page when authenticated as author', async function () {
@ -39,7 +39,7 @@ describe('Acceptance: Settings - Integrations - AMP', function () {
await authenticateSession();
await visit('/integrations/amp');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects to staff page when authenticated as editor', async function () {
@ -49,7 +49,7 @@ describe('Acceptance: Settings - Integrations - AMP', function () {
await authenticateSession();
await visit('/integrations/amp');
expect(currentURL(), 'currentURL').to.equal('/staff');
expect(currentURL(), 'currentURL').to.equal('/settings/staff');
});
describe('when logged in', function () {
@ -110,14 +110,14 @@ describe('Acceptance: Settings - Integrations - AMP', function () {
expect(find('[data-test-amp-checkbox]').checked, 'AMP checkbox after click').to.be.false;
await visit('/staff');
await visit('/settings/staff');
expect(findAll('.fullscreen-modal').length, 'unsaved changes modal exists').to.equal(1);
// Leave without saving
await click('.fullscreen-modal [data-test-leave-button]');
expect(currentURL(), 'currentURL after leave without saving').to.equal('/staff');
expect(currentURL(), 'currentURL after leave without saving').to.equal('/settings/staff');
await visit('/integrations/amp');

6
tests/acceptance/settings/code-injection-test.js
View File

@ -29,7 +29,7 @@ describe('Acceptance: Settings - Code-Injection', function () {
await authenticateSession();
await visit('/settings/code-injection');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects to staff page when authenticated as author', async function () {
@ -39,7 +39,7 @@ describe('Acceptance: Settings - Code-Injection', function () {
await authenticateSession();
await visit('/settings/code-injection');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects to staff page when authenticated as editor', async function () {
@ -49,7 +49,7 @@ describe('Acceptance: Settings - Code-Injection', function () {
await authenticateSession();
await visit('/settings/code-injection');
expect(currentURL(), 'currentURL').to.equal('/staff');
expect(currentURL(), 'currentURL').to.equal('/settings/staff');
});
describe('when logged in', function () {

6
tests/acceptance/settings/general-test.js
View File

@ -25,7 +25,7 @@ describe('Acceptance: Settings - General', function () {
await authenticateSession();
await visit('/settings/general');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects to staff page when authenticated as author', async function () {
@ -35,7 +35,7 @@ describe('Acceptance: Settings - General', function () {
await authenticateSession();
await visit('/settings/general');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects to staff page when authenticated as editor', async function () {
@ -45,7 +45,7 @@ describe('Acceptance: Settings - General', function () {
await authenticateSession();
await visit('/settings/general');
expect(currentURL(), 'currentURL').to.equal('/staff');
expect(currentURL(), 'currentURL').to.equal('/settings/staff');
});
describe('when logged in', function () {

12
tests/acceptance/settings/integrations-test.js
View File

@ -29,7 +29,7 @@ describe('Acceptance: Settings - Integrations - Custom', function () {
await authenticateSession();
await visit('/integrations');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects /integrations/ to staff page when authenticated as author', async function () {
@ -39,7 +39,7 @@ describe('Acceptance: Settings - Integrations - Custom', function () {
await authenticateSession();
await visit('/integrations');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects /integrations/ to staff page when authenticated as editor', async function () {
@ -49,7 +49,7 @@ describe('Acceptance: Settings - Integrations - Custom', function () {
await authenticateSession();
await visit('/integrations/1');
expect(currentURL(), 'currentURL').to.equal('/staff');
expect(currentURL(), 'currentURL').to.equal('/settings/staff');
});
it('redirects /integrations/:id/ to signin when not authenticated', async function () {
@ -66,7 +66,7 @@ describe('Acceptance: Settings - Integrations - Custom', function () {
await authenticateSession();
await visit('/integrations/1');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects /integrations/:id/ to staff page when authenticated as author', async function () {
@ -76,7 +76,7 @@ describe('Acceptance: Settings - Integrations - Custom', function () {
await authenticateSession();
await visit('/integrations/1');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects /integrations/:id/ to staff page when authenticated as editor', async function () {
@ -86,7 +86,7 @@ describe('Acceptance: Settings - Integrations - Custom', function () {
await authenticateSession();
await visit('/integrations/1');
expect(currentURL(), 'currentURL').to.equal('/staff');
expect(currentURL(), 'currentURL').to.equal('/settings/staff');
});
});

6
tests/acceptance/settings/labs-test.js
View File

@ -27,7 +27,7 @@ describe('Acceptance: Settings - Labs', function () {
await authenticateSession();
await visit('/settings/labs');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects to staff page when authenticated as author', async function () {
@ -37,7 +37,7 @@ describe('Acceptance: Settings - Labs', function () {
await authenticateSession();
await visit('/settings/labs');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects to staff page when authenticated as editor', async function () {
@ -47,7 +47,7 @@ describe('Acceptance: Settings - Labs', function () {
await authenticateSession();
await visit('/settings/labs');
expect(currentURL(), 'currentURL').to.equal('/staff');
expect(currentURL(), 'currentURL').to.equal('/settings/staff');
});
describe('when logged in', function () {

6
tests/acceptance/settings/slack-test.js
View File

@ -26,7 +26,7 @@ describe('Acceptance: Settings - Integrations - Slack', function () {
await authenticateSession();
await visit('/integrations/slack');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects to staff page when authenticated as author', async function () {
@ -36,7 +36,7 @@ describe('Acceptance: Settings - Integrations - Slack', function () {
await authenticateSession();
await visit('/integrations/slack');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects to staff page when authenticated as editor', async function () {
@ -46,7 +46,7 @@ describe('Acceptance: Settings - Integrations - Slack', function () {
await authenticateSession();
await visit('/integrations/slack');
expect(currentURL(), 'currentURL').to.equal('/staff');
expect(currentURL(), 'currentURL').to.equal('/settings/staff');
});
describe('when logged in', function () {

4
tests/acceptance/settings/tags-test.js
View File

@ -56,7 +56,7 @@ describe.skip('Acceptance: Tags', function () {
await authenticateSession();
await visit('/settings/design');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects to staff page when authenticated as author', async function () {
@ -66,7 +66,7 @@ describe.skip('Acceptance: Tags', function () {
await authenticateSession();
await visit('/settings/design');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
describe('when logged in', function () {

4
tests/acceptance/settings/theme-test.js
View File

@ -28,7 +28,7 @@ describe.skip('Acceptance: Settings - Theme', function () {
await authenticateSession();
await visit('/settings/theme');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects to staff page when authenticated as author', async function () {
@ -38,7 +38,7 @@ describe.skip('Acceptance: Settings - Theme', function () {
await authenticateSession();
await visit('/settings/theme');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
describe('when logged in', function () {

6
tests/acceptance/settings/unsplash-test.js
View File

@ -29,7 +29,7 @@ describe('Acceptance: Settings - Integrations - Unsplash', function () {
await authenticateSession();
await visit('/integrations/unsplash');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects to staff page when authenticated as author', async function () {
@ -39,7 +39,7 @@ describe('Acceptance: Settings - Integrations - Unsplash', function () {
await authenticateSession();
await visit('/integrations/unsplash');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects to staff page when authenticated as editor', async function () {
@ -49,7 +49,7 @@ describe('Acceptance: Settings - Integrations - Unsplash', function () {
await authenticateSession();
await visit('/integrations/unsplash');
expect(currentURL(), 'currentURL').to.equal('/staff');
expect(currentURL(), 'currentURL').to.equal('/settings/staff');
});
describe('when logged in', function () {

6
tests/acceptance/settings/zapier-test.js
View File

@ -28,7 +28,7 @@ describe('Acceptance: Settings - Integrations - Zapier', function () {
await authenticateSession();
await visit('/integrations/zapier');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects to staff page when authenticated as author', async function () {
@ -38,7 +38,7 @@ describe('Acceptance: Settings - Integrations - Zapier', function () {
await authenticateSession();
await visit('/integrations/zapier');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects to staff page when authenticated as editor', async function () {
@ -48,7 +48,7 @@ describe('Acceptance: Settings - Integrations - Zapier', function () {
await authenticateSession();
await visit('/integrations/zapier');
expect(currentURL(), 'currentURL').to.equal('/staff');
expect(currentURL(), 'currentURL').to.equal('/settings/staff');
});
describe('when logged in', function () {

56
tests/acceptance/staff-test.js
View File

@ -27,7 +27,7 @@ describe('Acceptance: Staff', function () {
it('redirects to signin when not authenticated', async function () {
await invalidateSession();
await visit('/staff');
await visit('/settings/staff');
expect(currentURL()).to.equal('/signin');
});
@ -39,9 +39,9 @@ describe('Acceptance: Staff', function () {
this.server.create('user', {slug: 'no-access'});
await authenticateSession();
await visit('/staff/no-access');
await visit('/settings/staff/no-access');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects correctly when authenticated as author', async function () {
@ -51,9 +51,9 @@ describe('Acceptance: Staff', function () {
this.server.create('user', {slug: 'no-access'});
await authenticateSession();
await visit('/staff/no-access');
await visit('/settings/staff/no-access');
expect(currentURL(), 'currentURL').to.equal('/staff/test-user');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-user');
});
it('redirects correctly when authenticated as editor', async function () {
@ -63,9 +63,9 @@ describe('Acceptance: Staff', function () {
this.server.create('user', {slug: 'no-access'});
await authenticateSession();
await visit('/staff/no-access');
await visit('/settings/staff/no-access');
expect(currentURL(), 'currentURL').to.equal('/staff');
expect(currentURL(), 'currentURL').to.equal('/settings/staff');
});
describe('when logged in as admin', function () {
@ -90,10 +90,10 @@ describe('Acceptance: Staff', function () {
let user1 = this.server.create('user');
let user2 = this.server.create('user');
await visit('/staff');
await visit('/settings/staff');
// doesn't do any redirecting
expect(currentURL(), 'currentURL').to.equal('/staff');
expect(currentURL(), 'currentURL').to.equal('/settings/staff');
// it has correct page title
expect(document.title, 'page title').to.equal('Staff - Test Blog');
@ -125,25 +125,25 @@ describe('Acceptance: Staff', function () {
await click(`[data-test-user-id="${user2.id}"]`);
// url is correct
expect(currentURL(), 'url after clicking user').to.equal(`/staff/${user2.slug}`);
expect(currentURL(), 'url after clicking user').to.equal(`/settings/staff/${user2.slug}`);
// title is correct
expect(document.title, 'title after clicking user').to.equal('Staff - User - Test Blog');
// view title should exist and be linkable and active
expect(
find('[data-test-screen-title] a[href="/ghost/staff"]').classList.contains('active'),
find('[data-test-screen-title] a[href="/ghost/settings/staff"]').classList.contains('active'),
'has linkable url back to staff main page'
).to.be.true;
await click('[data-test-screen-title] a');
// url should be /staff again
expect(currentURL(), 'url after clicking back').to.equal('/staff');
expect(currentURL(), 'url after clicking back').to.equal('/settings');
});
it('can manage invites', async function () {
await visit('/staff');
await visit('/settings/staff');
// invite user button exists
expect(
@ -358,7 +358,7 @@ describe('Acceptance: Staff', function () {
});
it('can manage suspended users', async function () {
await visit('/staff');
await visit('/settings/staff');
await click(`[data-test-user-id="${suspendedUser.id}"]`);
expect(find('[data-test-suspended-badge]')).to.exist;
@ -403,7 +403,7 @@ describe('Acceptance: Staff', function () {
user2.posts = [post];
user2.save();
await visit('/staff');
await visit('/settings/staff');
await click(`[data-test-user-id="${user1.id}"]`);
// user deletion displays modal
@ -427,7 +427,7 @@ describe('Acceptance: Staff', function () {
).to.be.true;
// deleting a user with posts
await visit('/staff');
await visit('/settings/staff');
await click(`[data-test-user-id="${user2.id}"]`);
await click('button.delete');
@ -439,7 +439,7 @@ describe('Acceptance: Staff', function () {
await click('[data-test-button="confirm-delete-user"]');
// redirected to staff page
expect(currentURL()).to.equal('/staff');
expect(currentURL()).to.equal('/settings/staff');
// deleted user is not in list
expect(
@ -472,9 +472,9 @@ describe('Acceptance: Staff', function () {
it('input fields reset and validate correctly', async function () {
// test user name
await visit('/staff/test-1');
await visit('/settings/staff/test-1');
expect(currentURL(), 'currentURL').to.equal('/staff/test-1');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-1');
expect(find('[data-test-name-input]').value, 'current user name').to.equal('Test User');
expect(find('[data-test-save-button]').textContent.trim(), 'save button text').to.equal('Save');
@ -785,9 +785,9 @@ describe('Acceptance: Staff', function () {
});
it('warns when leaving without saving', async function () {
await visit('/staff/test-1');
await visit('/settings/staff/test-1');
expect(currentURL(), 'currentURL').to.equal('/staff/test-1');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-1');
await fillIn('[data-test-slug-input]', 'another slug');
await blur('[data-test-slug-input]');
@ -808,9 +808,9 @@ describe('Acceptance: Staff', function () {
expect(currentURL(), 'currentURL').to.equal('/settings/staff');
await visit('/staff/test-1');
await visit('/settings/staff/test-1');
expect(currentURL(), 'currentURL').to.equal('/staff/test-1');
expect(currentURL(), 'currentURL').to.equal('/settings/staff/test-1');
// settings were not saved
expect(find('[data-test-slug-input]').value).to.be.equal('test-1');
@ -820,7 +820,7 @@ describe('Acceptance: Staff', function () {
describe('own user', function () {
it('requires current password when changing password', async function () {
await visit(`/staff/${admin.slug}`);
await visit(`/settings/staff/${admin.slug}`);
// test the "old password" field is validated
await click('[data-test-save-pw-button]');
@ -863,10 +863,10 @@ describe('Acceptance: Staff', function () {
return new Response(404, {'Content-Type': 'application/json'}, {errors: [{message: 'User not found.', type: 'NotFoundError'}]});
});
await visit('/staff/unknown');
await visit('/settings/staff/unknown');
expect(currentRouteName()).to.equal('error404');
expect(currentURL()).to.equal('/staff/unknown');
expect(currentURL()).to.equal('/settings/staff/unknown');
});
});
@ -894,9 +894,9 @@ describe('Acceptance: Staff', function () {
this.server.create('user', {roles: [adminRole]});
this.server.create('invite', {role: authorRole});
await visit('/staff');
await visit('/settings/staff');
expect(currentRouteName()).to.equal('staff.index');
expect(currentRouteName()).to.equal('settings.staff.index');
expect(findAll('.gh-alert').length).to.equal(0);
});
});