Skip to content

Commit

Permalink
Clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
vlad-ignatov committed Jun 19, 2020
1 parent 8cf7c4c commit 767a211
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 67 deletions.
65 changes: 10 additions & 55 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,18 +91,9 @@ module.exports = function(config) {
// start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
browsers: [
// "Chrome", // uses karma-chrome-launcher
// "ChromeHeadless",
// "Firefox", // uses karma-firefox-launcher
"FirefoxHeadless",
// "ChromeCanary", // uses karma-chrome-launcher
// "Safari", // uses karma-safari-launcher
// "IE", // uses karma-ie-launcher
// "PhantomJS" // uses karma-phantomjs-launcher
"FirefoxHeadless"
],

// browsers: ["MyHeadlessChrome"],

// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
singleRun: false,
Expand All @@ -111,67 +102,31 @@ module.exports = function(config) {
// how many browser should be started simultaneous
concurrency: Infinity,

// plugins: [
// require("./node_modules/karma-webpack"),
// require("./node_modules/karma-mocha"),
// require("./node_modules/karma-mocha-reporter"),
// require("./node_modules/karma-chai"),
// require("./node_modules/karma-phantomjs-launcher")
// ],

customLaunchers: {
'FirefoxHeadless': {
FirefoxHeadless: {
base: 'Firefox',
flags: [
'-headless',
],
}
},

// customLaunchers: {
// MyHeadlessChrome: {
// base: "Chrome",
// flags: [
// "--headless",
// "--disable-gpu",
// "--remote-debugging-port-9222"
// ]
// }
// },

// // PhantomJS custom settings
// phantomjsLauncher: {

// // Have phantomjs exit if a ResourceError is encountered (useful if
// // karma exits without killing phantom)
// exitOnResourceError: true
// },
// PhantomJS custom settings
phantomjsLauncher: {

// Have phantomjs exit if a ResourceError is encountered (useful if
// karma exits without killing phantom)
exitOnResourceError: true
},

mochaReporter: {
showDiff: true
}
};

if (process.env.CIRCLECI) {
// @ts-ignore
// options.customLaunchers = {
// Chrome_CircleCI: {
// base: 'ChromeHeadless',
// flags: [
// '--no-sandbox',
// '--headless',
// '--disable-gpu',
// '--disable-translate',
// '--disable-extensions'
// ]
// }
// };
options.browsers = [
"PhantomJS",
// "Firefox",
//"IE",
//"Opera",
// "PhantomJS"
"phantomjsLauncher"
];
};

Expand Down
11 changes: 1 addition & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@
"json5-loader": "^1.0.1",
"karma": "^1.7.1",
"karma-chai": "^0.1.0",
"karma-chrome-launcher": "^3.1.0",
"karma-firefox-launcher": "^1.3.0",
"karma-mocha": "^1.3.0",
"karma-mocha-reporter": "^2.2.3",
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
TIMEOUT : 15000, // timeout when waiting for something
PAUSE : 800, // pause between interactions so that humans can see wait is going on
PICKER_URL : "http://localhost:9001/#/",
PICKER_URL : "http://localhost:8080/#/",
};

0 comments on commit 767a211

Please sign in to comment.