Merge "Remove perf tracking code that was moved to WikimediaEvents in Ib300af5c"

[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 4491c8e..59e1878 100644 (file)
--- a/tests/selenium/wdio.conf.jenkins.js
+++ b/tests/selenium/wdio.conf.jenkins.js
@@ -1,13 +1,19 @@
-/* eslint no-undef: "error"*/
-/* eslint-env node*/
+/* 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,