From 4277317304ec1c24401d4da3123664932b34a0ea Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 09:58:54 +0000 Subject: [PATCH 01/27] HT-18 Update workflows --- .github/workflows/docker-publish.yml | 4 +++- .github/workflows/node.js.yml | 35 ++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 4c53acc..9eed2bc 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -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 }} diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 76b1ee0..8c5175b 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -72,6 +72,41 @@ jobs: path: | coverage + test-ui-integration: + runs-on: ubuntu-latest + needs: [build] + + strategy: + matrix: + mongodb-version: [4.2] + + steps: + - uses: actions/download-artifact@master + with: + name: build-ui + + - uses: actions/download-artifact@master + with: + name: build-server + path: server/ + + - name: UI - install server + run: | + npm i --prefix server + + - 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: Cypress run + uses: cypress-io/github-action@v2 + with: + start: npm start --prefix server + test-server: runs-on: ubuntu-latest needs: [build] From f78b68afdfc5c40d83b6fb680cfaa6e079c63e14 Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 10:11:16 +0000 Subject: [PATCH 02/27] HT-18 fix workflow --- .github/workflows/node.js.yml | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 8c5175b..7166f73 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -81,19 +81,6 @@ jobs: mongodb-version: [4.2] steps: - - uses: actions/download-artifact@master - with: - name: build-ui - - - uses: actions/download-artifact@master - with: - name: build-server - path: server/ - - - name: UI - install server - run: | - npm i --prefix server - - name: Checkout uses: actions/checkout@v2 @@ -102,10 +89,16 @@ jobs: with: mongodb-version: ${{ matrix.mongodb-version }} + - name: UI - install packages + run: | + npm i --prefix server + npm i --prefix ui + cd ui + - name: Cypress run uses: cypress-io/github-action@v2 with: - start: npm start --prefix server + start: npm start --prefix ../server test-server: runs-on: ubuntu-latest From 4ca5b86011e25c2b91b987ad5a5c159508cc93e5 Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 10:18:18 +0000 Subject: [PATCH 03/27] HT-18 add configs to start --- .github/workflows/node.js.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 7166f73..c5c5987 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -93,12 +93,14 @@ jobs: run: | npm i --prefix server npm i --prefix ui - cd ui - name: Cypress run uses: cypress-io/github-action@v2 with: + install: false + working-directory: ui/tests/e2e/ start: npm start --prefix ../server + wait-on: 'http://localhost:3000' test-server: runs-on: ubuntu-latest From 2f915b1447bb07bcac0ce19a1baa366d2c3dffa8 Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 10:24:25 +0000 Subject: [PATCH 04/27] HT-18 fix file path for server --- .github/workflows/node.js.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index c5c5987..602c001 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -99,9 +99,21 @@ jobs: with: install: false working-directory: ui/tests/e2e/ - start: npm start --prefix ../server + start: npm start --prefix ../../../server wait-on: 'http://localhost:3000' + - uses: actions/upload-artifact@v2 + if: failure() + with: + name: cypress-screenshots + path: cypress/screenshots + + - uses: actions/upload-artifact@v2 + if: always() + with: + name: cypress-videos + path: cypress/videos + test-server: runs-on: ubuntu-latest needs: [build] From da0c5f06a1c571761ab72e65730f63cf9aeae2c2 Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 10:35:02 +0000 Subject: [PATCH 05/27] HT-18 change to https to see if localhost resolves --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 602c001..b3a7d5c 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -100,7 +100,7 @@ jobs: install: false working-directory: ui/tests/e2e/ start: npm start --prefix ../../../server - wait-on: 'http://localhost:3000' + wait-on: 'https://localhost:3000' - uses: actions/upload-artifact@v2 if: failure() From 5593f53054f21adc5210d96916a0d2d59470d4fc Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 10:40:32 +0000 Subject: [PATCH 06/27] HT-18 change to https to see if localhost resolves #2 --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index b3a7d5c..7098ca3 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -100,7 +100,7 @@ jobs: install: false working-directory: ui/tests/e2e/ start: npm start --prefix ../../../server - wait-on: 'https://localhost:3000' + wait-on: 'http://localhost:8080' - uses: actions/upload-artifact@v2 if: failure() From 2d3b529673baca577270f9c53ed3ba0792850377 Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 10:47:27 +0000 Subject: [PATCH 07/27] HT-18 change to https to see if localhost resolves #3 --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 7098ca3..14a1ced 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -100,7 +100,7 @@ jobs: install: false working-directory: ui/tests/e2e/ start: npm start --prefix ../../../server - wait-on: 'http://localhost:8080' + wait-on: 'http://0.0.0.0:8080' - uses: actions/upload-artifact@v2 if: failure() From 9579558655082cfaca5147c058f8a4151414bdde Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 10:50:54 +0000 Subject: [PATCH 08/27] HT-18 change to https to see if localhost resolves #4 --- .github/workflows/node.js.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 14a1ced..87587dd 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -99,8 +99,9 @@ jobs: with: install: false working-directory: ui/tests/e2e/ + browser: chrome start: npm start --prefix ../../../server - wait-on: 'http://0.0.0.0:8080' + wait-on: 'https://localhost:8080' - uses: actions/upload-artifact@v2 if: failure() From e880af409bd2fee7681f3b82c4e7e72bfdfbfbb7 Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 14:48:54 +0000 Subject: [PATCH 09/27] HT-18 start vue aswell to see if fixes --- .github/workflows/node.js.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 87587dd..8af5cab 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -100,7 +100,9 @@ jobs: install: false working-directory: ui/tests/e2e/ browser: chrome - start: npm start --prefix ../../../server + start: | + npm start --prefix ../../../server + npm run serve --prefix ../../ wait-on: 'https://localhost:8080' - uses: actions/upload-artifact@v2 From 82795d290630ba8493df31a4b5fb2a0b37ee1273 Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 14:56:16 +0000 Subject: [PATCH 10/27] HT-18 change to http --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 8af5cab..61d8c2e 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -103,7 +103,7 @@ jobs: start: | npm start --prefix ../../../server npm run serve --prefix ../../ - wait-on: 'https://localhost:8080' + wait-on: 'http://localhost:8080' - uses: actions/upload-artifact@v2 if: failure() From 3d211f0f8a3f57f282edbcde6f4fcd0906929203 Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 15:03:40 +0000 Subject: [PATCH 11/27] HT-18 add config file --- .github/workflows/node.js.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 61d8c2e..3526903 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -100,6 +100,7 @@ jobs: install: false working-directory: ui/tests/e2e/ browser: chrome + config-file: ../../cypress.json start: | npm start --prefix ../../../server npm run serve --prefix ../../ From c3635da072d7c5a44b85fdc921fdd20f3d38e08f Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 15:26:52 +0000 Subject: [PATCH 12/27] HT-18 change plugin file to work on workflow --- ui/cypress.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/cypress.json b/ui/cypress.json index 612024c..af40969 100644 --- a/ui/cypress.json +++ b/ui/cypress.json @@ -1,5 +1,5 @@ { - "pluginsFile": "tests/e2e/plugins/index.js", + "pluginsFile": "plugins/index.js", "baseUrl": "http://localhost:8080/", "testFiles": "**/*.test.js" } From 05f310a9fc8bf54ea697bb8add63045fa8502309 Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 15:30:38 +0000 Subject: [PATCH 13/27] HT-18 add supportfile --- ui/cypress.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/cypress.json b/ui/cypress.json index af40969..2b865ea 100644 --- a/ui/cypress.json +++ b/ui/cypress.json @@ -1,5 +1,6 @@ { "pluginsFile": "plugins/index.js", + "supportFile": false, "baseUrl": "http://localhost:8080/", "testFiles": "**/*.test.js" } From 35dc347d062352fb7a9da0c038b1be4c82f580c4 Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 15:35:58 +0000 Subject: [PATCH 14/27] HT-18 add supportfile #2 --- ui/cypress.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/cypress.json b/ui/cypress.json index 2b865ea..8920062 100644 --- a/ui/cypress.json +++ b/ui/cypress.json @@ -1,6 +1,6 @@ { "pluginsFile": "plugins/index.js", - "supportFile": false, + "supportFile": "false", "baseUrl": "http://localhost:8080/", "testFiles": "**/*.test.js" } From 98138d27b0cba71ce12238b17ba4cfeee2084315 Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 15:43:29 +0000 Subject: [PATCH 15/27] HT-18 remove suppoirt file --- ui/cypress.json | 1 - ui/tests/e2e/plugins/index.js | 16 +++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/ui/cypress.json b/ui/cypress.json index 8920062..af40969 100644 --- a/ui/cypress.json +++ b/ui/cypress.json @@ -1,6 +1,5 @@ { "pluginsFile": "plugins/index.js", - "supportFile": "false", "baseUrl": "http://localhost:8080/", "testFiles": "**/*.test.js" } diff --git a/ui/tests/e2e/plugins/index.js b/ui/tests/e2e/plugins/index.js index a18eab8..3ce3c6c 100644 --- a/ui/tests/e2e/plugins/index.js +++ b/ui/tests/e2e/plugins/index.js @@ -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", + }); +}; From 9b2be201db9138ea90898b85508e10279d9a8939 Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 15:49:02 +0000 Subject: [PATCH 16/27] HT-18 Add test.js to config --- .github/workflows/node.js.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 3526903..7b1547f 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -101,6 +101,8 @@ jobs: working-directory: ui/tests/e2e/ browser: chrome config-file: ../../cypress.json + spec: | + **/*.test.js start: | npm start --prefix ../../../server npm run serve --prefix ../../ From 015cdf59cf670941942908ccfc03e6d9865d0ec2 Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 15:51:26 +0000 Subject: [PATCH 17/27] HT-18 remove indent --- .github/workflows/node.js.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 7b1547f..7f510cd 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -101,8 +101,8 @@ jobs: working-directory: ui/tests/e2e/ browser: chrome config-file: ../../cypress.json - spec: | - **/*.test.js + spec: | + **/*.test.js start: | npm start --prefix ../../../server npm run serve --prefix ../../ From c03a818da509f7b8409f0cdc7a961ee02a2eafcc Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 16:26:27 +0000 Subject: [PATCH 18/27] HT-18 change to spec.js --- .github/workflows/node.js.yml | 2 -- ui/cypress.json | 3 +-- ui/tests/e2e/tests/{mybills.test.js => mybills.spec.js} | 0 ui/tests/e2e/tests/{navbar.test.js => navbar.spec.js} | 0 ui/tests/e2e/tests/{routes.test.js => routes.spec.js} | 0 5 files changed, 1 insertion(+), 4 deletions(-) rename ui/tests/e2e/tests/{mybills.test.js => mybills.spec.js} (100%) rename ui/tests/e2e/tests/{navbar.test.js => navbar.spec.js} (100%) rename ui/tests/e2e/tests/{routes.test.js => routes.spec.js} (100%) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 7f510cd..3526903 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -101,8 +101,6 @@ jobs: working-directory: ui/tests/e2e/ browser: chrome config-file: ../../cypress.json - spec: | - **/*.test.js start: | npm start --prefix ../../../server npm run serve --prefix ../../ diff --git a/ui/cypress.json b/ui/cypress.json index af40969..1fbd09a 100644 --- a/ui/cypress.json +++ b/ui/cypress.json @@ -1,5 +1,4 @@ { "pluginsFile": "plugins/index.js", - "baseUrl": "http://localhost:8080/", - "testFiles": "**/*.test.js" + "baseUrl": "http://localhost:8080/" } diff --git a/ui/tests/e2e/tests/mybills.test.js b/ui/tests/e2e/tests/mybills.spec.js similarity index 100% rename from ui/tests/e2e/tests/mybills.test.js rename to ui/tests/e2e/tests/mybills.spec.js diff --git a/ui/tests/e2e/tests/navbar.test.js b/ui/tests/e2e/tests/navbar.spec.js similarity index 100% rename from ui/tests/e2e/tests/navbar.test.js rename to ui/tests/e2e/tests/navbar.spec.js diff --git a/ui/tests/e2e/tests/routes.test.js b/ui/tests/e2e/tests/routes.spec.js similarity index 100% rename from ui/tests/e2e/tests/routes.test.js rename to ui/tests/e2e/tests/routes.spec.js From eca79615c2d4e71da2c393f1ef352867b018de1f Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 16:32:11 +0000 Subject: [PATCH 19/27] HT-18 change to spec.js #2 --- .github/workflows/node.js.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 3526903..f6f15d7 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -98,12 +98,12 @@ jobs: uses: cypress-io/github-action@v2 with: install: false - working-directory: ui/tests/e2e/ browser: chrome config-file: ../../cypress.json start: | - npm start --prefix ../../../server - npm run serve --prefix ../../ + npm start --prefix server + npm run serve --prefix ui + cd ui/ wait-on: 'http://localhost:8080' - uses: actions/upload-artifact@v2 From 46563e0a6cbbb203f46828e530e3d88d58c78481 Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 16:38:51 +0000 Subject: [PATCH 20/27] HT-18 change to spec.js #3 --- .github/workflows/node.js.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index f6f15d7..1721740 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -98,12 +98,12 @@ jobs: uses: cypress-io/github-action@v2 with: install: false + working-directory: ui browser: chrome - config-file: ../../cypress.json + config-file: cypress.json start: | - npm start --prefix server - npm run serve --prefix ui - cd ui/ + npm start --prefix ../server + npm run serve --prefix wait-on: 'http://localhost:8080' - uses: actions/upload-artifact@v2 From 96f3b7b2a874883673ac68ba82e2182f56e759b1 Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 16:43:40 +0000 Subject: [PATCH 21/27] HT-18 change to spec.js #4 --- ui/cypress.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/cypress.json b/ui/cypress.json index 1fbd09a..4513da2 100644 --- a/ui/cypress.json +++ b/ui/cypress.json @@ -1,4 +1,4 @@ { - "pluginsFile": "plugins/index.js", + "pluginsFile": "tests/e2e/plugins/index.js", "baseUrl": "http://localhost:8080/" } From 258756a5301c3df4d11de1adbcb5cbcb093d35e7 Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 16:57:12 +0000 Subject: [PATCH 22/27] HT-18 remove browser --- .github/workflows/node.js.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 1721740..5001b31 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -97,9 +97,7 @@ jobs: - name: Cypress run uses: cypress-io/github-action@v2 with: - install: false working-directory: ui - browser: chrome config-file: cypress.json start: | npm start --prefix ../server @@ -176,7 +174,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' From 9c440a21561b7e74257ebd5e05ab0eb89a4a0cdf Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 17:09:50 +0000 Subject: [PATCH 23/27] HT-18 new cyprus version --- .github/workflows/node.js.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 5001b31..bc5ea71 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -95,8 +95,9 @@ jobs: npm i --prefix ui - name: Cypress run - uses: cypress-io/github-action@v2 + uses: cypress-io/github-action@v3.8.3 with: + browser: chrome working-directory: ui config-file: cypress.json start: | @@ -108,13 +109,13 @@ jobs: if: failure() with: name: cypress-screenshots - path: cypress/screenshots + path: tests/e2e/screenshots - uses: actions/upload-artifact@v2 if: always() with: name: cypress-videos - path: cypress/videos + path: tests/e2e/videos/ test-server: runs-on: ubuntu-latest From b465413c6680ac8920910accc9583d45e1e0871f Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 17:13:56 +0000 Subject: [PATCH 24/27] HT-18 new cyprus version #2 --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index bc5ea71..24187a9 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -95,7 +95,7 @@ jobs: npm i --prefix ui - name: Cypress run - uses: cypress-io/github-action@v3.8.3 + uses: cypress-io/github-action@v3 with: browser: chrome working-directory: ui From 9ce8ce115fe09341246478f57f6a54df6d9fea84 Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 17:21:36 +0000 Subject: [PATCH 25/27] HT-18 fix screenshot path --- .github/workflows/node.js.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 24187a9..ee4b6e9 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -109,13 +109,13 @@ jobs: if: failure() with: name: cypress-screenshots - path: tests/e2e/screenshots + path: ./tests/e2e/screenshots - uses: actions/upload-artifact@v2 if: always() with: name: cypress-videos - path: tests/e2e/videos/ + path: ./tests/e2e/videos/ test-server: runs-on: ubuntu-latest From 5950b5152949cc64a34981c8e02ceb40a3f87a80 Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 18:22:53 +0000 Subject: [PATCH 26/27] HT-18 upload artifact --- .github/workflows/node.js.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index ee4b6e9..d37b103 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -115,7 +115,9 @@ jobs: if: always() with: name: cypress-videos - path: ./tests/e2e/videos/ + path: | + ui + !ui/node_modules test-server: runs-on: ubuntu-latest From 39e1e7c9e4035ba8e697feb0fa9424bdd3c1fc23 Mon Sep 17 00:00:00 2001 From: jarrodback Date: Fri, 4 Feb 2022 18:35:16 +0000 Subject: [PATCH 27/27] HT-18 finalise artifact path --- .github/workflows/node.js.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index d37b103..3cb6b81 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -109,15 +109,13 @@ jobs: if: failure() with: name: cypress-screenshots - path: ./tests/e2e/screenshots + path: ui/tests/e2e/screenshots/ - uses: actions/upload-artifact@v2 if: always() with: name: cypress-videos - path: | - ui - !ui/node_modules + path: ui/tests/e2e/videos/ test-server: runs-on: ubuntu-latest