Skip to content

Commit 85bc0ee

Browse files
authored
Merge branch 'master' into run-tests-ts
2 parents 32f6962 + 15dabb7 commit 85bc0ee

File tree

4 files changed

+303
-194
lines changed

4 files changed

+303
-194
lines changed

karma.conf.js

+3-14
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,13 @@ module.exports = function(config) {
88

99
// frameworks to use
1010
// available frameworks: https://npmjs.org/browse/keyword/karma-adapter
11-
frameworks: ['browserify', 'detectBrowsers', 'tap'],
11+
frameworks: ['browserify', 'tap'],
1212

1313
// list of files / patterns to load in the browser
1414
files: ['./tests/api/**/*.js'],
1515

1616
// list of files / patterns to exclude
17-
exclude: [
18-
'./tests/api/state/stateManager.js', // 4, "# should clear the cache when the state root is set"
19-
],
17+
exclude: [],
2018

2119
// preprocess matching files before serving them to the browser
2220
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
@@ -44,21 +42,12 @@ module.exports = function(config) {
4442

4543
// start these browsers
4644
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
47-
browsers: ['FirefoxHeadless'],
45+
browsers: ['FirefoxHeadless', 'ChromeHeadless'],
4846

4947
// Continuous Integration mode
5048
// if true, Karma captures browsers, runs the tests and exits
5149
singleRun: true,
5250

53-
// karma-detect-browsers plugin config
54-
detectBrowsers: {
55-
enabled: true,
56-
usePhantomJS: false,
57-
postDetection: function(availableBrowsers) {
58-
return ['FirefoxHeadless']
59-
},
60-
},
61-
6251
// Concurrency level
6352
// how many browser should be started simultaneous
6453
concurrency: Infinity,

package.json

-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
"karma": "^4.0.1",
7979
"karma-browserify": "^6.0.0",
8080
"karma-chrome-launcher": "^2.2.0",
81-
"karma-detect-browsers": "^2.3.3",
8281
"karma-firefox-launcher": "^1.1.0",
8382
"karma-tap": "^4.1.4",
8483
"level": "^4.0.0",

0 commit comments

Comments
 (0)