pull/7643/head
Martin Schoeler 8 years ago
parent cde6f59353
commit ff2d308b73
  1. 8
      tests/data/checks.js
  2. 4
      tests/end-to-end/ui/04-main-elements-render.js
  3. 4
      tests/end-to-end/ui/08-resolutions.js
  4. 4
      tests/end-to-end/ui/10-user-preferences.js
  5. 2
      tests/end-to-end/ui/11-admin.js
  6. 8
      tests/end-to-end/ui/12-settings.js
  7. 8
      tests/end-to-end/ui/13-permissions.js
  8. 2
      tests/pageobjects/side-nav.page.js

@ -38,8 +38,8 @@ export function checkIfUserIsValid(username, email, password) {
} else if (sideNav.accountBoxUserName.getAttribute('data-username') !== username) {
//if the logged user is not the right one
console.log(' Wrong logged user. Changing user...');
sideNav.accountBoxUserName.waitForVisible(5000);
sideNav.accountBoxUserName.click();
sideNav.accountMenu.waitForVisible(5000);
sideNav.accountMenu.click();
sideNav.logout.waitForVisible(5000);
sideNav.logout.click();
@ -71,8 +71,8 @@ export function checkIfUserIsAdmin(username, email, password) {
} else if (sideNav.accountBoxUserName.getText() !== username) {
//if the logged user is not the right one
console.log(' Wrong logged user. Changing user...');
sideNav.accountBoxUserName.waitForVisible(5000);
sideNav.accountBoxUserName.click();
sideNav.accountMenu.waitForVisible(5000);
sideNav.accountMenu.click();
sideNav.logout.waitForVisible(5000);
sideNav.logout.click();

@ -86,12 +86,12 @@ describe('[Main Elements Render]', function() {
describe('[User Options]', () => {
describe('render:', () => {
before(() => {
sideNav.accountStatus.click();
sideNav.accountMenu.click();
sideNav.popOverContent.waitForVisible(5000);
});
after(() => {
sideNav.accountStatus.click();
sideNav.accountMenu.click();
});
it('it should show online button', () => {

@ -52,8 +52,8 @@ describe.skip('[Resolution]', ()=> {
});
it('it should open the user preferences screen', () => {
sideNav.accountBoxUserName.waitForVisible(5000);
sideNav.accountBoxUserName.click();
sideNav.accountMenu.waitForVisible(5000);
sideNav.accountMenu.click();
sideNav.account.waitForVisible(5000);
sideNav.account.click();
});

@ -18,8 +18,8 @@ describe('[User Preferences]', ()=> {
sideNav.spotlightSearch.waitForVisible(10000);
sideNav.searchChannel('general');
sideNav.accountBoxUserName.waitForVisible();
sideNav.accountBoxUserName.click();
sideNav.accountMenu.waitForVisible();
sideNav.accountMenu.click();
sideNav.account.waitForVisible();
sideNav.account.click();
});

@ -24,7 +24,7 @@ describe('[Administration]', () => {
describe('[Admin View]', () => {
before(() => {
sideNav.accountBoxUserName.click();
sideNav.accountMenu.click();
sideNav.admin.waitForVisible(5000);
});

@ -358,7 +358,7 @@ describe('[Api Settings Change]', () => {
describe.skip('profile changes:', () => {
before(() => {
sideNav.accountBoxUserName.click();
sideNav.accountMenu.click();
sideNav.account.waitForVisible(5000);
sideNav.account.click();
});
@ -433,8 +433,8 @@ describe('[Api Settings Change]', () => {
describe('Manually Approve New Users:', () => {
before(() => {
sideNav.accountBoxUserName.waitForVisible(5000);
sideNav.accountBoxUserName.click();
sideNav.accountMenu.waitForVisible(5000);
sideNav.accountMenu.click();
sideNav.logout.waitForVisible(5000);
sideNav.logout.click();
@ -471,7 +471,7 @@ describe('[Api Settings Change]', () => {
it('login as admin and go to users', () => {
checkIfUserIsAdmin(adminUsername, adminEmail, adminPassword);
sideNav.accountBoxUserName.click();
sideNav.accountMenu.click();
sideNav.admin.waitForVisible(5000);
sideNav.admin.click();
admin.usersLink.waitForVisible(5000);

@ -17,8 +17,8 @@ describe('[Permissions]', () => {
sideNav.spotlightSearch.waitForVisible(10000);
sideNav.general.waitForVisible(5000);
sideNav.general.click();
sideNav.accountBoxUserName.waitForVisible(5000);
sideNav.accountBoxUserName.click();
sideNav.accountMenu.waitForVisible(5000);
sideNav.accountMenu.click();
sideNav.admin.waitForVisible(5000);
sideNav.admin.click();
admin.infoRocketChatTable.waitForVisible(10000);
@ -29,8 +29,8 @@ describe('[Permissions]', () => {
sideNav.spotlightSearch.waitForVisible(10000);
sideNav.general.waitForVisible(5000);
sideNav.general.click();
sideNav.accountBoxUserName.waitForVisible(5000);
sideNav.accountBoxUserName.click();
sideNav.accountMenu.waitForVisible(5000);
sideNav.accountMenu.click();
sideNav.admin.waitForVisible(5000);
sideNav.admin.click();
admin.permissionsLink.waitForVisible(5000);

@ -10,7 +10,7 @@ class SideNav extends Page {
// Account box
get accountBoxUserName() { return browser.element('.sidebar__account-username'); }
get accountBoxUserAvatar() { return browser.element('.sidebar__account .avatar-image'); }
get accountStatus() { return browser.element('.sidebar__account-status'); }
get accountMenu() { return browser.element('.sidebar__account-menu'); }
get popOverContent() { return browser.element('.rc-popover__content'); }
get statusOnline() { return browser.element('[data-status="online"]'); }
get statusAway() { return browser.element('[data-status="away"]'); }

Loading…
Cancel
Save