PLAT-1229 Support for JS tests in Docker devstack

This commit is contained in:
Jeremy Bowman
2017-06-23 10:20:34 -04:00
parent 5a919f2c1c
commit 0a3647848e
5 changed files with 25 additions and 2 deletions

View File

@@ -34,6 +34,7 @@
//
/* eslint-env node */
/* globals process */
'use strict';
@@ -255,6 +256,11 @@ function getBaseConfig(config, useRequireJs) {
});
};
var hostname = 'localhost';
if (process.env.hasOwnProperty('BOK_CHOY_HOSTNAME')) {
hostname = process.env.BOK_CHOY_HOSTNAME;
}
initFrameworks.$inject = ['config.files'];
var customPlugin = {
@@ -278,6 +284,7 @@ function getBaseConfig(config, useRequireJs) {
'karma-chrome-launcher',
'karma-firefox-launcher',
'karma-spec-reporter',
'karma-webdriver-launcher',
'karma-webpack',
'karma-sourcemap-loader',
customPlugin
@@ -303,7 +310,8 @@ function getBaseConfig(config, useRequireJs) {
junitReporter: junitSettings(config),
// web server port
// web server hostname and port
hostname: hostname,
port: 9876,
@@ -333,6 +341,14 @@ function getBaseConfig(config, useRequireJs) {
'app.update.auto': false,
'app.update.enabled': false
}
},
FirefoxDocker: {
base: 'WebDriver',
browserName: 'firefox',
config: {
hostname: 'edx.devstack.firefox',
port: 4444
}
}
},