Merge "Selenium: replace UserLoginPage with BlankPage where possible"

diff --combined tests/selenium/specs/page.js
index 148001d,db67dde..ab547e8
--- 1/tests/selenium/specs/page.js
--- 2/tests/selenium/specs/page.js
+++ b/tests/selenium/specs/page.js
@@@ -1,5 -1,6 +1,6 @@@
  const assert = require( 'assert' ),
        Api = require( 'wdio-mediawiki/Api' ),
+       BlankPage = require( 'wdio-mediawiki/BlankPage' ),
        DeletePage = require( '../pageobjects/delete.page' ),
        RestorePage = require( '../pageobjects/restore.page' ),
        EditPage = require( '../pageobjects/edit.page' ),
@@@ -14,7 -15,7 +15,7 @@@ describe( 'Page', function () 
  
        before( function () {
                // disable VisualEditor welcome dialog
-               UserLoginPage.open();
+               BlankPage.open();
                browser.localStorage( 'POST', { key: 've-beta-welcome-dialog', value: '1' } );
        } );
  
@@@ -48,7 -49,7 +49,7 @@@
        } );
  
        it( 'should be re-creatable', function () {
 -              let initialContent = Util.getTestString( 'initialContent-' );
 +              const initialContent = Util.getTestString( 'initialContent-' );
  
                // create
                browser.call( function () {
@@@ -75,7 -76,7 +76,7 @@@
                } );
  
                // edit
 -              let editContent = Util.getTestString( 'editContent-' );
 +              const editContent = Util.getTestString( 'editContent-' );
                EditPage.edit( name, editContent );
  
                // check

diff --combined tests/selenium/specs/rollback.js
index d85b27b,bf0dc91..daf7112
--- 1/tests/selenium/specs/rollback.js
--- 2/tests/selenium/specs/rollback.js
+++ b/tests/selenium/specs/rollback.js
@@@ -1,4 -1,5 +1,5 @@@
  const assert = require( 'assert' ),
+       BlankPage = require( 'wdio-mediawiki/BlankPage' ),
        HistoryPage = require( '../pageobjects/history.page' ),
        UserLoginPage = require( 'wdio-mediawiki/LoginPage' ),
        Util = require( 'wdio-mediawiki/Util' );
@@@ -10,7 -11,7 +11,7 @@@ describe( 'Rollback with confirmation'
        before( function () {
                // disable VisualEditor welcome dialog
                browser.deleteCookie();
-               UserLoginPage.open();
+               BlankPage.open();
                browser.localStorage( 'POST', { key: 've-beta-welcome-dialog', value: '1' } );
  
                // Enable rollback confirmation for admin user
@@@ -31,7 -32,7 +32,7 @@@
                HistoryPage.open( name );
        } );
  
 -      it( 'should offer rollback options for admin users', function () {
 +      it.skip( 'should offer rollback options for admin users', function () {
                assert.strictEqual( HistoryPage.rollback.getText(), 'rollback 1 edit' );
  
                HistoryPage.rollback.click();
@@@ -41,7 -42,7 +42,7 @@@
                assert.strictEqual( HistoryPage.rollbackConfirmableNo.getText(), 'Cancel' );
        } );
  
 -      it( 'should offer a way to cancel rollbacks', function () {
 +      it.skip( 'should offer a way to cancel rollbacks', function () {
                HistoryPage.rollback.click();
  
                HistoryPage.rollbackConfirmableNo.waitForVisible( 5000 );
@@@ -66,7 -67,7 +67,7 @@@
                }, 5000, 'Expected rollback page to appear.' );
        } );
  
 -      it( 'should verify rollbacks via GET requests are confirmed on a follow-up page', function () {
 +      it.skip( 'should verify rollbacks via GET requests are confirmed on a follow-up page', function () {
                var rollbackActionUrl = HistoryPage.rollbackLink.getAttribute( 'href' );
                browser.url( rollbackActionUrl );
  
@@@ -90,7 -91,7 +91,7 @@@ describe( 'Rollback without confirmatio
        before( function () {
                // disable VisualEditor welcome dialog
                browser.deleteCookie();
-               UserLoginPage.open();
+               BlankPage.open();
                browser.localStorage( 'POST', { key: 've-beta-welcome-dialog', value: '1' } );
  
                // Disable rollback confirmation for admin user
@@@ -120,7 -121,7 +121,7 @@@
                }, 5000, 'Expected rollback page to appear.' );
        } );
  
 -      it( 'should perform rollback via GET request without asking the user to confirm', function () {
 +      it.skip( 'should perform rollback via GET request without asking the user to confirm', function () {
                var rollbackActionUrl = HistoryPage.rollbackLink.getAttribute( 'href' );
                browser.url( rollbackActionUrl );