Skip to content

Commit

Permalink
CI fixes (#666)
Browse files Browse the repository at this point in the history
- Simplify and increase timeouts in some tests
- Remove duplicated `afterEach`
- Remove integration_tests_server start from Makefile as it doesn't behave as expected
  • Loading branch information
sonologico authored Dec 14, 2022
1 parent f2b2f22 commit ebc3aa7
Show file tree
Hide file tree
Showing 8 changed files with 99 additions and 90 deletions.
16 changes: 14 additions & 2 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,13 @@ jobs:
- run: npm install
- run: npm run check-format
- run: make web_unit
- run: make web_integration
- name: make web_integration
run: |
cd integration_tests_server
npm install
node index.js&
cd ..
make web_integration
env:
INTEGRATION_TESTS_APP_MT1_APP_ID: ${{ secrets.INTEGRATION_TESTS_APP_MT1_APP_ID }}
INTEGRATION_TESTS_APP_MT1_KEY: ${{ secrets.INTEGRATION_TESTS_APP_MT1_KEY }}
Expand All @@ -40,7 +46,13 @@ jobs:
- run: npm install
- run: npm run check-format
- run: make node_unit
- run: make node_integration
- name: make node_integration
run: |
cd integration_tests_server
npm install
node index.js&
cd ..
make node_integration
env:
INTEGRATION_TESTS_APP_MT1_APP_ID: ${{ secrets.INTEGRATION_TESTS_APP_MT1_APP_ID }}
INTEGRATION_TESTS_APP_MT1_KEY: ${{ secrets.INTEGRATION_TESTS_APP_MT1_KEY }}
Expand Down
7 changes: 2 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ web_unit:
node_modules/karma/bin/karma start spec/config/karma/unit.js

.PHONY: web_integration
web_integration: start_integration_test_server
web_integration:
node_modules/karma/bin/karma start spec/config/karma/integration.js

.PHONY: worker_unit
Expand All @@ -68,13 +68,10 @@ node_unit:
node_modules/.bin/jasmine --config=spec/config/jasmine/unit.json

.PHONY: node_integration
node_integration: start_integration_test_server
node_integration:
node_modules/webpack/bin/webpack.js --config=spec/config/jasmine/webpack.integration.js && \
node_modules/.bin/jasmine --config=spec/config/jasmine/integration.json

.PHONY: start_integration_test_server
start_integration_test_server:
cd integration_tests_server; npm install; node index.js&

.PHONY: serve
serve:
Expand Down
78 changes: 58 additions & 20 deletions dist/node/pusher.js

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

2 changes: 1 addition & 1 deletion dist/node/pusher.js.map

Large diffs are not rendered by default.

27 changes: 11 additions & 16 deletions package-lock.json

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

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
},
"dependencies": {
"tweetnacl": "^1.0.3",
"@types/node": "^14.14.31"
"@types/node": "^14.14.31",
"@types/express-serve-static-core": "4.17.28"
}
}
Loading

0 comments on commit ebc3aa7

Please sign in to comment.