Skip to content

Commit a04a5ed

Browse files
committed
Remove tests.js
1 parent f268647 commit a04a5ed

File tree

3 files changed

+14
-21
lines changed

3 files changed

+14
-21
lines changed

karma.conf.js

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
1+
var glob = require('glob');
2+
13
module.exports = function (config) {
24
config.set({
35

46
basePath: '',
57

6-
frameworks: ['mocha', 'browserify'],
8+
frameworks: [ 'mocha', 'browserify' ],
79

8-
files: [
9-
'tests.js'
10-
],
10+
files: glob.sync('modules/**/__tests__/*-test.js'),
1111

1212
exclude: [],
1313

1414
preprocessors: {
15-
'tests.js': ['browserify']
15+
'modules/**/__tests__/*-test.js': [ 'browserify' ]
1616
},
1717

1818
browserify: {
19-
transform: [ ['reactify', {'es6': true}], 'envify' ],
19+
debug: true,
2020
watch: true,
21-
debug: true
21+
transform: [
22+
[ 'reactify', { 'es6': true } ],
23+
'envify'
24+
]
2225
},
2326

24-
reporters: ['progress'],
27+
reporters: [ 'progress' ],
2528

2629
port: 9876,
2730

@@ -31,7 +34,7 @@ module.exports = function (config) {
3134

3235
autoWatch: true,
3336

34-
browsers: ['Chrome'],
37+
browsers: [ 'Chrome' ],
3538

3639
captureTimeout: 60000,
3740

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"envify": "1.2.0",
2828
"events": "1.0.2",
2929
"expect": "0.1.1",
30+
"glob": "4.2.1",
3031
"jsx-loader": "0.12.0",
3132
"karma": "0.12.16",
3233
"karma-browserify": "1.0.0",
@@ -65,4 +66,4 @@
6566
"browserify-shim": {
6667
"react": "global:React"
6768
}
68-
}
69+
}

tests.js

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)