resetting to master before running tests

feat-only-run-changes
Adam Pash 8 years ago
parent a710efd2d5
commit e797fa717f

@ -14,6 +14,7 @@ dependencies:
- nvm install 7.0.0
# For some reason phantomjs-prebuild is failing w/yarn, but npm installing works
- npm install phantomjs-prebuilt
- git reset master
cache_directories:
- ~/.yarn-cache

@ -14,7 +14,7 @@
"build:generator": "rollup -c scripts/rollup.config.js",
"test_build": "rollup -c",
"test": "yarn test:node && yarn test:web",
"test:node": "jest",
"test:node": "jest -o",
"test:web": "./node_modules/karma/bin/karma start karma.conf.js --auto-watch",
"test:build": "cd ./scripts && jest check-build.test.js",
"test:build:web": "node ./scripts/proxy-browser-test.js",

Loading…
Cancel
Save