ic
- {{user.email}}
- {{#if user.pending}}
+ {{invite.email}}
+ {{#if invite.pending}}
Invitation not sent - please try again
{{else}}
- Invitation sent: {{component.createdAtUTC}}
+ Invitation sent: {{component.createdAt}},
+ expires {{component.expiresAt}}
{{/if}}
@@ -46,13 +47,13 @@
{{#if component.isSending}}
Sending Invite...
{{else}}
-
+
Revoke
-
+
Resend
- {{#each user.roles as |role|}}
+ {{#each invite.roles as |role|}}
{{role.name}}
{{/each}}
{{/if}}
@@ -66,7 +67,7 @@
Active users
- {{#each activeUsers key="id" as |user|}}
+ {{#each users key="id" as |user|}}
{{!-- For authors only shows users as a list, otherwise show users with links to user page --}}
{{#unless session.user.isAuthor}}
{{#gh-user-active user=user as |component|}}
diff --git a/ghost/admin/tests/acceptance/setup-test.js b/ghost/admin/tests/acceptance/setup-test.js
index 02cb71121f..df0e3e7c54 100644
--- a/ghost/admin/tests/acceptance/setup-test.js
+++ b/ghost/admin/tests/acceptance/setup-test.js
@@ -266,13 +266,13 @@ describe('Acceptance: Setup', function () {
it('handles validation errors in step 3', function () {
let input = '[name="users"]';
let postCount = 0;
- let button, formGroup, user;
+ let button, formGroup, invite;
invalidateSession(application);
server.loadFixtures('roles');
- server.post('/users', function (db, request) {
- let [params] = JSON.parse(request.requestBody).users;
+ server.post('/invites', function (db, request) {
+ let [params] = JSON.parse(request.requestBody).invites;
postCount++;
@@ -288,10 +288,21 @@ describe('Acceptance: Setup', function () {
});
}
+ // TODO: duplicated from mirage/config/invites - extract method?
+ /* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
+ params.token = `${db.invites.length}-token`;
+ params.expires = moment.utc().add(1, 'day').unix();
+ params.created_at = moment.utc().format();
+ params.created_by = 1;
+ params.updated_at = moment.utc().format();
+ params.updated_by = 1;
+ params.status = 'sent';
+ /* jscs:enable requireCamelCaseOrUpperCaseIdentifiers */
+
// valid
- user = db.users.insert(params);
+ invite = db.invites.insert(params);
return {
- users: [user]
+ invites: [invite]
};
});
diff --git a/ghost/admin/tests/acceptance/team-test.js b/ghost/admin/tests/acceptance/team-test.js
index fcd71d26cc..be24512252 100644
--- a/ghost/admin/tests/acceptance/team-test.js
+++ b/ghost/admin/tests/acceptance/team-test.js
@@ -61,12 +61,12 @@ describe('Acceptance: Team', function () {
});
});
- describe('when logged in', function () {
- let admin;
+ describe('when logged in as admin', function () {
+ let admin, adminRole;
beforeEach(function () {
- let role = server.create('role', {name: 'Administrator'});
- admin = server.create('user', {roles: [role]});
+ adminRole = server.create('role', {name: 'Administrator'});
+ admin = server.create('user', {email: 'admin@example.com', roles: [adminRole]});
server.loadFixtures();
@@ -113,127 +113,242 @@ describe('Acceptance: Team', function () {
});
});
- describe('invite new user', function () {
+ it('can manage invites', function () {
let emailInputField = '.fullscreen-modal input[name="email"]';
- // @TODO: Evaluate after the modal PR goes in
- it('modal loads correctly', function () {
- visit('/team');
+ visit('/team');
- andThen(() => {
- // url is correct
- expect(currentURL(), 'currentURL').to.equal('/team');
+ andThen(() => {
+ // invite user button exists
+ expect(
+ find('.view-actions .btn-green').text().trim(),
+ 'invite people button text'
+ ).to.equal('Invite People');
- // invite user button exists
- expect(find('.view-actions .btn-green').html(), 'invite people button text')
- .to.equal('Invite People');
- });
+ // existing users are listed
+ expect(
+ find('.user-list.active-users .user-list-item').length,
+ 'initial number of active users'
+ ).to.equal(1);
- click('.view-actions .btn-green');
+ expect(
+ find('.user-list.active-users .user-list-item:first-of-type .role-label').text().trim(),
+ 'active user\'s role label'
+ ).to.equal('Administrator');
- andThen(() => {
- let roleOptions = find('#new-user-role select option');
-
- function checkOwnerExists() {
- for (let i in roleOptions) {
- if (roleOptions[i].tagName === 'option' && roleOptions[i].text === 'Owner') {
- return true;
- }
- }
- return false;
- }
-
- function checkSelectedIsAuthor() {
- for (let i in roleOptions) {
- if (roleOptions[i].selected) {
- return roleOptions[i].text === 'Author';
- }
- }
- return false;
- }
-
- // should be 3 available roles
- expect(roleOptions.length, 'number of available roles').to.equal(3);
-
- expect(checkOwnerExists(), 'owner role isn\'t available').to.be.false;
- expect(checkSelectedIsAuthor(), 'author role is selected initially').to.be.true;
- });
+ // no invites are shown
+ expect(
+ find('.user-list.invited-users .user-list-item').length,
+ 'initial number of invited users'
+ ).to.equal(0);
});
- it('sends an invite correctly', function () {
- visit('/team');
+ // click the invite people button
+ click('.view-actions .btn-green');
- andThen(() => {
- expect(find('.user-list.invited-users .user-list-item').length, 'number of invited users').to.equal(0);
- });
+ andThen(() => {
+ let roleOptions = find('.fullscreen-modal select[name="role"] option');
- click('.view-actions .btn-green');
- click(emailInputField);
- triggerEvent(emailInputField, 'blur');
+ function checkOwnerExists() {
+ for (let i in roleOptions) {
+ if (roleOptions[i].tagName === 'option' && roleOptions[i].text === 'Owner') {
+ return true;
+ }
+ }
+ return false;
+ }
- andThen(() => {
- expect(find('.modal-body .form-group:first').hasClass('error'), 'email input has error status').to.be.true;
- expect(find('.modal-body .form-group:first .response').text()).to.contain('Please enter an email.');
- });
+ function checkSelectedIsAuthor() {
+ for (let i in roleOptions) {
+ if (roleOptions[i].selected) {
+ return roleOptions[i].text === 'Author';
+ }
+ }
+ return false;
+ }
- fillIn(emailInputField, 'test@example.com');
- click('.fullscreen-modal .btn-green');
+ // modal is displayed
+ expect(
+ find('.fullscreen-modal h1').text().trim(),
+ 'correct modal is displayed'
+ ).to.equal('Invite a New User');
- andThen(() => {
- expect(find('.user-list.invited-users .user-list-item').length, 'number of invited users').to.equal(1);
- expect(find('.user-list.invited-users .user-list-item:first .name').text(), 'name of invited user').to.equal('test@example.com');
- });
+ // number of roles is correct
+ expect(
+ find('.fullscreen-modal select[name="role"] option').length,
+ 'number of selectable roles'
+ ).to.equal(3);
- click('.user-list.invited-users .user-list-item:first .user-list-item-aside .user-list-action:contains("Revoke")');
-
- andThen(() => {
- expect(find('.user-list.invited-users .user-list-item').length, 'number of invited users').to.equal(0);
- });
+ expect(checkOwnerExists(), 'owner role isn\'t available').to.be.false;
+ expect(checkSelectedIsAuthor(), 'author role is selected initially').to.be.true;
});
- it('fails sending an invite correctly', function () {
- server.create('user', {email: 'test1@example.com'});
- server.create('user', {email: 'test2@example.com', status: 'invited'});
+ // submit valid invite form
+ fillIn('.fullscreen-modal input[name="email"]', 'invite1@example.com');
+ click('.fullscreen-modal .btn-green');
- visit('/team');
+ andThen(() => {
+ // modal closes
+ expect(
+ find('.fullscreen-modal').length,
+ 'number of modals after sending invite'
+ ).to.equal(0);
- // check our users lists are what we expect
- andThen(() => {
- expect(find('.user-list.invited-users .user-list-item').length, 'number of invited users')
- .to.equal(1);
- // number of active users is 2 because of the logged-in user
- expect(find('.user-list.active-users .user-list-item').length, 'number of active users')
- .to.equal(2);
- });
+ // invite is displayed, has correct e-mail + role
+ expect(
+ find('.invited-users .user-list-item').length,
+ 'number of invites after first invite'
+ ).to.equal(1);
- // click the "invite new user" button to open the modal
- click('.view-actions .btn-green');
+ expect(
+ find('.invited-users span.name').first().text().trim(),
+ 'displayed email of first invite'
+ ).to.equal('invite1@example.com');
- // fill in and submit the invite user modal with an existing user
- fillIn(emailInputField, 'test1@example.com');
- click('.fullscreen-modal .btn-green');
+ expect(
+ find('.invited-users span.role-label').first().text().trim(),
+ 'displayed role of first invite'
+ ).to.equal('Author');
- andThen(() => {
- // check the inline-validation
- expect(find('.fullscreen-modal .error .response').text().trim(), 'inviting existing user error')
- .to.equal('A user with that email address already exists.');
- });
+ // number of users is unchanged
+ expect(
+ find('.active-users .user-list-item').length,
+ 'number of active users after first invite'
+ ).to.equal(1);
+ });
- // fill in and submit the invite user modal with an invited user
- fillIn(emailInputField, 'test2@example.com');
- click('.fullscreen-modal .btn-green');
+ // submit new invite with different role
+ click('.view-actions .btn-green');
+ fillIn('.fullscreen-modal input[name="email"]', 'invite2@example.com');
+ fillIn('.fullscreen-modal select[name="role"]', '2');
+ click('.fullscreen-modal .btn-green');
- andThen(() => {
- // check the inline-validation
- expect(find('.fullscreen-modal .error .response').text().trim(), 'inviting invited user error')
- .to.equal('A user with that email address was already invited.');
+ andThen(() => {
+ // number of invites increases
+ expect(
+ find('.invited-users .user-list-item').length,
+ 'number of invites after second invite'
+ ).to.equal(2);
- // ensure that there's been no change in our user lists
- expect(find('.user-list.invited-users .user-list-item').length, 'number of invited users after failed invites')
- .to.equal(1);
- expect(find('.user-list.active-users .user-list-item').length, 'number of active users after failed invites')
- .to.equal(2);
- });
+ // invite has correct e-mail + role
+ expect(
+ find('.invited-users span.name').last().text().trim(),
+ 'displayed email of second invite'
+ ).to.equal('invite2@example.com');
+
+ expect(
+ find('.invited-users span.role-label').last().text().trim(),
+ 'displayed role of second invite'
+ ).to.equal('Editor');
+ });
+
+ // submit invite form with existing user
+ click('.view-actions .btn-green');
+ fillIn('.fullscreen-modal input[name="email"]', 'admin@example.com');
+ click('.fullscreen-modal .btn-green');
+
+ andThen(() => {
+ // validation message is displayed
+ expect(
+ find('.fullscreen-modal .error .response').text().trim(),
+ 'inviting existing user error'
+ ).to.equal('A user with that email address already exists.');
+ });
+
+ // submit invite form with existing invite
+ fillIn('.fullscreen-modal input[name="email"]', 'invite1@example.com');
+ click('.fullscreen-modal .btn-green');
+
+ andThen(() => {
+ // validation message is displayed
+ expect(
+ find('.fullscreen-modal .error .response').text().trim(),
+ 'inviting invited user error'
+ ).to.equal('A user with that email address was already invited.');
+ });
+
+ // submit invite form with an invalid email
+ fillIn('.fullscreen-modal input[name="email"]', 'test');
+ click('.fullscreen-modal .btn-green');
+
+ andThen(() => {
+ // validation message is displayed
+ expect(
+ find('.fullscreen-modal .error .response').text().trim(),
+ 'inviting invalid email error'
+ ).to.equal('Invalid Email.');
+ });
+
+ click('.fullscreen-modal a.close');
+ // revoke latest invite
+ click('.invited-users .user-list-item:last-of-type a[href="#revoke"]');
+
+ andThen(() => {
+ // number of invites decreases
+ expect(
+ find('.invited-users .user-list-item').length,
+ 'number of invites after revoke'
+ ).to.equal(1);
+
+ // notification is displayed
+ expect(
+ find('.gh-notification').text().trim(),
+ 'notifications contain revoke'
+ ).to.match(/Invitation revoked\. \(invite2@example\.com\)/);
+
+ // correct invite is removed
+ expect(
+ find('.invited-users span.name').text().trim(),
+ 'displayed email of remaining invite'
+ ).to.equal('invite1@example.com');
+ });
+
+ // add another invite to test ordering on resend
+ click('.view-actions .btn-green');
+ fillIn('.fullscreen-modal input[name="email"]', 'invite3@example.com');
+ click('.fullscreen-modal .btn-green');
+
+ andThen(() => {
+ // new invite should be last in the list
+ expect(
+ find('.invited-users span.name').last().text().trim(),
+ 'last invite email in list'
+ ).to.equal('invite3@example.com');
+ });
+
+ // resend first invite
+ click('.invited-users .user-list-item:first-of-type a[href="#resend"]');
+
+ andThen(() => {
+ // notification is displayed
+ expect(
+ find('.gh-notification').text().trim(),
+ 'notifications contain resend'
+ ).to.match(/Invitation resent! \(invite1@example\.com\)/);
+
+ // first invite is still at the top
+ expect(
+ find('.invited-users span.name').first().text().trim(),
+ 'first invite email in list'
+ ).to.equal('invite1@example.com');
+ });
+
+ // regression test: can revoke a resent invite
+ click('.invited-users .user-list-item:first-of-type a[href="#resend"]');
+ click('.invited-users .user-list-item:first-of-type a[href="#revoke"]');
+
+ andThen(() => {
+ // number of invites decreases
+ expect(
+ find('.invited-users .user-list-item').length,
+ 'number of invites after resend/revoke'
+ ).to.equal(1);
+
+ // notification is displayed
+ expect(
+ find('.gh-notification').text().trim(),
+ 'notifications contain revoke after resend/revoke'
+ ).to.match(/Invitation revoked\. \(invite1@example\.com\)/);
});
});
@@ -665,4 +780,42 @@ describe('Acceptance: Team', function () {
});
});
});
+
+ describe('when logged in as author', function () {
+ let author, authorRole, adminRole;
+
+ beforeEach(function () {
+ adminRole = server.create('role', {name: 'Administrator'});
+ authorRole = server.create('role', {name: 'Author'});
+ author = server.create('user', {roles: [authorRole]});
+
+ server.loadFixtures();
+
+ server.get('/invites/', function () {
+ return new Mirage.Response(403, {}, {
+ errors: [{
+ errorType: 'NoPermissionError',
+ message: 'You do not have permission to perform this action'
+ }]
+ });
+ });
+
+ return authenticateSession(application);
+ });
+
+ it('can access the team page', function () {
+ let user1 = server.create('user', {roles: [adminRole]});
+ let invite1 = server.create('invite', {roles: [authorRole]});
+
+ errorOverride();
+
+ visit('/team');
+
+ andThen(() => {
+ errorReset();
+ expect(currentPath()).to.equal('team.index');
+ expect(find('.gh-alert').length).to.equal(0);
+ });
+ });
+ });
});
diff --git a/ghost/admin/tests/unit/models/invite-test.js b/ghost/admin/tests/unit/models/invite-test.js
new file mode 100644
index 0000000000..a631ad79b3
--- /dev/null
+++ b/ghost/admin/tests/unit/models/invite-test.js
@@ -0,0 +1,87 @@
+import { expect } from 'chai';
+import { describeModel, it } from 'ember-mocha';
+import run from 'ember-runloop';
+import Pretender from 'pretender';
+
+describeModel(
+ 'invite',
+ 'Unit: Model: invite',
+ {
+ needs: [
+ 'model:role',
+ 'serializer:application',
+ 'serializer:invite',
+ 'transform:moment-utc',
+ 'service:ghost-paths',
+ 'service:ajax',
+ 'service:session',
+ 'service:feature'
+ ]
+ },
+ function() {
+ it('role property returns first role in array', function () {
+ let model = this.subject();
+
+ run(() => {
+ let role = this.store().push({data: {id: 1, type: 'role', attributes: {name: 'Author'}}});
+ model.get('roles').pushObject(role);
+ });
+ expect(model.get('role.name')).to.equal('Author');
+
+ run(() => {
+ let role = this.store().push({data: {id: 1, type: 'role', attributes: {name: 'Editor'}}});
+ model.set('role', role);
+ });
+ expect(model.get('role.name')).to.equal('Editor');
+ });
+
+ describe('with network', function () {
+ let server;
+
+ beforeEach(function () {
+ server = new Pretender();
+ });
+
+ afterEach(function () {
+ server.shutdown();
+ });
+
+ it('resend hits correct endpoint', function () {
+ let model = this.subject();
+ let role;
+
+ server.post('/ghost/api/v0.1/invites/', function () {
+ return [200, {}, '{}'];
+ });
+
+ run(() => {
+ role = this.store().push({data: {id: 1, type: 'role', attributes: {name: 'Editor'}}});
+ model.set('email', 'resend-test@example.com');
+ model.set('role', role);
+ model.resend();
+ });
+
+ expect(
+ server.handledRequests.length,
+ 'number of requests'
+ ).to.equal(1);
+
+ let [lastRequest] = server.handledRequests;
+ let requestBody = JSON.parse(lastRequest.requestBody);
+ let [invite] = requestBody.invites;
+
+ expect(
+ requestBody.invites.length,
+ 'number of invites in request body'
+ ).to.equal(1);
+
+ expect(invite.email).to.equal('resend-test@example.com');
+ expect(
+ invite.roles.length,
+ 'number of roles in request body'
+ ).to.equal(1);
+ expect(invite.roles[0], 'role ID').to.equal('1');
+ });
+ });
+ }
+);
diff --git a/ghost/admin/tests/unit/models/user-test.js b/ghost/admin/tests/unit/models/user-test.js
index 5110403979..5c1a509493 100644
--- a/ghost/admin/tests/unit/models/user-test.js
+++ b/ghost/admin/tests/unit/models/user-test.js
@@ -37,37 +37,6 @@ describeModel(
expect(model.get('active')).to.not.be.ok;
});
- it('invited property is correct', function () {
- let model = this.subject({
- status: 'invited'
- });
-
- expect(model.get('invited')).to.be.ok;
-
- run(() => { model.set('status', 'invited-pending'); });
- expect(model.get('invited')).to.be.ok;
-
- run(() => { model.set('status', 'active'); });
- expect(model.get('invited')).to.not.be.ok;
-
- run(() => { model.set('status', 'inactive'); });
- expect(model.get('invited')).to.not.be.ok;
- });
-
- it('pending property is correct', function () {
- let model = this.subject({
- status: 'invited-pending'
- });
-
- expect(model.get('pending')).to.be.ok;
-
- run(() => { model.set('status', 'invited'); });
- expect(model.get('pending')).to.not.be.ok;
-
- run(() => { model.set('status', 'inactive'); });
- expect(model.get('pending')).to.not.be.ok;
- });
-
it('role property is correct', function () {
let model = this.subject();