mirror of
https://github.com/scratchfoundation/scratch-www.git
synced 2025-02-16 00:00:26 -05:00
Don't try to run non-existent tap integration tests
This commit is contained in:
parent
5fdff7be57
commit
0555422c4b
2 changed files with 2 additions and 48 deletions
|
@ -103,20 +103,6 @@ aliases:
|
||||||
JEST_JUNIT_OUTPUT_NAME=integration-jest-results.xml npm run test:integration:jest:remote -- --reporters=jest-junit
|
JEST_JUNIT_OUTPUT_NAME=integration-jest-results.xml npm run test:integration:jest:remote -- --reporters=jest-junit
|
||||||
- store_test_results:
|
- store_test_results:
|
||||||
path: test/results
|
path: test/results
|
||||||
- &integration_tap
|
|
||||||
<<: *defaults
|
|
||||||
steps:
|
|
||||||
- *restore_git_cache
|
|
||||||
- checkout
|
|
||||||
- *restore_npm_cache
|
|
||||||
- run:
|
|
||||||
name: "integration tests with Tap"
|
|
||||||
command: |
|
|
||||||
mkdir ./test/results
|
|
||||||
npm run test:smoke:sauce -- --output-file ./test/results/integration-raw-tap.tap
|
|
||||||
npm run test:smoke:convertReportToXunit
|
|
||||||
- store_test_results:
|
|
||||||
path: test/results
|
|
||||||
- &update-translations
|
- &update-translations
|
||||||
<<: *defaults
|
<<: *defaults
|
||||||
steps:
|
steps:
|
||||||
|
@ -139,12 +125,8 @@ jobs:
|
||||||
<<: *deploy
|
<<: *deploy
|
||||||
integration-staging-jest:
|
integration-staging-jest:
|
||||||
<<: *integration_jest
|
<<: *integration_jest
|
||||||
integration-staging-tap:
|
|
||||||
<<: *integration_tap
|
|
||||||
integration-production-jest:
|
integration-production-jest:
|
||||||
<<: *integration_jest
|
<<: *integration_jest
|
||||||
integration-production-tap:
|
|
||||||
<<: *integration_tap
|
|
||||||
update-translations:
|
update-translations:
|
||||||
<<: *update-translations
|
<<: *update-translations
|
||||||
|
|
||||||
|
@ -201,18 +183,6 @@ workflows:
|
||||||
- develop
|
- develop
|
||||||
- /^hotfix\/.*/
|
- /^hotfix\/.*/
|
||||||
- /^release\/.*/
|
- /^release\/.*/
|
||||||
- integration-staging-tap:
|
|
||||||
context:
|
|
||||||
- scratch-www-all
|
|
||||||
- scratch-www-staging
|
|
||||||
requires:
|
|
||||||
- deploy-staging
|
|
||||||
filters:
|
|
||||||
branches:
|
|
||||||
only:
|
|
||||||
- develop
|
|
||||||
- /^hotfix\/.*/
|
|
||||||
- /^release\/.*/
|
|
||||||
- integration-production-jest:
|
- integration-production-jest:
|
||||||
context:
|
context:
|
||||||
- scratch-www-all
|
- scratch-www-all
|
||||||
|
@ -223,16 +193,6 @@ workflows:
|
||||||
branches:
|
branches:
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
- integration-production-tap:
|
|
||||||
context:
|
|
||||||
- scratch-www-all
|
|
||||||
- scratch-www-production
|
|
||||||
requires:
|
|
||||||
- deploy-production
|
|
||||||
filters:
|
|
||||||
branches:
|
|
||||||
only:
|
|
||||||
- master
|
|
||||||
Update-translations:
|
Update-translations:
|
||||||
triggers:
|
triggers:
|
||||||
- schedule: # every evening at 7pm EST (8pm EDT, Midnight UTC)
|
- schedule: # every evening at 7pm EST (8pm EDT, Midnight UTC)
|
||||||
|
|
10
package.json
10
package.json
|
@ -7,14 +7,8 @@
|
||||||
"test": "npm run test:lint && npm run build && npm run test:unit",
|
"test": "npm run test:lint && npm run build && npm run test:unit",
|
||||||
"test:lint": "eslint . --ext .js,.jsx,.json",
|
"test:lint": "eslint . --ext .js,.jsx,.json",
|
||||||
"test:lint:ci": "eslint . --ext .js,.jsx,.json --format junit -o ./test/results/lint-results.xml",
|
"test:lint:ci": "eslint . --ext .js,.jsx,.json --format junit -o ./test/results/lint-results.xml",
|
||||||
"test:integration": "npm run test:integration:jest && npm run test:smoke",
|
"test:integration": "jest ./test/integration/*.test.js --reporters=default --runInBand",
|
||||||
"test:integration:jest": "jest ./test/integration/*.test.js --reporters=default --runInBand",
|
"test:integration:remote": "SMOKE_REMOTE=true jest ./test/integration/*.test.js --reporters=default --runInBand",
|
||||||
"test:integration:remote": "npm run test:integration:jest:remote && npm run test:smoke:sauce",
|
|
||||||
"test:integration:jest:remote": "SMOKE_REMOTE=true jest ./test/integration/*.test.js --reporters=default --runInBand",
|
|
||||||
"test:smoke": "tap ./test/integration-legacy/smoke-testing/*.js --timeout=3600 --no-coverage -R classic",
|
|
||||||
"test:smoke:verbose": "tap ./test/integration-legacy/smoke-testing/*.js --timeout=3600 --no-coverage -R spec",
|
|
||||||
"test:smoke:sauce": "SMOKE_REMOTE=true tap ./test/integration-legacy/smoke-testing/*.js --timeout=60000 --no-coverage -R classic",
|
|
||||||
"test:smoke:convertReportToXunit": "tap ./test/results/integration-raw-tap.tap --no-coverage -R xunit > ./test/results/integration-tap-results.xml",
|
|
||||||
"test:unit": "npm run test:unit:jest && npm run test:unit:tap",
|
"test:unit": "npm run test:unit:jest && npm run test:unit:tap",
|
||||||
"test:unit:jest": "npm run test:unit:jest:unit && npm run test:unit:jest:localization",
|
"test:unit:jest": "npm run test:unit:jest:unit && npm run test:unit:jest:localization",
|
||||||
"test:unit:jest:unit": "jest ./test/unit/ --reporters=default",
|
"test:unit:jest:unit": "jest ./test/unit/ --reporters=default",
|
||||||
|
|
Loading…
Reference in a new issue