Merge "tests: Fix broken assertion in ApiQueryAllPagesTest"

[lhc/web/wiklou.git] / tests / selenium / specs / user.js

diff --git a/tests/selenium/specs/user.js b/tests/selenium/specs/user.js
index 10bf05d..e3eeb49 100644 (file)
--- a/tests/selenium/specs/user.js
+++ b/tests/selenium/specs/user.js
@@ -1,23 +1,17 @@
-const assert = require( 'assert' ),
-       CreateAccountPage = require( '../pageobjects/createaccount.page' ),
-       PreferencesPage = require( '../pageobjects/preferences.page' ),
-       UserLoginPage = require( 'wdio-mediawiki/LoginPage' ),
-       Api = require( 'wdio-mediawiki/Api' );
+const assert = require( 'assert' );
+const CreateAccountPage = require( '../pageobjects/createaccount.page' );
+const PreferencesPage = require( '../pageobjects/preferences.page' );
+const UserLoginPage = require( 'wdio-mediawiki/LoginPage' );
+const Api = require( 'wdio-mediawiki/Api' );
+const Util = require( 'wdio-mediawiki/Util' );
 
 describe( 'User', function () {
-       var password,
-               username;
-
-       before( function () {
-               // disable VisualEditor welcome dialog
-               UserLoginPage.open();
-               browser.localStorage( 'POST', { key: 've-beta-welcome-dialog', value: '1' } );
-       } );
+       let password, username;
 
        beforeEach( function () {
-               browser.deleteCookie();
-               username = `User-${Math.random().toString()}`;
-               password = Math.random().toString();
+               browser.deleteAllCookies();
+               username = Util.getTestString( 'User-' );
+               password = Util.getTestString();
        } );
 
        it( 'should be able to create account', function () {
@@ -25,10 +19,10 @@ describe( 'User', function () {
                CreateAccountPage.createAccount( username, password );
 
                // check
-               assert.equal( CreateAccountPage.heading.getText(), `Welcome, ${username}!` );
+               assert.strictEqual( CreateAccountPage.heading.getText(), `Welcome, ${username}!` );
        } );
 
-       it( 'should be able to log in', function () {
+       it( 'should be able to log in @daily', function () {
                // create
                browser.call( function () {
                        return Api.createAccount( username, password );
@@ -38,11 +32,12 @@ describe( 'User', function () {
                UserLoginPage.login( username, password );
 
                // check
-               assert.equal( UserLoginPage.userPage.getText(), username );
+               assert.strictEqual( UserLoginPage.userPage.getText(), username );
        } );
 
-       it( 'should be able to change preferences', function () {
-               var realName = Math.random().toString();
+       // Disabled due to flakiness (T199446)
+       it.skip( 'should be able to change preferences', function () {
+               var realName = Util.getTestString();
 
                // create
                browser.call( function () {
@@ -56,6 +51,6 @@ describe( 'User', function () {
                PreferencesPage.changeRealName( realName );
 
                // check
-               assert.equal( PreferencesPage.realName.getValue(), realName );
+               assert.strictEqual( PreferencesPage.realName.getValue(), realName );
        } );
 } );