Added the correct way to solve issues with language

and removed the wrong way
pull/5051/head
Martin Schoeler 9 years ago
parent 62b2103878
commit 413a25e05b
  1. 4
      tests/pageobjects/main-content.page.js
  2. 18
      tests/steps/3-basic-usage.js
  3. 18
      tests/steps/6-channel.js

@ -19,6 +19,7 @@ class MainContent extends Page {
get popupFileCancelBtn() { return browser.element('.sa-button-container .cancel'); }
get lastMessageUser() { return browser.element('.message:last-child .user-card-message:nth-of-type(2)'); }
get lastMessage() { return browser.element('.message:last-child .body'); }
get lastMessageRoleAdded() { return browser.element('.message:last-child.subscription-role-added .body'); }
get beforeLastMessage() { return browser.element('.message:nth-last-child(2) .body'); }
get lastMessageUserTag() { return browser.element('.message:last-child .role-tag'); }
get lastMessageImg() { return browser.element('.message:last-child .attachment-image img'); }
@ -57,9 +58,6 @@ class MainContent extends Page {
get messagePopUpTitle() { return browser.element('.message-popup-title'); }
get messagePopUpItems() { return browser.element('.message-popup-items'); }
get messagePopUpFirstItem() { return browser.element('.popup-item.selected'); }
get settingLanguageSelect() { return browser.element('#language '); }
get settingLanguageEnglish() { return browser.element('[value="en"]'); }
get settingSaveBtn() { return browser.element('.button.save'); }
sendMessage(text) {
this.setTextToInput(text);

@ -134,24 +134,6 @@ describe('Basic usage', function() {
});
});
describe('Setting the tests Preferences', () => {
it('opens the user preferences screen', () => {
sideNav.accountBoxUserName.waitForVisible();
sideNav.accountBoxUserName.click();
sideNav.account.waitForVisible();
sideNav.account.click();
});
it('Sets the language to english', () => {
mainContent.setLanguageToEnglish();
browser.pause(10000);
});
it('close the preferences menu', () => {
sideNav.preferencesClose.click();
});
});
describe('general channel', () => {
it('open GENERAL', () => {
sideNav.getChannelFromList('general').waitForExist(5000);

@ -5,7 +5,6 @@ import flexTab from '../pageobjects/flex-tab.page';
import mainContent from '../pageobjects/main-content.page';
import sideNav from '../pageobjects/side-nav.page';
import {username} from '../test-data/user.js';
import {publicChannelName} from '../test-data/channel.js';
import {targetUser} from '../test-data/interactions.js';
@ -42,7 +41,6 @@ describe('channel settings', ()=> {
});
it('should show the new name', ()=> {
//gives timeout errors
var channelName = sideNav.getChannelFromList('NAME-EDITED-'+publicChannelName);
channelName.getText().should.equal('NAME-EDITED-'+publicChannelName);
});
@ -102,8 +100,12 @@ describe('channel settings', ()=> {
flexTab.dismissToast();
});
it('should show the owner add message', ()=> {
mainContent.lastMessage.getText().should.equal(targetUser+' was set owner by '+username);
it('the last message should be a subscription role added', ()=> {
mainContent.lastMessageRoleAdded.isVisible().should.be.true;
});
it('should show the target username in owner add message', ()=> {
mainContent.lastMessage.getText().should.have.string(targetUser);
});
it('sets rocket cat as moderator', ()=> {
@ -111,8 +113,12 @@ describe('channel settings', ()=> {
flexTab.setUserModerator(targetUser);
});
it('should show the moderator add message', ()=> {
mainContent.lastMessage.getText().should.equal(targetUser+' was set moderator by '+username);
it('the last message should be a subscription role added', ()=> {
mainContent.lastMessageRoleAdded.isVisible().should.be.true;
});
it('should show the target username in moderator add message', ()=> {
mainContent.lastMessage.getText().should.have.string(targetUser);
});
it('mute rocket cat', ()=> {

Loading…
Cancel
Save