Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
4277317
HT-18 Update workflows
jarrodback Feb 4, 2022
f78b68a
HT-18 fix workflow
jarrodback Feb 4, 2022
4ca5b86
HT-18 add configs to start
jarrodback Feb 4, 2022
2f915b1
HT-18 fix file path for server
jarrodback Feb 4, 2022
da0c5f0
HT-18 change to https to see if localhost resolves
jarrodback Feb 4, 2022
5593f53
HT-18 change to https to see if localhost resolves #2
jarrodback Feb 4, 2022
2d3b529
HT-18 change to https to see if localhost resolves #3
jarrodback Feb 4, 2022
9579558
HT-18 change to https to see if localhost resolves #4
jarrodback Feb 4, 2022
fba08ae
Merge branch 'develop' of https://github.com/jarrodback/CSSD-Assignme…
jarrodback Feb 4, 2022
e880af4
HT-18 start vue aswell to see if fixes
jarrodback Feb 4, 2022
82795d2
HT-18 change to http
jarrodback Feb 4, 2022
3d211f0
HT-18 add config file
jarrodback Feb 4, 2022
c3635da
HT-18 change plugin file to work on workflow
jarrodback Feb 4, 2022
05f310a
HT-18 add supportfile
jarrodback Feb 4, 2022
35dc347
HT-18 add supportfile #2
jarrodback Feb 4, 2022
98138d2
HT-18 remove suppoirt file
jarrodback Feb 4, 2022
9b2be20
HT-18 Add test.js to config
jarrodback Feb 4, 2022
015cdf5
HT-18 remove indent
jarrodback Feb 4, 2022
c03a818
HT-18 change to spec.js
jarrodback Feb 4, 2022
eca7961
HT-18 change to spec.js #2
jarrodback Feb 4, 2022
46563e0
HT-18 change to spec.js #3
jarrodback Feb 4, 2022
96f3b7b
HT-18 change to spec.js #4
jarrodback Feb 4, 2022
258756a
HT-18 remove browser
jarrodback Feb 4, 2022
70fae4a
Merge branch 'develop' of https://github.com/jarrodback/CSSD-Assignme…
jarrodback Feb 4, 2022
9c440a2
HT-18 new cyprus version
jarrodback Feb 4, 2022
b465413
HT-18 new cyprus version #2
jarrodback Feb 4, 2022
9ce8ce1
HT-18 fix screenshot path
jarrodback Feb 4, 2022
5950b51
HT-18 upload artifact
jarrodback Feb 4, 2022
39e1e7c
HT-18 finalise artifact path
jarrodback Feb 4, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ jobs:
- name: Build and push Docker images
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: ./server/
context: |
./server/
./ui/
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
47 changes: 46 additions & 1 deletion .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,51 @@ jobs:
path: |
coverage

test-ui-integration:
runs-on: ubuntu-latest
needs: [build]

strategy:
matrix:
mongodb-version: [4.2]

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Start MongoDB v${{ matrix.mongodb-version }}
uses: supercharge/mongodb-github-action@1.2.0
with:
mongodb-version: ${{ matrix.mongodb-version }}

- name: UI - install packages
run: |
npm i --prefix server
npm i --prefix ui

- name: Cypress run
uses: cypress-io/github-action@v3
with:
browser: chrome
working-directory: ui
config-file: cypress.json
start: |
npm start --prefix ../server
npm run serve --prefix
wait-on: 'http://localhost:8080'

- uses: actions/upload-artifact@v2
if: failure()
with:
name: cypress-screenshots
path: ui/tests/e2e/screenshots/

- uses: actions/upload-artifact@v2
if: always()
with:
name: cypress-videos
path: ui/tests/e2e/videos/

test-server:
runs-on: ubuntu-latest
needs: [build]
Expand Down Expand Up @@ -130,7 +175,7 @@ jobs:

deploy:
runs-on: ubuntu-latest
needs: [test-server,test-ui-unit]
needs: [test-server,test-ui-unit,test-ui-integration]

if: >-
github.event_name == 'pull_request'
Expand Down
3 changes: 1 addition & 2 deletions ui/cypress.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"pluginsFile": "tests/e2e/plugins/index.js",
"baseUrl": "http://localhost:8080/",
"testFiles": "**/*.test.js"
"baseUrl": "http://localhost:8080/"
}
16 changes: 7 additions & 9 deletions ui/tests/e2e/plugins/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
module.exports = (on, config) => {

return Object.assign({}, config, {
fixturesFolder: 'tests/e2e/fixtures',
integrationFolder: 'tests/e2e/tests',
screenshotsFolder: 'tests/e2e/screenshots',
videosFolder: 'tests/e2e/videos',
supportFile: 'tests/e2e/support/index.js'
})
}
return Object.assign({}, config, {
fixturesFolder: "tests/e2e/fixtures",
integrationFolder: "tests/e2e/tests",
screenshotsFolder: "tests/e2e/screenshots",
videosFolder: "tests/e2e/videos",
});
};
File renamed without changes.
File renamed without changes.
File renamed without changes.