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

fix tests

Browse Source
pull/8101/head
Karl Prieb 8 years ago
parent 9a2f56dd8e
commit 5d3182456f
4 changed files with 26 additions and 30 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. 2
      tests/end-to-end/ui/04-main-elements-render.js
  2. 2
      tests/end-to-end/ui/06-messaging.js
  3. 36
      tests/pageobjects/main-content.page.js
  4. 16
      tests/pageobjects/side-nav.page.js

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

@ -91,7 +91,7 @@ describe('[Main Elements Render]', function() {
});
after(() => {
sideNav.accountMenu.click();
mainContent.popoverWrapper.click();
});
it('it should show online button', () => {

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

@ -105,7 +105,7 @@ function messageActionsTest() {
});
after(() => {
mainContent.closeMessageActionMenu();
mainContent.popoverWrapper.click();
});
it('it should show the message action menu', () => {

36
tests/pageobjects/main-content.page.js
Unescape View File

@ -32,20 +32,19 @@ class MainContent extends Page {
get lastMessageUserTag() { return browser.element('.message:last-child .role-tag'); }
get lastMessageImg() { return browser.element('.message:last-child .attachment-image img'); }
get lastMessageTextAttachment() { return browser.element('.message:last-child .attachment-text'); }
get messageOptionsBtn() { return browser.element('.message:last-child .message-actions__label'); }
get messageReply() { return browser.element('.message:last-child .rc-popover [data-message-action=reply-message]'); }
get messageActionMenu() { return browser.element('.message:last-child .rc-popover'); }
get messageActionMenuWrapper() { return browser.element('.message:last-child .rc-popover__wrapper'); }
get messageEdit() { return browser.element('.message:last-child .rc-popover [data-message-action=edit-message]'); }
get messageDelete() { return browser.element('.message:last-child .rc-popover [data-message-action=delete-message]'); }
get messagePermalink() { return browser.element('.message:last-child .rc-popover [data-message-action=permalink]'); }
get messageCopy() { return browser.element('.message:last-child .rc-popover [data-message-action=copy]'); }
get messageQuote() { return browser.element('.message:last-child .rc-popover [data-message-action=quote-message]'); }
get messageStar() { return browser.element('.message:last-child .rc-popover [data-message-action=star-message]'); }
get messageUnread() { return browser.element('.message:last-child .rc-popover [data-message-action=mark-message-as-unread]'); }
// get messageReaction() { return browser.element('.message:last-child .rc-popover [data-message-action=reaction-message]'); }
get messagePin() { return browser.element('.message:last-child .rc-popover [data-message-action=pin-message]'); }
// get messageClose() { return browser.element('.message:last-child .rc-popover [data-message-action=rc-popover-close]'); }
get messageOptionsBtn() { return browser.element('.message:last-child .message-actions__menu'); }
get messageActionMenu() { return browser.element('.rc-popover__content'); }
get messageReply() { return browser.element('[data-id="reply-message"][data-type="message-action"]'); }
get messageEdit() { return browser.element('[data-id="edit-message"][data-type="message-action"]'); }
get messageDelete() { return browser.element('[data-id="delete-message"][data-type="message-action"]'); }
get messagePermalink() { return browser.element('[data-id="permalink"][data-type="message-action"]'); }
get messageCopy() { return browser.element('[data-id="copy"][data-type="message-action"]'); }
get messageQuote() { return browser.element('[data-id="quote-message"][data-type="message-action"]'); }
get messageStar() { return browser.element('[data-id="star-message"][data-type="message-action"]'); }
get messageUnread() { return browser.element('[data-id="mark-message-as-unread"][data-type="message-action"]'); }
// get messageReaction() { return browser.element('.message-actions__button[data-message-action="reaction-message"]'); }
get messagePin() { return browser.element('[data-id="pin-message"][data-type="message-action"]'); }
// get messageClose() { return browser.element('[data-id="rc-popover-close"][data-type="message-action"]'); }
// Emojis
get emojiPickerMainScreen() { return browser.element('.emoji-picker'); }
@ -66,6 +65,9 @@ class MainContent extends Page {
get emojiGrinning() { return browser.element('.emoji-picker .emoji-grinning'); }
get emojiSmile() { return browser.element('.emoji-picker .emoji-smile'); }
// Popover
get popoverWrapper() { return browser.element('.rc-popover'); }
// Sends a message and wait for the message to equal the text sent
sendMessage(text) {
this.setTextToInput(text);
@ -124,12 +126,6 @@ class MainContent extends Page {
browser.pause(100);
}
closeMessageActionMenu() {
browser.moveToObject(this.messageActionMenu.selector, -30, -30);
browser.buttonPress(0);
this.messageActionMenu.waitForVisible(5000, true);
}
setLanguageToEnglish() {
this.settingLanguageSelect.click();
this.settingLanguageEnglish.click();

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

@ -10,15 +10,15 @@ class SideNav extends Page {
// Account box
get accountBoxUserName() { return browser.element('.sidebar__account-username'); }
get accountBoxUserAvatar() { return browser.element('.sidebar__account .avatar-image'); }
get accountMenu() { return browser.element('.sidebar__account-menu'); }
get accountMenu() { return browser.element('.sidebar__account'); }
get popOverContent() { return browser.element('.rc-popover__content'); }
get statusOnline() { return browser.element('[data-status="online"]'); }
get statusAway() { return browser.element('[data-status="away"]'); }
get statusBusy() { return browser.element('[data-status="busy"]'); }
get statusOffline() { return browser.element('[data-status="offline"]'); }
get account() { return browser.element('[data-open="account"]'); }
get admin() { return browser.element('[data-open="administration"]'); }
get logout() { return browser.element('[data-open="logout"]'); }
get statusOnline() { return browser.element('[data-id="online"]'); }
get statusAway() { return browser.element('[data-id="away"]'); }
get statusBusy() { return browser.element('[data-id="busy"]'); }
get statusOffline() { return browser.element('[data-id="offline"]'); }
get account() { return browser.element('[data-id="account"][data-type="open"]'); }
get admin() { return browser.element('[data-id="administration"][data-type="open"]'); }
get logout() { return browser.element('[data-id="logout"][data-type="open"]'); }
get sideNavBar() { return browser.element('.sidebar'); }
// Toolbar

Write Preview
Loading…
Cancel
Save