Merge "Skin: Make skins aware of their registered skin name"

[lhc/web/wiklou.git] / tests / selenium / wdio.conf.js

diff --git a/tests/selenium/wdio.conf.js b/tests/selenium/wdio.conf.js
index c8fb8a7..cf9da0c 100644 (file)
--- a/tests/selenium/wdio.conf.js
+++ b/tests/selenium/wdio.conf.js
@@ -1,10 +1,11 @@
-/* eslint comma-dangle: 0 */
-/* eslint no-undef: "error" */
-/* eslint no-console: 0 */
 /* eslint-env node */
+/* eslint no-undef: "error" */
+/* eslint-disable no-console, comma-dangle */
 'use strict';
 
-const path = require( 'path' );
+const password = 'vagrant',
+       path = require( 'path' ),
+       username = 'Admin';
 
 function relPath( foo ) {
        return path.resolve( __dirname, '../..', foo );
@@ -24,10 +25,10 @@ exports.config = {
        // Use if from tests with:
        // browser.options.username
        username: process.env.MEDIAWIKI_USER === undefined ?
-               'Admin' :
+               username :
                process.env.MEDIAWIKI_USER,
        password: process.env.MEDIAWIKI_PASSWORD === undefined ?
-               'vagrant' :
+               password :
                process.env.MEDIAWIKI_PASSWORD,
        //
        // ======
@@ -49,7 +50,8 @@ exports.config = {
        specs: [
                relPath( './tests/selenium/specs/**/*.js' ),
                relPath( './extensions/*/tests/selenium/specs/**/*.js' ),
-               relPath( './extensions/VisualEditor/modules/ve-mw/tests/selenium/specs/**/*.js' )
+               relPath( './extensions/VisualEditor/modules/ve-mw/tests/selenium/specs/**/*.js' ),
+               relPath( './skins/*/tests/selenium/specs/**/*.js' ),
        ],
        // Patterns to exclude.
        exclude: [
@@ -114,12 +116,12 @@ exports.config = {
        // with "/", then the base url gets prepended.
        baseUrl: (
                process.env.MW_SERVER === undefined ?
-               'http://127.0.0.1:8080' :
-               process.env.MW_SERVER
+                       'http://127.0.0.1:8080' :
+                       process.env.MW_SERVER
        ) + (
                process.env.MW_SCRIPT_PATH === undefined ?
-               '/w' :
-               process.env.MW_SCRIPT_PATH
+                       '/w' :
+                       process.env.MW_SCRIPT_PATH
        ),
        //
        // Default timeout for all waitFor* commands.