Skip to content

Commit

Permalink
Merge pull request #35 from marmelab/modernize-tests
Browse files Browse the repository at this point in the history
Modernize test
  • Loading branch information
djhi authored Feb 4, 2021
2 parents e3c5ad0 + f3e3663 commit 1483b82
Show file tree
Hide file tree
Showing 11 changed files with 6,629 additions and 3,973 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ build:
watch:
@${CURDIR}/node_modules/.bin/webpack --watch

test: build-dev
@CHROME_BIN=`which chromium-browser` ${CURDIR}/node_modules/karma/bin/karma start test/karma.conf.js --single-run
test:
@npm run test
7,920 changes: 5,134 additions & 2,786 deletions package-lock.json

Large diffs are not rendered by default.

63 changes: 29 additions & 34 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,36 +1,31 @@
{
"name": "fakerest",
"version": "2.2.0",
"repository": "https://github.com/marmelab/FakeRest",
"description": "Patch XMLHttpRequest to fake a REST server based on JSON data. ",
"scripts": {
"test": "make test"
},
"main": "dist/FakeRest.min.js",
"author": "François Zaninotto <[email protected]>",
"license": "MIT",
"devDependencies": {
"@babel/preset-env": "^7.12.13",
"babel-core": "^6.26.3",
"babel-loader": "^8.2.2",
"babel-plugin-add-module-exports": "^1.0.4",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-polyfill": "^6.26.0",
"babel-runtime": "^6.26.0",
"fetch-mock": "^9.11.0",
"jasmine-core": "^2.5.2",
"karma": "1.4.1",
"karma-chrome-launcher": "2.0.0",
"karma-jasmine": "1.1.0",
"karma-phantomjs-launcher": "1.0.2",
"karma-spec-reporter": "0.0.26",
"sinon": "~1.14.1",
"terser-webpack-plugin": "^5.1.1",
"webpack": "^5.20.0",
"webpack-cli": "^4.5.0"
},
"dependencies": {
"babel-runtime": "^6.26.0"
},
"browserslist": "> 0.25%, not dead"
"name": "fakerest",
"version": "3.0.0",
"repository": "https://github.com/marmelab/FakeRest",
"description": "Patch XMLHttpRequest to fake a REST server based on JSON data. ",
"scripts": {
"test": "jest"
},
"main": "dist/FakeRest.min.js",
"author": "François Zaninotto <[email protected]>",
"license": "MIT",
"devDependencies": {
"@babel/preset-env": "^7.12.13",
"babel-core": "^6.26.3",
"babel-loader": "^8.2.2",
"babel-plugin-add-module-exports": "^1.0.4",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-polyfill": "^6.26.0",
"babel-runtime": "^6.26.0",
"fetch-mock": "^9.11.0",
"jest": "^26.6.3",
"sinon": "~1.14.1",
"terser-webpack-plugin": "^5.1.1",
"webpack": "^5.20.0",
"webpack-cli": "^4.5.0"
},
"dependencies": {
"babel-runtime": "^6.26.0"
},
"browserslist": "> 0.25%, not dead"
}
Loading

0 comments on commit 1483b82

Please sign in to comment.