Skip to content

Commit b99672b

Browse files
committed
circleci: log which jasmine tests are skipped
1 parent 609cdf8 commit b99672b

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.circleci/test.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ case $1 in
4545
set_tz
4646

4747
SUITE=$(circleci tests glob "$ROOT/test/jasmine/tests/*" | circleci tests split)
48-
npm run test-jasmine -- $SUITE --skip-tags=gl,noCI,flaky || EXIT_STATE=$?
48+
npm run test-jasmine -- $SUITE --skip-tags=gl,noCI,flaky --showSkipped || EXIT_STATE=$?
4949

5050
exit $EXIT_STATE
5151
;;
@@ -56,7 +56,7 @@ case $1 in
5656
SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --tag=gl | circleci tests split))
5757

5858
for s in ${SHARDS[@]}; do
59-
retry npm run test-jasmine -- "$s" --tags=gl --skip-tags=noCI
59+
retry npm run test-jasmine -- "$s" --tags=gl --skip-tags=noCI --showSkipped
6060
done
6161

6262
exit $EXIT_STATE
@@ -68,7 +68,7 @@ case $1 in
6868
SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --tag=flaky | circleci tests split))
6969

7070
for s in ${SHARDS[@]}; do
71-
retry npm run test-jasmine -- "$s" --tags=flaky --skip-tags=noCI
71+
retry npm run test-jasmine -- "$s" --tags=flaky --skip-tags=noCI --showSkipped
7272
done
7373

7474
exit $EXIT_STATE

test/jasmine/karma.conf.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ if(argv.info) {
5959
' - `--nowatch (dflt: `false`, `true` on CI)`: run karma w/o `autoWatch` / multiple run mode',
6060
' - `--failFast` (dflt: `false`): exit karma upon first test failure',
6161
' - `--verbose` (dflt: `false`): show test result using verbose reporter',
62+
' - `--showSkipped` (dflt: `false`): show tests that are skipped',
6263
' - `--tags`: run only test with given tags (using the `jasmine-spec-tags` framework)',
6364
' - `--width`(dflt: 1035): set width of the browser window',
6465
' - `--height` (dflt: 617): set height of the browser window',
@@ -111,7 +112,7 @@ var pathToCustomMatchers = path.join(__dirname, 'assets', 'custom_matchers.js');
111112
var pathToUnpolyfill = path.join(__dirname, 'assets', 'unpolyfill.js');
112113
var pathToMathJax = path.join(constants.pathToDist, 'extras', 'mathjax');
113114

114-
var reporters = (isFullSuite && !argv.tags) ? ['dots', 'spec'] : ['progress'];
115+
var reporters = ((isFullSuite && !argv.tags) || argv.showSkipped) ? ['dots', 'spec'] : ['progress'];
115116
if(argv.failFast) reporters.push('fail-fast');
116117
if(argv.verbose) reporters.push('verbose');
117118

0 commit comments

Comments
 (0)