Merge branch 'main' into scratch

.github/workflows/analysis-codeql.yml

@@ -42,7 +42,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/[email protected].0
+      uses: github/codeql-action/[email protected].4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/[email protected].0
+      uses: github/codeql-action/[email protected].4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/[email protected].0
+      uses: github/codeql-action/[email protected].4

.github/workflows/analysis-tfsec-to-github-security.yml

@@ -32,6 +32,6 @@ jobs:
         with:
           sarif_file: tfsec.sarif
       - name: Upload SARIF file
-        uses: github/codeql-action/[email protected].0
+        uses: github/codeql-action/[email protected].4
         with:
           sarif_file: tfsec.sarif

.github/workflows/docker_job.yml

@@ -147,7 +147,7 @@ jobs:
 
       - name: Upload Trivy scan results to GitHub Security tab for ${{ matrix.ecr_repository }}
         id: trivy_upload_sarif
-        uses: github/codeql-action/[email protected].0
+        uses: github/codeql-action/[email protected].4
         if: always()
         with:
           sarif_file: 'trivy-results.sarif'

.github/workflows/go-unit-tests.yml

@@ -59,7 +59,7 @@ jobs:
             --broker-password ${{ secrets.pact_broker_password }}
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4.6.0
+        uses: codecov/codecov-action@v5.0.0
         with:
           flags: unittests
           files: ./coverage.out

.github/workflows/slack_job.yml

@@ -26,7 +26,7 @@ jobs:
     steps:
     - name: Post to a Slack channel
       id: slack
-      uses: slackapi/slack-github-action@v1.27.0
+      uses: slackapi/slack-github-action@v2.0.0
       with:
         # Slack channel id, channel name, or user id to post message.
         # See also: https://api.slack.com/methods/chat.postMessage#channels

.mockery.yaml

@@ -1,5 +1,6 @@
+disable-version-string: true
 with-expecter: true
-inpackage: True
+inpackage: true
 dir: "{{.InterfaceDir}}"
 mockname: "mock{{.InterfaceName|firstUpper}}"
 outpkg: "{{.PackageName}}"

cmd/enumerator/main.go

@@ -150,6 +150,8 @@ import (
 	"os"
 	"sort"
 	"strings"
+	"unicode"
+	"unicode/utf8"
 
 	"golang.org/x/tools/go/packages"
 )
