Skip to content

Commit

Permalink
86 tests added now
Browse files Browse the repository at this point in the history
  • Loading branch information
KFlash committed Dec 31, 2015
1 parent 961e56a commit 42581e9
Show file tree
Hide file tree
Showing 12 changed files with 1,822 additions and 41 deletions.
12 changes: 6 additions & 6 deletions config/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ module.exports = function(config) {
// list of files / patterns to load in the browser
files: [
'../src/**/*__tests__*/**/*spec.ut.js', // UT
'../test/specs/**/*spec.browser.js', // AT
'../test/specs/**/*spec.server.js', // AT
'../test/specs/**/*spec.js', // AT
'../test/specs/no-jsx/**/*spec.browser.js', // AT
'../test/specs/no-jsx/**/*spec.server.js', // AT
'../test/specs/no-jsx/**/*spec.js', // AT
'../test/specs/jsx/**/*spec.browser.js', // AT
'../test/specs/jsx/**/*spec.server.js', // AT
'../test/specs/jsx/**/*spec.js' // AT
Expand All @@ -29,9 +29,9 @@ module.exports = function(config) {
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
preprocessors: {
'../src/**/*__tests__*/**/*spec.ut.js': ['webpack'], // UT
'../test/specs/**/*spec.server.js': ['webpack'], // AT
'../test/specs/**/*spec.js': ['webpack'], // AT
'../test/specs/**/*.spec.browser.js': ['webpack'], // AT
'../test/specs/no-jsx/**/*spec.server.js': ['webpack'], // AT
'../test/specs/no-jsx/**/*spec.js': ['webpack'], // AT
'../test/specs/no-jsx/**/*.spec.browser.js': ['webpack'], // AT
'../test/specs/jsx/**/*spec.server.js': ['webpack'], // AT
'../test/specs/jsx/**/*spec.js': ['webpack'], // AT
'../test/specs/jsx/**/*.spec.browser.js': ['webpack'], // AT
Expand Down
4 changes: 2 additions & 2 deletions config/mocha.opts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
./test/specs/**/*spec.server.js
./test/specs/**/*spec.js
./test/specs/no-jsx/**/*spec.server.js
./test/specs/no-jsx/**/*spec.js
./test/specs/jsx/**/*spec.server.js
./test/specs/jsx/**/*spec.js

Expand Down
6 changes: 3 additions & 3 deletions config/webpack.dev.conf.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const webpack = require('webpack');
const glob = require('glob');

const entries = glob.sync('./test/specs/**/*.spec.js')
.concat(glob.sync('./test/specs/**/*.spec.browser.js'))
.concat(glob.sync('./test/specs/**/*.spec.server.js'))
const entries = glob.sync('./test/specs/no-jsx/**/*.spec.js')
.concat(glob.sync('./test/specs/no-jsx/**/*.spec.browser.js'))
.concat(glob.sync('./test/specs/no-jsx/**/*.spec.server.js'))
.concat(glob.sync('./test/specs/jsx/**/*.spec.browser.js'))
.concat(glob.sync('./test/specs/jsx/**/*.spec.server.js'))
.concat(glob.sync('./test/specs/jsx/**/*.spec.js'))
Expand Down
8 changes: 8 additions & 0 deletions test/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"globals": {
"expect": true
},
"env": {
"mocha": true
}
}
6 changes: 0 additions & 6 deletions test/specs/inferno.spec.browser.js

This file was deleted.

6 changes: 0 additions & 6 deletions test/specs/inferno.spec.js

This file was deleted.

6 changes: 0 additions & 6 deletions test/specs/inferno.spec.server.js

This file was deleted.

Loading

0 comments on commit 42581e9

Please sign in to comment.