From: Željko Filipin <zeljko.filipin@gmail.com>
Date: Tue, 4 Sep 2018 09:27:01 +0000 (+0200)
Subject: Selenium: Daily Jenkins job targeting beta cluster should run only tests that pass
X-Git-Tag: 1.34.0-rc.0~4183^2
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=e552e95f71659df601c37939372aca9e9a297113;p=lhc%2Fweb%2Fwiklou.git

Selenium: Daily Jenkins job targeting beta cluster should run only tests that pass

Selenium tests run fine when targeting MediaWiki installation in
MediaWiki-Vagrant and in Jenkins, but fail when targeting beta cluster.
Until tests are refactored to run without failure for beta cluster, let's disable
failing tests.

Bug: T185011
Change-Id: I12da893e7d624d4ebe478bccf0706aa07c965796
---

diff --git a/package.json b/package.json
index d75c15164f..2c74f2ade0 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "doc": "jsduck",
     "postdoc": "grunt copy:jsduck",
     "selenium": "bash ./tests/selenium/selenium.sh",
-    "selenium-daily": "npm run selenium-test",
+    "selenium-daily": "npm run selenium-test -- --mochaOpts.grep @daily",
     "selenium-test": "wdio ./tests/selenium/wdio.conf.js"
   },
   "devDependencies": {
diff --git a/tests/selenium/specs/page.js b/tests/selenium/specs/page.js
index 6a394d8b20..124279c4b0 100644
--- a/tests/selenium/specs/page.js
+++ b/tests/selenium/specs/page.js
@@ -54,7 +54,7 @@ describe( 'Page', function () {
 		assert.strictEqual( EditPage.displayedContent.getText(), content );
 	} );
 
-	it( 'should be editable', function () {
+	it( 'should be editable @daily', function () {
 		// create
 		browser.call( function () {
 			return Api.edit( name, content );
@@ -69,7 +69,7 @@ describe( 'Page', function () {
 		assert.strictEqual( EditPage.displayedContent.getText(), editContent );
 	} );
 
-	it( 'should have history', function () {
+	it( 'should have history @daily', function () {
 		// create
 		browser.call( function () {
 			return Api.edit( name, content );
diff --git a/tests/selenium/specs/user.js b/tests/selenium/specs/user.js
index 4884dedcbb..d55ff4c7d1 100644
--- a/tests/selenium/specs/user.js
+++ b/tests/selenium/specs/user.js
@@ -29,7 +29,7 @@ describe( 'User', function () {
 		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 );
diff --git a/tests/selenium/wdio-mediawiki/specs/BlankPage.js b/tests/selenium/wdio-mediawiki/specs/BlankPage.js
index 8cb46d492b..f9cadcd265 100644
--- a/tests/selenium/wdio-mediawiki/specs/BlankPage.js
+++ b/tests/selenium/wdio-mediawiki/specs/BlankPage.js
@@ -2,7 +2,7 @@ const assert = require( 'assert' ),
 	BlankPage = require( 'wdio-mediawiki/BlankPage' );
 
 describe( 'BlankPage', function () {
-	it( 'should have its title', function () {
+	it( 'should have its title @daily', function () {
 		BlankPage.open();
 
 		// check