Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Commit

Permalink
Include Jasmine test run in npm run test:unit.
Browse files Browse the repository at this point in the history
  • Loading branch information
joyzhong committed Dec 3, 2019
1 parent 37977e3 commit f1accc0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,11 @@
"test:dependency": "./scripts/dependency-test.sh",
"test:feature-targeting": "node test/scss/verify-feature-targeting.js",
"test:site": "npm run clean:site && ./scripts/site-generator-test.sh",
"test:unit": "karma start --single-run",
"test:unit": "npm run test:jasmineunit && npm run test:mochaunit",
"test:jasmineunit": "USE_JASMINE=true karma start --single-run",
"test:watch": "karma start --auto-watch",
"test:jasminewatch": "USE_JASMINE=true karma start --auto-watch",
"test:mochaunit": "karma start --single-run",
"test:mochawatch": "karma start --auto-watch",
"version": "cat lerna.json | grep -e '^ \"version\": ' | awk '{print $2}' | sed 's/[\",]//g'"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion scripts/travis-env-vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ print_all_changed_files

if [[ "$TEST_SUITE" == 'unit' ]]; then
# Only run unit tests if JS files changed
check_for_testable_files '^karma\.conf\.js$' '^packages/.+\.(js|ts)$' '^test/unit/.+\.(js|ts)$'
check_for_testable_files '^karma\.conf\.js$' '^packages/.+\.(js|ts)$' '^test/unit/.+\.(js|ts)$' '^testing/.+\.ts'
fi

if [[ "$TEST_SUITE" == 'build' ]]; then
Expand Down

0 comments on commit f1accc0

Please sign in to comment.