Skip to content

Commit

Permalink
Fixed jest setup
Browse files Browse the repository at this point in the history
  • Loading branch information
sunesimonsen committed Apr 18, 2018
1 parent f059250 commit dfb5d5d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 25 deletions.
31 changes: 11 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
"name": "unexpected",
"version": "10.37.4",
"author": "Sune Sloth Simonsen <sune@we-knowhow.dk>",
"keywords": [
"assertion",
"test",
"assert"
],
"keywords": ["assertion", "test", "assert"],
"license": "MIT",
"bugs": "https://github.com/unexpectedjs/unexpected/issues",
"repository": {
Expand All @@ -16,9 +12,12 @@
"scripts": {
"test": "make test && make test-phantomjs",
"lint": "eslint .",
"generate-site": "generate-site --require ./bootstrap-unexpected-markdown.js",
"update-examples": "generate-site --require ./bootstrap-unexpected-markdown.js --update-examples",
"preversion": "test -n \"${IS_MAKE_RELEASE}\" || (echo Please run make release instead && exit 1)"
"generate-site":
"generate-site --require ./bootstrap-unexpected-markdown.js",
"update-examples":
"generate-site --require ./bootstrap-unexpected-markdown.js --update-examples",
"preversion":
"test -n \"${IS_MAKE_RELEASE}\" || (echo Please run make release instead && exit 1)"
},
"main": "./build/lib/index.js",
"dependencies": {
Expand Down Expand Up @@ -67,23 +66,15 @@
"unexpected-magicpen": "^0.2.2",
"unexpected-markdown": "^1.7.4"
},
"files": [
"unexpected.js",
"unexpected.js.map",
"lib",
"build/lib"
],
"files": ["unexpected.js", "unexpected.js.map", "lib", "build/lib"],
"jspm": {
"dependencies": {
},
"dependencies": {},
"main": "unexpected.js",
"jspmPackage": true
},
"jest": {
"setupFiles": [
"<rootDir>/test/promisePolyfill"
],
"setupFiles": ["<rootDir>/test/promisePolyfill"],
"setupTestFrameworkScriptFile": "<rootDir>/test/common.js",
"testRegex": "test\\/.*\\.spec\\.js$"
"testMatch": ["<rootDir>/test/**.spec.js"]
}
}
8 changes: 3 additions & 5 deletions test/jest.es5.config.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"setupFiles": [
"<rootDir>/build/test/promisePolyfill"
],
"setupTestFrameworkScriptFile": "<rootDir>/build/test/common.js",
"testRegex": "<rootDir>/build/test\\/.*\\.spec\\.js$"
"setupFiles": ["<rootDir>/build/test/promisePolyfill"],
"setupTestFrameworkScriptFile": "<rootDir>/build/test/common.js",
"testMatch": ["<rootDir>/build/test/**.spec.js"]
}

0 comments on commit dfb5d5d

Please sign in to comment.