Commit ad1fa65a authored by Hunter Loftis's avatar Hunter Loftis Committed by GitHub

Merge pull request #376 from heroku/yarn-ci

run tests with yarn if available
parents 1e27aeb1 b7a8ca86
#!/usr/bin/env bash #!/usr/bin/env bash
cd "$1" && npm test BUILD_DIR=${1:-}
if yarn --version > /dev/null 2>&1; then
cd "$BUILD_DIR" && yarn test
else
cd "$BUILD_DIR" && npm test
fi
...@@ -398,7 +398,7 @@ testDangerousRangeStar() { ...@@ -398,7 +398,7 @@ testDangerousRangeStar() {
compile "dangerous-range-star" compile "dangerous-range-star"
assertCaptured "Dangerous semver range" assertCaptured "Dangerous semver range"
assertCaptured "Resolving node version * via semver.io" assertCaptured "Resolving node version * via semver.io"
assertCaptured "Downloading and installing node 6." assertCaptured "Downloading and installing node 7."
assertCapturedError assertCapturedError
} }
...@@ -406,14 +406,14 @@ testDangerousRangeGreaterThan() { ...@@ -406,14 +406,14 @@ testDangerousRangeGreaterThan() {
compile "dangerous-range-greater-than" compile "dangerous-range-greater-than"
assertCaptured "Dangerous semver range" assertCaptured "Dangerous semver range"
assertCaptured "Resolving node version >0.4 via semver.io" assertCaptured "Resolving node version >0.4 via semver.io"
assertCaptured "Downloading and installing node 6." assertCaptured "Downloading and installing node 7."
assertCapturedError assertCapturedError
} }
testRangeWithSpace() { testRangeWithSpace() {
compile "range-with-space" compile "range-with-space"
assertCaptured "Resolving node version >= 0.8.x via semver.io" assertCaptured "Resolving node version >= 0.8.x via semver.io"
assertCaptured "Downloading and installing node 6." assertCaptured "Downloading and installing node 7."
assertCapturedSuccess assertCapturedSuccess
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment