From: Kosta Harlan <kharlan@wikimedia.org>
Date: Mon, 30 Sep 2019 19:07:57 +0000 (+0200)
Subject: Selenium: Hide VE welcome and beta dialogs
X-Git-Tag: 1.34.0-rc.0~37^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=640b0b4943131dbd6065cee4d572b9aef5e1163f

Selenium: Hide VE welcome and beta dialogs

Remove uses of setLocalStorage (incompatible with chromedriver >= 75)
and also requires slightly fewer requests since BlankPage.open()
doesn't need to be invoked.

Bug: T234002
Change-Id: I4cfb4fe17a3c99bfcb7ff39ac6db60f5c5e8a687
---

diff --git a/tests/selenium/pageobjects/edit.page.js b/tests/selenium/pageobjects/edit.page.js
index 4302e8f36f..fce0d70bc7 100644
--- a/tests/selenium/pageobjects/edit.page.js
+++ b/tests/selenium/pageobjects/edit.page.js
@@ -9,7 +9,7 @@ class EditPage extends Page {
 	get previewButton() { return $( '#wpPreview' ); }
 
 	openForEditing( title ) {
-		super.openTitle( title, { action: 'edit' } );
+		super.openTitle( title, { action: 'edit', vehidebetadialog: 1, hidewelcomedialog: 1 } );
 	}
 
 	preview( name, content ) {
diff --git a/tests/selenium/specs/page.js b/tests/selenium/specs/page.js
index e2ca6554c1..b04a578723 100644
--- a/tests/selenium/specs/page.js
+++ b/tests/selenium/specs/page.js
@@ -1,6 +1,5 @@
 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' ),
@@ -13,9 +12,6 @@ describe( 'Page', function () {
 	var content, name, bot;
 
 	before( async function () {
-		// disable VisualEditor welcome dialog
-		BlankPage.open();
-		browser.setLocalStorage( 've-beta-welcome-dialog', '1' );
 		bot = await Api.bot();
 	} );
 
diff --git a/tests/selenium/specs/rollback.js b/tests/selenium/specs/rollback.js
index ffe2a5714c..c980bc33d2 100644
--- a/tests/selenium/specs/rollback.js
+++ b/tests/selenium/specs/rollback.js
@@ -1,5 +1,4 @@
 const assert = require( 'assert' ),
-	BlankPage = require( 'wdio-mediawiki/BlankPage' ),
 	HistoryPage = require( '../pageobjects/history.page' ),
 	UserLoginPage = require( 'wdio-mediawiki/LoginPage' ),
 	Util = require( 'wdio-mediawiki/Util' );
@@ -9,10 +8,7 @@ describe( 'Rollback with confirmation', function () {
 		name;
 
 	before( function () {
-		// disable VisualEditor welcome dialog
 		browser.deleteAllCookies();
-		BlankPage.open();
-		browser.setLocalStorage( 've-beta-welcome-dialog', '1' );
 
 		// Enable rollback confirmation for admin user
 		// Requires user to log in again, handled by deleteCookie() call in beforeEach function
@@ -89,10 +85,7 @@ describe( 'Rollback without confirmation', function () {
 		name;
 
 	before( function () {
-		// disable VisualEditor welcome dialog
 		browser.deleteAllCookies();
-		BlankPage.open();
-		browser.setLocalStorage( 've-beta-welcome-dialog', '1' );
 
 		// Disable rollback confirmation for admin user
 		// Requires user to log in again, handled by deleteCookie() call in beforeEach function
diff --git a/tests/selenium/specs/user.js b/tests/selenium/specs/user.js
index 77f271e334..2558881b51 100644
--- a/tests/selenium/specs/user.js
+++ b/tests/selenium/specs/user.js
@@ -1,5 +1,4 @@
 const assert = require( 'assert' ),
-	BlankPage = require( 'wdio-mediawiki/BlankPage' ),
 	CreateAccountPage = require( '../pageobjects/createaccount.page' ),
 	PreferencesPage = require( '../pageobjects/preferences.page' ),
 	UserLoginPage = require( 'wdio-mediawiki/LoginPage' ),
@@ -10,12 +9,6 @@ describe( 'User', function () {
 	var password,
 		username;
 
-	before( function () {
-		// disable VisualEditor welcome dialog
-		BlankPage.open();
-		browser.setLocalStorage( 've-beta-welcome-dialog', '1' );
-	} );
-
 	beforeEach( function () {
 		browser.deleteAllCookies();
 		username = Util.getTestString( 'User-' );