From efd61a3a8a650b3817fe0ffe1747d3f2a5924953 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Fri, 2 Aug 2024 17:44:21 +0100 Subject: [PATCH 1/5] fix: fixed docker compose issue --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b0fd64627..2f1b5ab34 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -56,7 +56,7 @@ jobs: command: | export TWITTER_BEARER="Bearer ${{ secrets.TWITTER_BEARER }}" echo $TWITTER_BEARER - STAKWORK_TOKEN=daaa3a0894f0658d99781471dfccd3e1 TWITTER_BEARER=$TWITTER_BEARER GITACTION_ENV=gitactionenv docker-compose -f ./stack/alts/navfiber.yml --project-dir ./stack up -d; + STAKWORK_TOKEN=daaa3a0894f0658d99781471dfccd3e1 TWITTER_BEARER=$TWITTER_BEARER GITACTION_ENV=gitactionenv docker compose -f ./stack/alts/navfiber.yml --project-dir ./stack up -d; sleep 240; docker ps docker logs meme.sphinx From 96afeac41795aab4d63f3d60ee1b991207213e54 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Fri, 2 Aug 2024 18:09:56 +0100 Subject: [PATCH 2/5] fix: removed --project-dir flag --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2f1b5ab34..927fc4d13 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -56,7 +56,7 @@ jobs: command: | export TWITTER_BEARER="Bearer ${{ secrets.TWITTER_BEARER }}" echo $TWITTER_BEARER - STAKWORK_TOKEN=daaa3a0894f0658d99781471dfccd3e1 TWITTER_BEARER=$TWITTER_BEARER GITACTION_ENV=gitactionenv docker compose -f ./stack/alts/navfiber.yml --project-dir ./stack up -d; + STAKWORK_TOKEN=daaa3a0894f0658d99781471dfccd3e1 TWITTER_BEARER=$TWITTER_BEARER GITACTION_ENV=gitactionenv docker compose -f ./stack/alts/navfiber.yml up -d; sleep 240; docker ps docker logs meme.sphinx From 98a7624abe8d1807bb70c0ed3ddd6c0cc9b10b25 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Fri, 2 Aug 2024 18:23:10 +0100 Subject: [PATCH 3/5] fix: changed to --project-directory from --project-dir --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 927fc4d13..0f55e65ee 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -56,7 +56,7 @@ jobs: command: | export TWITTER_BEARER="Bearer ${{ secrets.TWITTER_BEARER }}" echo $TWITTER_BEARER - STAKWORK_TOKEN=daaa3a0894f0658d99781471dfccd3e1 TWITTER_BEARER=$TWITTER_BEARER GITACTION_ENV=gitactionenv docker compose -f ./stack/alts/navfiber.yml up -d; + STAKWORK_TOKEN=daaa3a0894f0658d99781471dfccd3e1 TWITTER_BEARER=$TWITTER_BEARER GITACTION_ENV=gitactionenv docker compose -f ./stack/alts/navfiber.yml --project-directory ./stack up -d; sleep 240; docker ps docker logs meme.sphinx From 5c345f5d19535e3c30a9ebf052ea1e7926174a43 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Mon, 5 Aug 2024 13:33:46 +0100 Subject: [PATCH 4/5] fix: fixed add content test --- cypress/e2e/addContent/addTweet.cy.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/cypress/e2e/addContent/addTweet.cy.ts b/cypress/e2e/addContent/addTweet.cy.ts index dc5686eef..db24f684d 100644 --- a/cypress/e2e/addContent/addTweet.cy.ts +++ b/cypress/e2e/addContent/addTweet.cy.ts @@ -15,9 +15,20 @@ describe('Add Tweet Content', () => { cy.get('[data-testid="skip-location-btn"').click() cy.get('[data-testid="check-icon"]').click() - cy.wait('@addTweet') - cy.wait(5500) // This is because add source is currently skipped, + cy.wait('@addTweet').then((interception) => { + //check we get a 402 response code, when trying to add content for the first time + expect(interception.response.statusCode).to.eq(402) + }) + + cy.intercept({ + method: 'POST', + url: 'http://localhost:8444/api/add_node*', + }).as('addTweet2') + + cy.wait('@addTweet2') // This is because add source is currently skipped, + cy.get('.Toastify__toast-body').should('have.text', 'Content Added') + cy.get('#addContent').should('not.exist') }) }) From 227dc2c54334368e4ef47021bddc1bb96afa06cd Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Mon, 5 Aug 2024 16:17:44 +0100 Subject: [PATCH 5/5] fix: removed docker-compose and replace with docker compose to stop the satck --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0f55e65ee..b8a351b15 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -104,4 +104,4 @@ jobs: - name: Stop Stack working-directory: ./stack - run: docker-compose down + run: docker compose down