Merge "Selenium: Replace nodemw with mwbot"

diff --git a/package.json b/package.json
index 1ea9a1f..26a6086 100644 (file)
--- a/package.json
+++ b/package.json
@@ -32,8 +32,8 @@
     "stylelint-config-wikimedia": "0.4.2",
     "wdio-junit-reporter": "0.2.0",
     "wdio-mocha-framework": "0.5.8",
-    "wdio-sauce-service": "^0.3.1",
+    "wdio-sauce-service": "0.3.1",
     "wdio-spec-reporter": "0.0.5",
-    "webdriverio": "4.6.2"
+    "webdriverio": "4.12.0"
   }
 }

diff --git a/tests/selenium/pageobjects/page.js b/tests/selenium/pageobjects/page.js
index ed1f1bc..77bb1f4 100644 (file)
--- a/tests/selenium/pageobjects/page.js
+++ b/tests/selenium/pageobjects/page.js
@@ -2,7 +2,7 @@
 'use strict';
 class Page {
        open( path ) {
-               browser.url( '/index.php?title=' + path );
+               browser.url( browser.options.baseUrl + '/index.php?title=' + path );
        }
 }
 module.exports = Page;

diff --git a/tests/selenium/pageobjects/restore.page.js b/tests/selenium/pageobjects/restore.page.js
index ef47438..071f7f9 100644 (file)
--- a/tests/selenium/pageobjects/restore.page.js
+++ b/tests/selenium/pageobjects/restore.page.js
@@ -8,7 +8,7 @@ class RestorePage extends Page {
        get displayedContent() { return browser.element( '#mw-content-text' ); }
 
        open( name ) {
-               browser.url( '/index.php?title=Special:Undelete/' + name );
+               super.open( 'Special:Undelete/' + name );
        }
 
        restore( name, reason ) {

diff --git a/tests/selenium/wdio.conf.jenkins.js b/tests/selenium/wdio.conf.jenkins.js
index 26881eb..de2b738 100644 (file)
--- a/tests/selenium/wdio.conf.jenkins.js
+++ b/tests/selenium/wdio.conf.jenkins.js
@@ -14,7 +14,9 @@ exports.config = merge( wdioConf.config, {
                process.env.MEDIAWIKI_PASSWORD,
        screenshotPath: '../log/',
        baseUrl: process.env.MW_SERVER + process.env.MW_SCRIPT_PATH,
-
+       exclude: [
+               './extensions/CirrusSearch/tests/selenium/specs/**/*.js'
+       ],
        reporters: [ 'spec', 'junit' ],
        reporterOptions: {
                junit: {