Skip to content

Commit

Permalink
Merge a4abb5e into 2eda3c4
Browse files Browse the repository at this point in the history
  • Loading branch information
oshi97 committed May 12, 2021
2 parents 2eda3c4 + a4abb5e commit c412819
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/run_browserstack_acceptance.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ export BROWSERSTACK_BUILD_ID="${GITHUB_BRANCH} - ${GITHUB_RUN_ID}"
COMMIT_MSG_TITLE=$(git log -n 1 --pretty=format:%s)
export BROWSERSTACK_TEST_RUN_NAME=$COMMIT_MSG_TITLE

npm run acceptance -- --browsers browserstack:ie@11.0 browserstack:safari
npm run acceptance -- --browsers browserstack:ie@11.0 browserstack:safari browserstack:firefox
2 changes: 1 addition & 1 deletion .github/workflows/acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ jobs:
- run: npm run setup-test-site
- run: npm run build-test-site
- name: Run Acceptance Tests
run: npm run acceptance -- --browsers chrome:headless firefox:headless
run: npm run acceptance -- --browsers chrome:headless
6 changes: 3 additions & 3 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"testcafe-browser-provider-browserstack": "^1.13.1",
"underscore.string": "^3.3.5",
"urijs": "1.18.12",
"yargs": "^17.0"
"yargs": "^17.0.1"
},
"jest": {
"collectCoverageFrom": [
Expand Down
5 changes: 4 additions & 1 deletion tests/acceptance/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,14 @@ runTests(argv.browsers);
async function runTests (browsers) {
const testcafe = await createTestCafe();
try {
await testcafe.createRunner()
const numberTestsFailed = await testcafe.createRunner()
.src('tests/acceptance/suites/*.js')
.browsers(browsers)
.startApp(`npx serve -p ${PORT} test-site/public`, 4000)
.run({ quarantineMode: true });
if (numberTestsFailed > 0) {
process.exit(1);
}
}
finally {
await testcafe.close();
Expand Down

0 comments on commit c412819

Please sign in to comment.