Skip to content
Snippets Groups Projects
Commit e864b18e authored by Rodrigo Nascimento's avatar Rodrigo Nascimento
Browse files

Fix tests

parent 5fe89ae3
No related branches found
No related tags found
No related merge requests found
...@@ -27,7 +27,7 @@ FlowRouter.route('/', { ...@@ -27,7 +27,7 @@ FlowRouter.route('/', {
Tracker.autorun(function(c) { Tracker.autorun(function(c) {
if (FlowRouter.subsReady() === true) { if (FlowRouter.subsReady() === true) {
Meteor.defer(function() { Meteor.defer(function() {
if (Meteor.user().defaultRoom) { if (Meteor.user() && Meteor.user().defaultRoom) {
const room = Meteor.user().defaultRoom.split('/'); const room = Meteor.user().defaultRoom.split('/');
FlowRouter.go(room[0], { name: room[1] }, FlowRouter.current().queryParams); FlowRouter.go(room[0], { name: room[1] }, FlowRouter.current().queryParams);
} else { } else {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<form id="login-card" class="content-background-color color-primary-font-color" method='/' novalidate> <form id="login-card" class="content-background-color color-primary-font-color" method='/' novalidate>
{{#if state 'wait-activation'}} {{#if state 'wait-activation'}}
<header> <header>
<h2>{{{_ "Registration_Succeeded"}}}</h2> <h2 data-i18n="Registration_Succeeded">{{{_ "Registration_Succeeded"}}}</h2>
<p>{{{_ "Wait_activation_warning"}}}</p> <p>{{{_ "Wait_activation_warning"}}}</p>
<p>{{{_ "Please_wait_activation"}}}</p> <p>{{{_ "Please_wait_activation"}}}</p>
</header> </header>
......
...@@ -462,7 +462,7 @@ describe('Changing settings via api', () => { ...@@ -462,7 +462,7 @@ describe('Changing settings via api', () => {
loginPage.submit(); loginPage.submit();
loginPage.registrationSucceededCard.waitForVisible(5000); loginPage.registrationSucceededCard.waitForVisible(5000);
loginPage.registrationSucceededCard.getText().toLowerCase().should.equal('registration succeeded'); loginPage.registrationSucceededCard.getAttribute('data-i18n').should.equal('Registration_Succeeded');
loginPage.backToLoginButton.click(); loginPage.backToLoginButton.click();
}); });
......
...@@ -112,7 +112,7 @@ class MainContent extends Page { ...@@ -112,7 +112,7 @@ class MainContent extends Page {
waitForLastMessageEqualsText(text) { waitForLastMessageEqualsText(text) {
browser.waitUntil(function() { browser.waitUntil(function() {
return browser.getText('.message:last-child .body') === text; return browser.getText('.message:last-child .body') === text;
}, 2000); }, 4000);
} }
waitForLastMessageUserEqualsText(text) { waitForLastMessageUserEqualsText(text) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment