WebdriverIO should be able to run Chrome headlessly

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

diff --git a/tests/selenium/wdio.conf.jenkins.js b/tests/selenium/wdio.conf.jenkins.js
index 6049eb2..de2b738 100644 (file)
--- a/tests/selenium/wdio.conf.jenkins.js
+++ b/tests/selenium/wdio.conf.jenkins.js
@@ -1,16 +1,22 @@
-/* eslint no-undef: "error" */
-/* eslint-env node */
 'use strict';
-var merge = require( 'deepmerge' ),
+const merge = require( 'deepmerge' ),
+       password = 'testpass',
+       username = 'WikiAdmin',
        wdioConf = require( './wdio.conf.js' );
 
 // Overwrite default settings
 exports.config = merge( wdioConf.config, {
-       username: 'WikiAdmin',
-       password: 'testpass',
+       username: process.env.MEDIAWIKI_USER === undefined ?
+               username :
+               process.env.MEDIAWIKI_USER,
+       password: process.env.MEDIAWIKI_PASSWORD === undefined ?
+               password :
+               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: {