Skip to content

Commit

Permalink
Merge pull request #3565 from darthtrevino/task/3563-devcycle
Browse files Browse the repository at this point in the history
fix(build): Update test script to not require build_all step (#3563)
  • Loading branch information
kwonoj authored Apr 19, 2018
2 parents 66d8570 + c0e7eab commit d267b38
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 89 deletions.
81 changes: 31 additions & 50 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 5 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
"extension": [
".ts"
],
"require": [
"ts-node/register"
],
"reporter": [
"html"
],
Expand Down Expand Up @@ -88,12 +85,12 @@
"perf:micro": "node ./perf/micro/index.js",
"prepublish": "shx rm -rf ./typings && npm run build_all",
"publish_docs": "./publish_docs.sh",
"test": "mocha --require ts-node/register --opts spec-build/support/coverage.opts \"spec-build/**/*-spec.ts\"",
"test": "cross-env TS_NODE_PROJECT=spec/tsconfig.json mocha --opts spec/support/default.opts \"spec/**/*-spec.ts\"",
"test:browser": "echo \"Browser test is not working currently\" && exit -1 && npm-run-all build:spec:browser && opn spec/support/mocha-browser-runner.html",
"test:cover": "cross-env TS_NODE_FAST=true nyc npm test",
"test:cover": "nyc npm test",
"test:circular": "dependency-cruise --validate .dependency-cruiser.json -x \"^node_modules\" dist/esm5",
"test:systemjs": "node integration/systemjs/systemjs-compatibility-spec.js",
"tests2png": "mkdirp tmp/docs/img && cross-env TS_NODE_FAST=true mocha --compilers ts:ts-node/register --opts spec/support/tests2png.opts \"spec/**/*-spec.ts\"",
"tests2png": "mkdirp tmp/docs/img && mocha --opts spec/support/tests2png.opts \"spec/**/*-spec.ts\"",
"compat_build_all": "npm-run-all compat_clean_dist compat_build_cjs compat_build_esm5 compat_build_esm2015 compat_generate_packages",
"compat_build_cjs": "npm-run-all compat_clean_dist_cjs compat_compile_dist_cjs",
"compat_build_esm5": "npm-run-all compat_clean_dist_esm5 compat_compile_dist_esm5",
Expand Down Expand Up @@ -218,7 +215,8 @@
"source-map-support": "0.5.3",
"symbol-observable": "1.0.1",
"systemjs": "^0.21.0",
"ts-node": "4.1.0",
"ts-node": "5.0.1",
"tsconfig-paths": "3.2.0",
"tslint": "5.9.1",
"tslint-no-unused-expression-chai": "0.0.3",
"typescript": "~2.8.1",
Expand Down
11 changes: 0 additions & 11 deletions spec/support/coverage.opts

This file was deleted.

24 changes: 13 additions & 11 deletions spec/support/default.opts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
--require .out/spec/helpers/polyfills.ts
--require .out/spec/helpers/testScheduler-ui.js
--ui .out/spec/helpers/testScheduler-ui.js

--reporter dot

--check-leaks
--globals WebSocket,FormData,XDomainRequest,ActiveXObject

--recursive
--timeout 5000
--require ts-node/register
--require tsconfig-paths/register
--require spec/helpers/polyfills.ts
--require spec/helpers/testScheduler-ui.ts
--ui spec/helpers/testScheduler-ui.ts

--reporter dot

--check-leaks
--globals WebSocket,FormData,XDomainRequest,ActiveXObject

--recursive
--timeout 5000
22 changes: 12 additions & 10 deletions spec/support/tests2png.opts
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
--require spec/helpers/polyfills.ts
--require source-map-support/register
--require spec/helpers/tests2png/diagram-test-runner.ts
--require spec/helpers/testScheduler-ui.ts
--ui spec/helpers/testScheduler-ui.ts

--reporter dot

--recursive
--timeout 5000
--require ts-node/register
--require tsconfig-paths/register
--require spec/helpers/polyfills.ts
--require source-map-support/register
--require spec/helpers/tests2png/diagram-test-runner.ts
--require spec/helpers/testScheduler-ui.ts
--ui spec/helpers/testScheduler-ui.ts

--reporter dot

--recursive
--timeout 5000

0 comments on commit d267b38

Please sign in to comment.