@@ -602,7 +604,7 @@ func (g *Generator) createIndexAndNameDecl(run []Value, typeName string, suffix
 
 func (g *Generator) buildTextMethods(typeName string) {
 	if !g.bits {
-		g.Printf(textMethods, typeName)
+		g.Printf(textMethods, typeName, upperFirst(typeName))
 	}
 }
 
@@ -612,7 +614,7 @@ func (i %[1]s) MarshalText() ([]byte, error) {
 }
 
 func (i *%[1]s) UnmarshalText(text []byte) error {
-  val, err := Parse%[1]s(string(text))
+  val, err := Parse%[2]s(string(text))
   if err != nil {
     return err
   }
@@ -654,12 +656,12 @@ func (g *Generator) buildParseMethod(runs [][]Value, typeName string) {
 	g.Printf("\n")
 
 	if g.bits {
-		g.Printf(`func Parse%[1]s(strs []string) (%[1]s, error) {
-  var result %[1]s
+		g.Printf(`func Parse%[1]s(strs []string) (%[2]s, error) {
+  var result %[2]s
 
   for _, s := range strs {
 	  switch s {
-`, typeName)
+`, upperFirst(typeName), typeName)
 		for _, values := range runs {
 			for _, value := range values {
 				g.Printf(`  case "%[1]s":
@@ -676,9 +678,9 @@ func (g *Generator) buildParseMethod(runs [][]Value, typeName string) {
 }
 `, typeName)
 	} else {
-		g.Printf(`func Parse%[1]s(s string) (%[1]s, error) {
+		g.Printf(`func Parse%[1]s(s string) (%[2]s, error) {
 	switch s {
-`, typeName)
+`, upperFirst(typeName), typeName)
 		if g.empty {
 			g.Printf(`  case "":
 		return %[1]s(0), nil
@@ -863,3 +865,8 @@ func (g *Generator) buildStrings(runs [][]Value, typeName string) {
 }
 `)
 }
+
+func upperFirst(s string) string {
+	r, n := utf8.DecodeRuneInString(s)
+	return string(unicode.ToUpper(r)) + s[n:]
+}

cypress/e2e/certificate-provider/confirm-your-identity.cy.js

@@ -2,18 +2,14 @@ describe('confirm your identity', () => {
     beforeEach(() => {
         cy.visit('/fixtures/certificate-provider?redirect=/task-list&progress=confirmYourDetails');
 
-        cy.url().should('contain', '/task-list');
-        cy.checkA11yApp();
-
-        cy.contains('li', 'Confirm your identity').should('contain', 'Not started').click();
-
-        cy.url().should('contain', '/confirm-your-identity');
-        cy.checkA11yApp();
-
-        cy.contains('a', 'Continue').click()
+        cy.contains('li', "Confirm your identity")
+            .should('contain', 'Not started')
+            .find('a')
+            .click();
     })
 
     it('can see details of a successful ID check', () => {
+        cy.contains('button', 'Continue').click()
         cy.get('[name="user"]').check('certificate-provider', { force: true })
 
         cy.contains('button', 'Continue').click()
@@ -40,6 +36,7 @@ describe('confirm your identity', () => {
     })
 
     it('can see next steps when failing an ID check', () => {
+        cy.contains('button', 'Continue').click()
         cy.get('[name="return-code"]').check('T', { force: true })
 
         cy.contains('button', 'Continue').click()
@@ -61,6 +58,7 @@ describe('confirm your identity', () => {
     })
 
     it('can see next steps when has insufficient evidence for ID', () => {
+        cy.contains('button', 'Continue').click()
         cy.get('[name="return-code"]').check('X', { force: true })
 
         cy.contains('button', 'Continue').click()
@@ -80,4 +78,25 @@ describe('confirm your identity', () => {
 
         cy.url().should('contain', '/read-the-lpa');
     })
+
+    it('can go to the post office ', () => {
+        cy.url().should('contain', '/confirm-your-identity');
+        cy.contains('button', 'Continue').click();
+
+        cy.go(-2);
+        cy.contains('li', "Confirm your identity")
+            .should('contain', 'In progress')
+            .find('a')
+            .click();
+
+        cy.url().should('contain', '/how-will-you-confirm-your-identity');
+        cy.checkA11yApp();
+        cy.contains('label', 'I will confirm my identity at a Post Office').click();
+        cy.contains('button', 'Continue').click();
+
+        cy.contains('li', "Confirm your identity")
+            .should('contain', 'Pending')
+            .find('a')
+            .click();
+    });
 })

cypress/e2e/donor/confirm-your-identity.cy.js

@@ -12,7 +12,7 @@ describe('Confirm your identity', () => {
 
             cy.url().should('contain', '/confirm-your-identity');
             cy.checkA11yApp();
-            cy.contains('a', 'Continue').click();
+            cy.contains('button', 'Continue').click();
 
             cy.contains('label', 'Sam Smith (donor)').click();
             cy.contains('button', 'Continue').click();
@@ -38,7 +38,7 @@ describe('Confirm your identity', () => {
 
             cy.url().should('contain', '/confirm-your-identity');
             cy.checkA11yApp();
-            cy.contains('a', 'Continue').click();
+            cy.contains('button', 'Continue').click();
 
             cy.contains('label', 'Unable to prove identity (X)').click();
             cy.contains('button', 'Continue').click();
@@ -62,7 +62,7 @@ describe('Confirm your identity', () => {
 
             cy.url().should('contain', '/confirm-your-identity');
             cy.checkA11yApp();
-            cy.contains('a', 'Continue').click();
+            cy.contains('button', 'Continue').click();
 
             cy.contains('label', 'Failed identity check (T)').click();
             cy.contains('button', 'Continue').click();
@@ -89,7 +89,7 @@ describe('Confirm your identity', () => {
 
             cy.url().should('contain', '/confirm-your-identity');
             cy.checkA11yApp();
-            cy.contains('a', 'Continue').click();
+            cy.contains('button', 'Continue').click();
 
             cy.contains('label', 'Failed identity check (T)').click();
             cy.contains('button', 'Continue').click();
@@ -115,7 +115,7 @@ describe('Confirm your identity', () => {
 
             cy.url().should('contain', '/confirm-your-identity');
             cy.checkA11yApp();
-            cy.contains('a', 'Continue').click();
+            cy.contains('button', 'Continue').click();
 
             cy.contains('label', 'Charlie Cooper (certificate provider)').click();
             cy.contains('button', 'Continue').click();
@@ -148,7 +148,7 @@ describe('Confirm your identity', () => {
 
             cy.url().should('contain', '/confirm-your-identity');
             cy.checkA11yApp();
-            cy.contains('a', 'Continue').click();
+            cy.contains('button', 'Continue').click();
 
             cy.contains('label', 'Charlie Cooper (certificate provider)').click();
             cy.contains('button', 'Continue').click();
@@ -176,7 +176,7 @@ describe('Confirm your identity', () => {
 
             cy.url().should('contain', '/confirm-your-identity');
             cy.checkA11yApp();
-            cy.contains('a', 'Continue').click();
+            cy.contains('button', 'Continue').click();
 
             cy.contains('label', 'Charlie Cooper (certificate provider)').click();
             cy.contains('button', 'Continue').click();
@@ -193,4 +193,36 @@ describe('Confirm your identity', () => {
             cy.contains('.govuk-error-message', 'Select yes if you would like to update your details');
         });
     });
+
+    describe('when going to the post office', () => {
+        beforeEach(() => {
+            cy.visit('/fixtures?redirect=/task-list&progress=payForTheLpa');
+        });
+
+        it('can be completed ', () => {
+            cy.contains('li', "Confirm your identity")
+                .should('contain', 'Not started')
+                .find('a')
+                .click();
+
+            cy.url().should('contain', '/confirm-your-identity');
+            cy.contains('button', 'Continue').click();
+
+            cy.go(-2);
+            cy.contains('li', "Confirm your identity")
+                .should('contain', 'In progress')
+                .find('a')
+                .click();
+
+            cy.url().should('contain', '/how-will-you-confirm-your-identity');
+            cy.checkA11yApp();
+            cy.contains('label', 'I will confirm my identity at a Post Office').click();
+            cy.contains('button', 'Continue').click();
+
+            cy.contains('li', "Confirm your identity")
+                .should('contain', 'Pending')
+                .find('a')
+                .click();
+        });
+    });
 });