Merge "Fix 'Tags' padding to keep it farther from the edge and document the source...

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

diff --git a/tests/selenium/specs/user.js b/tests/selenium/specs/user.js
index 102acd6..b64d9f5 100644 (file)
--- a/tests/selenium/specs/user.js
+++ b/tests/selenium/specs/user.js
@@ -1,13 +1,11 @@
-'use strict';
 const assert = require( 'assert' ),
        CreateAccountPage = require( '../pageobjects/createaccount.page' ),
        PreferencesPage = require( '../pageobjects/preferences.page' ),
-       UserLoginPage = require( '../pageobjects/userlogin.page' ),
-       UserMessagePage = require( '../pageobjects/usermessage.page' ),
-       EditPage = require( '../pageobjects/edit.page' );
+       UserLoginPage = require( 'wdio-mediawiki/LoginPage' ),
+       Api = require( 'wdio-mediawiki/Api' ),
+       Util = require( 'wdio-mediawiki/Util' );
 
 describe( 'User', function () {
-
        var password,
                username;
 
@@ -19,42 +17,37 @@ describe( 'User', function () {
 
        beforeEach( function () {
                browser.deleteCookie();
-               username = `User-${Math.random().toString()}`;
-               password = Math.random().toString();
+               username = Util.getTestString( 'User-' );
+               password = Util.getTestString();
        } );
 
        it( 'should be able to create account', function () {
-
                // create
                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 () {
-
                // create
                browser.call( function () {
-                       return CreateAccountPage.apiCreateAccount( username, password );
+                       return Api.createAccount( username, password );
                } );
 
                // log in
                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();
+               var realName = Util.getTestString();
 
                // create
                browser.call( function () {
-                       return CreateAccountPage.apiCreateAccount( username, password );
+                       return Api.createAccount( username, password );
                } );
 
                // log in
@@ -64,28 +57,6 @@ describe( 'User', function () {
                PreferencesPage.changeRealName( realName );
 
                // check
-               assert.equal( PreferencesPage.realName.getValue(), realName );
-
-       } );
-
-       it( 'should be able to view new message banner', function () {
-
-               // create user
-               browser.call( function () {
-                       return CreateAccountPage.apiCreateAccount( username, password );
-               } );
-
-               // create talk page with content
-               browser.call( function () {
-                       return EditPage.apiEdit( 'User_talk:' + username, Math.random().toString() );
-               } );
-
-               // log in
-               UserLoginPage.login( username, password );
-
-               // check
-               assert.equal( UserMessagePage.usermessage.getText(), 'You have a new message (last change).' );
-
+               assert.strictEqual( PreferencesPage.realName.getValue(), realName );
        } );
-
 } );