Merge "selenium: Re-add all tests and wdio-mocha-framework, now v0.6.4"

diff --git a/package.json b/package.json
index f448edb..8fec026 100644 (file)
--- a/package.json
+++ b/package.json
@@ -6,9 +6,9 @@
     "qunit": "grunt qunit",
     "doc": "jsduck",
     "postdoc": "grunt copy:jsduck",
-    "selenium": "echo 'ALL SELENIUM TESTING IS TEMPORARILY DISABLED T222406' # bash ./tests/selenium/selenium.sh",
-    "selenium-daily": "echo 'ALL SELENIUM TESTING IS TEMPORARILY DISABLED T222406' npm run selenium-test -- --mochaOpts.grep @daily",
-    "selenium-test": "echo 'ALL SELENIUM TESTING IS TEMPORARILY DISABLED T222406' wdio ./tests/selenium/wdio.conf.js"
+    "selenium": "bash ./tests/selenium/selenium.sh",
+    "selenium-daily": "npm run selenium-test -- --mochaOpts.grep @daily",
+    "selenium-test": "wdio ./tests/selenium/wdio.conf.js"
   },
   "devDependencies": {
     "eslint-config-wikimedia": "0.12.0",
@@ -31,6 +31,7 @@
     "stylelint-config-wikimedia": "0.5.0",
     "wdio-junit-reporter": "0.2.0",
     "wdio-mediawiki": "file:tests/selenium/wdio-mediawiki",
+    "wdio-mocha-framework": "0.6.4",
     "wdio-sauce-service": "0.3.1",
     "wdio-spec-reporter": "0.0.5",
     "webdriverio": "4.12.0"

diff --git a/tests/selenium/wdio.conf.js b/tests/selenium/wdio.conf.js
index 69144a1..56e4934 100644 (file)
--- a/tests/selenium/wdio.conf.js
+++ b/tests/selenium/wdio.conf.js
@@ -55,13 +55,12 @@ exports.config = {
        // FIXME: The non-core patterns to be removed once T199116 is fixed.
        // ==================
        specs: [
-               // T222406: Temporarily disabling all selenium tests for node6->10 CI migration
-               // relPath( './tests/selenium/wdio-mediawiki/specs/*.js' ),
-               // relPath( './tests/selenium/specs/**/*.js' ),
-               // relPath( './extensions/*/tests/selenium/specs/**/*.js' ),
-               // relPath( './extensions/VisualEditor/modules/ve-mw/tests/selenium/specs/**/*.js' ),
-               // relPath( './extensions/Wikibase/repo/tests/selenium/specs/**/*.js' ),
-               // relPath( './skins/*/tests/selenium/specs/**/*.js' )
+               relPath( './tests/selenium/wdio-mediawiki/specs/*.js' ),
+               relPath( './tests/selenium/specs/**/*.js' ),
+               relPath( './extensions/*/tests/selenium/specs/**/*.js' ),
+               relPath( './extensions/VisualEditor/modules/ve-mw/tests/selenium/specs/**/*.js' ),
+               relPath( './extensions/Wikibase/repo/tests/selenium/specs/**/*.js' ),
+               relPath( './skins/*/tests/selenium/specs/**/*.js' )
        ],
        // Patterns to exclude
        exclude: [