mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 01:54:15 +00:00
Config file fix
This commit is contained in:
@@ -3,13 +3,15 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
module.exports = function(config) {
|
module.exports = function(config) {
|
||||||
var webdriverConfig = {
|
|
||||||
hostname: '4science-devel1',
|
|
||||||
port: 4202
|
|
||||||
}
|
|
||||||
|
|
||||||
var testWebpackConfig = require('./webpack.test.config.js')({env: 'test'});
|
var testWebpackConfig = require('./webpack.test.config.js')({env: 'test'});
|
||||||
|
|
||||||
|
// Uncomment and change to run tests on a remote Selenium server
|
||||||
|
var webdriverConfig = {
|
||||||
|
hostname: 'localhost',
|
||||||
|
port: 4444
|
||||||
|
}
|
||||||
|
|
||||||
var configuration = {
|
var configuration = {
|
||||||
|
|
||||||
// base path that will be used to resolve all patterns (e.g. files, exclude)
|
// base path that will be used to resolve all patterns (e.g. files, exclude)
|
||||||
@@ -83,8 +85,8 @@ module.exports = function(config) {
|
|||||||
*/
|
*/
|
||||||
reporters: [ 'coverage', 'karma-remap-istanbul' ],
|
reporters: [ 'coverage', 'karma-remap-istanbul' ],
|
||||||
|
|
||||||
// web server port
|
// Karma web server port
|
||||||
port: 4212,
|
port: 9876,
|
||||||
|
|
||||||
// enable / disable colors in the output (reporters and logs)
|
// enable / disable colors in the output (reporters and logs)
|
||||||
colors: true,
|
colors: true,
|
||||||
@@ -104,19 +106,25 @@ module.exports = function(config) {
|
|||||||
*/
|
*/
|
||||||
browsers: [
|
browsers: [
|
||||||
'Chrome'
|
'Chrome'
|
||||||
|
//'ChromeTravisCi',
|
||||||
|
//'SeleniumChrome',
|
||||||
|
//'SeleniumFirefox'
|
||||||
],
|
],
|
||||||
|
|
||||||
customLaunchers: {
|
customLaunchers: {
|
||||||
ChromeTravisCi: {
|
// Continuous integraation with Chrome - launcher
|
||||||
|
'ChromeTravisCi': {
|
||||||
base: 'Chrome',
|
base: 'Chrome',
|
||||||
flags: ['--no-sandbox']
|
flags: ['--no-sandbox']
|
||||||
},
|
},
|
||||||
'chrome': {
|
// Remote Selenium Server with Chrome - launcher
|
||||||
|
'SeleniumChrome': {
|
||||||
base: 'WebDriver',
|
base: 'WebDriver',
|
||||||
config: webdriverConfig,
|
config: webdriverConfig,
|
||||||
browserName: 'chrome',
|
browserName: 'chrome',
|
||||||
},
|
},
|
||||||
'firefox': {
|
// Remote Selenium Server with Firefox - launcher
|
||||||
|
'SeleniumFirefox': {
|
||||||
base: 'WebDriver',
|
base: 'WebDriver',
|
||||||
config: webdriverConfig,
|
config: webdriverConfig,
|
||||||
browserName: 'firefox',
|
browserName: 'firefox',
|
||||||
|
Reference in New Issue
Block a user