File tree Expand file tree Collapse file tree 6 files changed +29
-9
lines changed Expand file tree Collapse file tree 6 files changed +29
-9
lines changed Original file line number Diff line number Diff line change 2020 "url" : " https://github.com/angular/angular.git"
2121 },
2222 "scripts" : {
23- "test" : " echo \" Error: no test specified\" && exit 1" ,
24- "postinstall" : " bower install"
23+ "test" : " npm run test-js && npm run test-dart" ,
24+ "test-js" : " ./scripts/ci/test_js.sh" ,
25+ "test-dart" : " ./scripts/ci/test_dart.sh" ,
26+ "postinstall" : " ./node_modules/.bin/bower install"
2527 },
2628 "dependencies" : {
2729 "es6-module-loader" : " ^0.9.2" ,
Original file line number Diff line number Diff line change @@ -9,8 +9,4 @@ SCRIPT_DIR=$(dirname $0)
99cd $SCRIPT_DIR /../..
1010
1111${SCRIPT_DIR} /build_$MODE .sh
12- ${SCRIPT_DIR} /test_unit_$MODE .sh
13- if [ " $MODE " == " dart" ]; then # JS doesn't yet have server tests
14- ${SCRIPT_DIR} /test_server_$MODE .sh
15- fi
16- ${SCRIPT_DIR} /test_e2e_$MODE .sh
12+ ${SCRIPT_DIR} /test_$MODE .sh
Original file line number Diff line number Diff line change 1+ #! /bin/bash
2+ set -e
3+
4+ echo =============================================================================
5+ # go to project dir
6+ SCRIPT_DIR=$( dirname $0 )
7+ cd $SCRIPT_DIR /../..
8+
9+ ${SCRIPT_DIR} /test_unit_dart.sh
10+ ${SCRIPT_DIR} /test_server_dart.sh
11+ ${SCRIPT_DIR} /test_e2e_dart.sh
Original file line number Diff line number Diff line change @@ -21,4 +21,4 @@ trap killServer EXIT
2121# wait for server to come up!
2222sleep 10
2323
24- ./node_modules/.bin/protractor protractor-dart2js.conf.js --browsers=$E2E_BROWSERS
24+ ./node_modules/.bin/protractor protractor-dart2js.conf.js --browsers=${ E2E_BROWSERS:- Dartium}
Original file line number Diff line number Diff line change @@ -21,4 +21,4 @@ trap killServer EXIT
2121# wait for server to come up!
2222sleep 10
2323
24- ./node_modules/.bin/protractor protractor-js.conf.js --browsers=$E2E_BROWSERS
24+ ./node_modules/.bin/protractor protractor-js.conf.js --browsers=${ E2E_BROWSERS:- Dartium}
Original file line number Diff line number Diff line change 1+ #! /bin/bash
2+ set -e
3+
4+ echo =============================================================================
5+ # go to project dir
6+ SCRIPT_DIR=$( dirname $0 )
7+ cd $SCRIPT_DIR /../..
8+
9+ ${SCRIPT_DIR} /test_unit_js.sh
10+ # ${SCRIPT_DIR}/test_server_js.sh # JS doesn't yet have server tests
11+ ${SCRIPT_DIR} /test_e2e_js.sh
You can’t perform that action at this time.
0 commit comments