Skip to content

Commit 99a738c

Browse files
committed
add react-jss to the test suite
1 parent 4c1abda commit 99a738c

File tree

5 files changed

+17
-13
lines changed

5 files changed

+17
-13
lines changed

.bithoundrc

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
{
22
"ignore": [
3-
"examples/**",
3+
"benchmark/**",
4+
"docs/**",
45
"dist/**",
5-
"test/**"
6+
"test/**",
7+
"node_modules/**"
8+
],
9+
"tests": [
10+
"/tests"
611
]
712
}

karma.conf.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
const assign = require('lodash.assign')
21
const webpackConfig = require('./webpack.config')
32
const browsers = require('./browsers')
4-
const plugins = require('./plugins')
3+
const testPackages = require('./test-packages')
54

65
const isBench = process.env.BENCHMARK === 'true'
76
const useCloud = process.env.USE_CLOUD === 'true'
@@ -12,7 +11,7 @@ const travisBuildNumber = process.env.TRAVIS_BUILD_NUMBER
1211
const travisBuildId = process.env.TRAVIS_BUILD_ID
1312
const travisJobNumber = process.env.TRAVIS_JOB_NUMBER
1413

15-
const filesForWebpack = plugins
14+
const filesForWebpack = testPackages
1615
.map(name => `node_modules/${name}/tests.webpack.js`)
1716
.concat([
1817
'tests.webpack.js'
@@ -31,7 +30,7 @@ module.exports = (config) => {
3130
map[file] = ['webpack', 'sourcemap']
3231
return map
3332
}, {}),
34-
webpack: assign(webpackConfig, {
33+
webpack: Object.assign(webpackConfig, {
3534
devtool: 'inline-source-map'
3635
}),
3736
webpackServer: {
@@ -45,7 +44,7 @@ module.exports = (config) => {
4544
}
4645
})
4746
if (isBench) {
48-
assign(config, {
47+
Object.assign(config, {
4948
browsers: ['Chrome'],
5049
frameworks: ['benchmark'],
5150
files: ['benchmark/**/*.js'],
@@ -57,7 +56,7 @@ module.exports = (config) => {
5756
}
5857

5958
if (useCloud) {
60-
assign(config, {
59+
Object.assign(config, {
6160
browsers: Object.keys(browsers),
6261
browserDisconnectTolerance: 3,
6362
// My current OS plan allows max 2 parallel connections.
@@ -72,7 +71,7 @@ module.exports = (config) => {
7271
}
7372

7473
if (isTravis) {
75-
assign(config.browserStack, {
74+
Object.assign(config.browserStack, {
7675
build: `TRAVIS #${travisBuildNumber} (${travisBuildId})`,
7776
name: travisJobNumber
7877
})

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@
4545
"eslint-plugin-react": "^5.0.1",
4646
"expect.js": "^0.3.1",
4747
"json-loader": "^0.5.4",
48-
"jss-extend": "2.x",
49-
"jss-nested": "2.x",
48+
"jss-extend": "^2.0.0",
49+
"jss-nested": "^2.0.0",
50+
"react-jss": "^4.0.0",
5051
"karma": "^1.1.1",
5152
"karma-benchmark": "^0.6.0",
5253
"karma-benchmark-reporter": "^0.1.1",
@@ -60,7 +61,6 @@
6061
"karma-sourcemap-loader": "^0.3.5",
6162
"karma-webpack": "^1.7.0",
6263
"lint-staged": "^3.0.1",
63-
"lodash.assign": "^4.0.9",
6464
"mocha": "^2.4.5",
6565
"pre-commit": "^1.1.3",
6666
"webpack": "^1.12.2"

plugins.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

test-packages.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
["jss-nested", "react-jss"]

0 commit comments

Comments
 (0)