X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=tests%2Fselenium%2Fwdio.conf.jenkins.js;h=59e1878a5593d3bf3c1af455ef7eefa87cc0409a;hb=f23ff352ac8b883e958d3a7f506f991571d18d88;hp=6049eb250504c99bf87c788ce26e91eee5fbe706;hpb=9b4fd6a6c054a8b012ea0d358478f3ee1c392469;p=lhc%2Fweb%2Fwiklou.git diff --git a/tests/selenium/wdio.conf.jenkins.js b/tests/selenium/wdio.conf.jenkins.js index 6049eb2505..59e1878a55 100644 --- 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 */ '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,