From bd9a8ef225b062e0e0d6ba6fe4bcb5216ba19f27 Mon Sep 17 00:00:00 2001 From: Joshua Hawxwell <m@hawx.me> Date: Wed, 17 Apr 2024 10:29:53 +0100 Subject: [PATCH 1/3] Unskip the cypress tests --- cypress/e2e/attorney/language-preferences.cy.js | 2 +- cypress/e2e/attorney/trust-corporation.cy.js | 2 +- cypress/e2e/certificate-provider/enter-reference-number.cy.js | 2 +- cypress/e2e/donor/confirm-your-identity-and-sign.cy.js | 2 +- cypress/e2e/donor/signing-on-behalf.cy.js | 2 +- cypress/e2e/supporter/start.cy.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cypress/e2e/attorney/language-preferences.cy.js b/cypress/e2e/attorney/language-preferences.cy.js index e69c2284c4..5032720d8a 100644 --- a/cypress/e2e/attorney/language-preferences.cy.js +++ b/cypress/e2e/attorney/language-preferences.cy.js @@ -1,4 +1,4 @@ -describe.skip('Your preferred language', () => { +describe('Your preferred language', () => { beforeEach(() => { cy.visit('/fixtures/attorney?redirect=/your-preferred-language'); cy.url().should('contain', '/your-preferred-language') diff --git a/cypress/e2e/attorney/trust-corporation.cy.js b/cypress/e2e/attorney/trust-corporation.cy.js index b3fe751970..c14b48f537 100644 --- a/cypress/e2e/attorney/trust-corporation.cy.js +++ b/cypress/e2e/attorney/trust-corporation.cy.js @@ -1,6 +1,6 @@ const { TestMobile, TestEmail, randomShareCode } = require("../../support/e2e"); -describe.skip('As a trust corporation', () => { +describe('As a trust corporation', () => { beforeEach(() => { const shareCode = randomShareCode() cy.visit(`/fixtures/attorney?redirect=/attorney-start&is-trust-corporation=1&progress=signedByCertificateProvider&&withShareCode=${shareCode}&email=${TestEmail}`); diff --git a/cypress/e2e/certificate-provider/enter-reference-number.cy.js b/cypress/e2e/certificate-provider/enter-reference-number.cy.js index 5a97d5da33..491fa36e29 100644 --- a/cypress/e2e/certificate-provider/enter-reference-number.cy.js +++ b/cypress/e2e/certificate-provider/enter-reference-number.cy.js @@ -1,6 +1,6 @@ const { TestEmail, randomShareCode } = require("../../support/e2e"); -describe.skip('Enter reference number', () => { +describe('Enter reference number', () => { let shareCode = '' beforeEach(() => { shareCode = randomShareCode() diff --git a/cypress/e2e/donor/confirm-your-identity-and-sign.cy.js b/cypress/e2e/donor/confirm-your-identity-and-sign.cy.js index 35645f6568..18145f44c0 100644 --- a/cypress/e2e/donor/confirm-your-identity-and-sign.cy.js +++ b/cypress/e2e/donor/confirm-your-identity-and-sign.cy.js @@ -1,4 +1,4 @@ -describe.skip('Confirm your identity and sign', () => { +describe('Confirm your identity and sign', () => { describe('when certificate provider is acting online', () => { beforeEach(() => { cy.visit('/fixtures?redirect=/task-list&progress=payForTheLpa'); diff --git a/cypress/e2e/donor/signing-on-behalf.cy.js b/cypress/e2e/donor/signing-on-behalf.cy.js index eda1e9c11d..f63d14068c 100644 --- a/cypress/e2e/donor/signing-on-behalf.cy.js +++ b/cypress/e2e/donor/signing-on-behalf.cy.js @@ -1,4 +1,4 @@ -describe.skip('Signing on behalf of the donor', () => { +describe('Signing on behalf of the donor', () => { beforeEach(() => { cy.visit('/fixtures?redirect=/how-to-confirm-your-identity-and-sign&progress=payForTheLpa&donor=cannot-sign'); diff --git a/cypress/e2e/supporter/start.cy.js b/cypress/e2e/supporter/start.cy.js index b148591a07..3959d308f6 100644 --- a/cypress/e2e/supporter/start.cy.js +++ b/cypress/e2e/supporter/start.cy.js @@ -1,4 +1,4 @@ -describe.skip('Start', () => { +describe('Start', () => { beforeEach(() => { cy.visit('/supporter-start'); }); From ed1d91e6da01752fa4717af1a16fafbb2a138cd1 Mon Sep 17 00:00:00 2001 From: Joshua Hawxwell <m@hawx.me> Date: Wed, 17 Apr 2024 10:54:28 +0100 Subject: [PATCH 2/3] Force a build --- cmd/mlpa/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mlpa/main.go b/cmd/mlpa/main.go index 75a4c261c9..8c19b9e1bb 100644 --- a/cmd/mlpa/main.go +++ b/cmd/mlpa/main.go @@ -69,7 +69,7 @@ func main() { return a }, }). - WithAttrs([]slog.Attr{slog.String("service_name", "opg-modernising-lpa")})) + WithAttrs([]slog.Attr{slog.String("service_name", "opg-modernising-lpa2")})) if err := run(ctx, logger); err != nil { logger.Error("run error", slog.Any("err", err.Error())) From 503b6de0b14e8fa869a8f2c0e478971b3e0a4aa3 Mon Sep 17 00:00:00 2001 From: Joshua Hawxwell <m@hawx.me> Date: Wed, 17 Apr 2024 12:00:56 +0100 Subject: [PATCH 3/3] 1 thread --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9f129afaba..a40fb1d264 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "cypress:open": "node_modules/.bin/cypress open", "cypress:run": "node_modules/.bin/cypress run -vvv", "cypress:parallel": "cypress-parallel -s cypress:run -t 6 --spec cypress/e2e/**/*.cy.js cypress/smoke/*.cy.js", - "cypress:parallel-with-specs": "cypress-parallel -s cypress:run -t 2", + "cypress:parallel-with-specs": "cypress-parallel -s cypress:run -t 1", "test": "jest" }, "license": "MIT",