Skip to content

Commit a9d5247

Browse files
author
Ives van Hoorne
committed
Fix tests
1 parent 5ac9e61 commit a9d5247

File tree

6 files changed

+371
-11448
lines changed

6 files changed

+371
-11448
lines changed

.eslintrc

+1-5
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323
"no-plusplus": 0
2424
},
2525
"settings": {
26-
"import/resolver": {
27-
"webpack": {
28-
"config": "config/webpack.common.js"
29-
}
30-
}
26+
"import/resolver": "webpack"
3127
}
3228
}

config/webpack.common.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ module.exports = {
137137

138138
resolve: {
139139
mainFields: ['browser', 'module', 'jsnext:main', 'main'],
140-
modules: ['src', 'node_modules'],
140+
modules: ['node_modules'],
141141

142142
extensions: ['.js', '.json'],
143143

package.json

+11-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"autoprefixer": "^6.7.7",
99
"babel-core": "^6.25.0",
1010
"babel-eslint": "^7.2.3",
11-
"babel-jest": "^20.0.3",
11+
"babel-jest": "^21.2.0",
1212
"babel-loader": "7.1.1",
1313
"babel-macros": "^1.0.2",
1414
"babel-plugin-codegen": "^1.2.0",
@@ -56,9 +56,9 @@
5656
"html-webpack-plugin": "^2.24.1",
5757
"http-proxy-middleware": "^0.17.3",
5858
"husky": "^0.14.3",
59-
"jest": "^20.0.0",
59+
"jest": "^21.2.1",
6060
"jest-image-snapshot": "^1.0.1",
61-
"jest-styled-components": "^4.3.0",
61+
"jest-styled-components": "^4.9.0",
6262
"json-loader": "0.5.4",
6363
"lerna": "^2.4.0",
6464
"lint-staged": "^4.0.1",
@@ -202,11 +202,17 @@
202202
},
203203
"jest": {
204204
"roots": ["<rootDir>/src"],
205-
"moduleDirectories": ["node_modules", "src"],
206-
"testPathIgnorePatterns": ["/node_modules/", "/create-zip\\/.*\\/files/"],
205+
"moduleDirectories": ["node_modules"],
206+
"testPathIgnorePatterns": ["/create-zip\\/.*\\/files/"],
207+
"transformIgnorePatterns": [
208+
"<rootDir>/node_modules/(?!(embed|app|common))"
209+
],
207210
"moduleNameMapper": {
208211
"\\.css$": "<rootDir>/__mocks__/styleMock.js",
209212
"\\.html$": "<rootDir>/__mocks__/styleMock.js"
213+
},
214+
"transform": {
215+
"^.+\\.js$": "babel-jest"
210216
}
211217
},
212218
"workspaces": ["src/**"]
+1-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
const host = process.env.CODESANDBOX_HOST;
2-
3-
export default host || 'https://codesandbox.io';
1+
export default 'https://codesandbox.io';

0 commit comments

Comments
 (0)