apitech
/
Rocket.Chat
mirror of https://github.com/RocketChat/Rocket.Chat
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixes more tests

Browse Source 
and remove old stuff
pull/5933/head
Martin Schoeler 9 years ago
parent edd2dd0ac5
commit accbc500d9
7 changed files with 47 additions and 74 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      tests/end-to-end/ui/04-main-elements-render.js
  2. 6
      tests/end-to-end/ui/06-messaging.js
  3. 1
      tests/end-to-end/ui/08-resolutions.js
  4. 63
      tests/end-to-end/ui/09-channel.js
  5. 24
      tests/pageobjects/flex-tab.page.js
  6. 6
      tests/pageobjects/global.js
  7. 11
      tests/pageobjects/side-nav.page.js

10
tests/end-to-end/ui/04-main-elements-render.js
Unescape View File

@ -49,10 +49,6 @@ describe('Main Elements Render', function() {
it('should show spotlight search bar', () => {
sideNav.spotlightSearch.isVisible().should.be.true;
});
it.skip('should not show eye icon on general', () => {
sideNav.channelHoverIcon.isVisible().should.be.true;
});
});
describe('spotlight search render', () => {
@ -286,11 +282,7 @@ describe('Main Elements Render', function() {
flexTab.membersTabContent.isVisible().should.be.true;
});
it.skip('should show the members search bar', () => {
flexTab.userSearchBar.isVisible().should.be.true;
});
it.skip('should show the show all link', () => {
it('should show the show all link', () => {
flexTab.showAll.isVisible().should.be.true;
});
});

6
tests/end-to-end/ui/06-messaging.js
Unescape View File

@ -170,8 +170,8 @@ function messageActionsTest() {
mainContent.sendBtn.click();
});
it.skip('checks if the message was replied', () => {
mainContent.lastMessageTextAttachment.waitForExist(5000);
it('checks if the message was replied', () => {
mainContent.lastMessageTextAttachment.waitForVisible(5000);
mainContent.lastMessageTextAttachment.getText().should.equal(mainContent.beforeLastMessage.getText());
});
});
@ -308,7 +308,7 @@ describe('Messaging in different channels', () => {
describe('Messaging in created direct message', () => {
before(()=>{
if (!directMessageCreated) {
sideNav.startDirectMessage(targetUser);
sideNav.searchChannel(targetUser);
setDirectMessageCreated(true);
console.log(' Direct message not found, creating one...');
}

1
tests/end-to-end/ui/08-resolutions.js
Unescape View File

@ -94,6 +94,7 @@ describe('resolutions tests', ()=> {
it('close the preferences menu', () => {
sideNav.preferencesClose.click();
sideNav.spotlightSearch.waitForVisible(5000);
});
});
});

63
tests/end-to-end/ui/09-channel.js
Unescape View File

@ -123,7 +123,7 @@ describe('channel', ()=> {
describe('Adding a user to the room', () => {
before(()=> {
if (Global.toastAlert.isVisible()) {
flexTab.dismissToast();
Global.dismissToast();
Global.toastAlert.waitForVisible(5000, true);
}
flexTab.membersTab.waitForVisible();
@ -132,7 +132,7 @@ describe('channel', ()=> {
after(()=> {
if (Global.toastAlert.isVisible()) {
flexTab.dismissToast();
Global.dismissToast();
Global.toastAlert.waitForVisible(5000, true);
}
flexTab.membersTab.waitForVisible();
@ -149,7 +149,7 @@ describe('channel', ()=> {
describe('Channel name edit', ()=> {
before(()=> {
if (Global.toastAlert.isVisible()) {
flexTab.dismissToast();
Global.dismissToast();
Global.toastAlert.waitForVisible(5000, true);
}
flexTab.channelTab.waitForVisible();
@ -158,7 +158,7 @@ describe('channel', ()=> {
after(()=> {
if (Global.toastAlert.isVisible()) {
flexTab.dismissToast();
Global.dismissToast();
Global.toastAlert.waitForVisible(5000, true);
}
flexTab.channelTab.waitForVisible(5000);
@ -197,7 +197,7 @@ describe('channel', ()=> {
after(()=> {
if (Global.toastAlert.isVisible()) {
flexTab.dismissToast();
Global.dismissToast();
Global.toastAlert.waitForVisible(5000, true);
}
flexTab.channelTab.waitForVisible();
@ -231,7 +231,7 @@ describe('channel', ()=> {
after(()=> {
if (Global.toastAlert.isVisible()) {
flexTab.dismissToast();
Global.dismissToast();
Global.toastAlert.waitForVisible(5000, true);
}
flexTab.channelTab.waitForVisible();
@ -259,10 +259,26 @@ describe('channel', ()=> {
});
describe('Members tab usage', () => {
describe('User muted', () => {
before(()=> {
flexTab.membersTab.waitForVisible(5000);
flexTab.membersTab.click();
});
after(()=> {
flexTab.membersTab.waitForVisible();
flexTab.membersTab.click();
});
it('mute rocket cat', ()=> {
flexTab.muteUser(targetUser);
});
});
describe('Owner added', () => {
before(()=> {
if (Global.toastAlert.isVisible()) {
flexTab.dismissToast();
Global.dismissToast();
Global.toastAlert.waitForVisible(5000, true);
}
flexTab.membersTab.waitForVisible();
@ -271,7 +287,7 @@ describe('channel', ()=> {
after(()=> {
if (Global.toastAlert.isVisible()) {
flexTab.dismissToast();
Global.dismissToast();
Global.toastAlert.waitForVisible(5000, true);
}
flexTab.membersTab.waitForVisible();
@ -284,7 +300,7 @@ describe('channel', ()=> {
it('dismiss the toast', ()=> {
if (Global.toastAlert.isVisible()) {
flexTab.dismissToast();
Global.dismissToast();
Global.toastAlert.waitForVisible(5000, true);
}
});
@ -301,7 +317,7 @@ describe('channel', ()=> {
describe('Moderator added', () => {
before(()=> {
if (Global.toastAlert.isVisible()) {
flexTab.dismissToast();
Global.dismissToast();
Global.toastAlert.waitForVisible(5000, true);
}
flexTab.membersTab.waitForVisible();
@ -310,7 +326,7 @@ describe('channel', ()=> {
after(()=> {
if (Global.toastAlert.isVisible()) {
flexTab.dismissToast();
Global.dismissToast();
Global.toastAlert.waitForVisible(5000, true);
}
flexTab.membersTab.waitForVisible();
@ -323,7 +339,7 @@ describe('channel', ()=> {
it('dismiss the toast', ()=> {
if (Global.toastAlert.isVisible()) {
flexTab.dismissToast();
Global.dismissToast();
Global.toastAlert.waitForVisible(5000, true);
}
});
@ -374,29 +390,6 @@ describe('channel', ()=> {
sideNav.getChannelFromList('NAME-EDITED-'+publicChannelName).isVisible().should.be.true;
});
});
describe.skip('User muted', () => {
before(()=> {
flexTab.membersTab.waitForVisible(5000);
flexTab.membersTab.click();
});
after(()=> {
flexTab.membersTab.waitForVisible();
flexTab.membersTab.click();
});
it('mute rocket cat', ()=> {
flexTab.muteUser(targetUser);
});
it('confirms the popup', ()=> {
flexTab.confirmPopup();
});
});
});
});
});

24
tests/pageobjects/flex-tab.page.js
Unescape View File

@ -1,4 +1,5 @@
import Page from './Page';
import Global from './global'
class FlexTab extends Page {
get membersTab() { return browser.element('.flex-tab-bar .icon-users'); }
@ -86,12 +87,6 @@ class FlexTab extends Page {
getUserEl(username) { return browser.element(`.flex-tab button[title="${username}"] > p`); }
confirmPopup() {
this.confirmBtn.waitForVisible(5000);
this.confirmBtn.click();
this.sweetAlertOverlay.waitForVisible(5000, true);
}
dismissToast() {
this.toastAlert.click();
}
@ -140,15 +135,14 @@ class FlexTab extends Page {
muteUser(user) {
const userEl = this.getUserEl(user);
if (this.showAll.isVisible()) {
this.muteUserBtn.waitForVisible(5000);
this.muteUserBtn.click();
} else {
userEl.waitForVisible(5000);
userEl.click();
this.muteUserBtn.waitForVisible(5000);
this.muteUserBtn.click();
}
userEl.waitForVisible(5000);
userEl.click();
this.muteUserBtn.waitForVisible(5000);
this.muteUserBtn.click();
Global.confirmPopup();
this.viewAllBtn.click();
browser.pause(100);
}
}

6
tests/pageobjects/global.js
Unescape View File

@ -7,7 +7,7 @@ class Global {
confirmPopup() {
this.sweetAlertConfirm.waitForVisible(5000);
browser.pause(1000);
browser.pause(500);
this.sweetAlertConfirm.click();
this.sweetAlert.waitForVisible(5000, true);
}
@ -18,6 +18,10 @@ class Global {
height: height
});
}
dismissToast() {
this.toastAlert.click();
}
}
module.exports = new Global();

11
tests/pageobjects/side-nav.page.js
Unescape View File

@ -106,17 +106,6 @@ class SideNav extends Page {
browser.click('[title="'+user+'"]');
this.removeUserBtn.click();
}
startDirectMessage(user) {
this.newDirectMessageBtn.waitForVisible(3000);
this.newDirectMessageBtn.click();
this.directMessageTarget.waitForVisible(3000);
this.directMessageTarget.setValue(user);
browser.waitForVisible('.-autocomplete-item', 5000);
browser.click('.-autocomplete-item');
this.saveDirectMessageBtn.click();
browser.waitForExist('[title="'+user+'"]', 5000);
}
}
module.exports = new SideNav();

Write Preview
Loading…
Cancel
Save