diff --git a/.github/workflows/go-unit-tests.yml b/.github/workflows/go-unit-tests.yml index c85f9f1e8a..3f40413f15 100644 --- a/.github/workflows/go-unit-tests.yml +++ b/.github/workflows/go-unit-tests.yml @@ -56,10 +56,7 @@ jobs: - name: Run tests and generate coverage report run: | - mkdir -p ./coverage/cmd ./coverage/internal - go test -cover ./internal/... -args -test.gocoverdir="$PWD/coverage/cmd" - go test -cover ./internal/... -args -test.gocoverdir="$PWD/coverage/internal" - go tool covdata textfmt -i=./coverage/internal,./coverage/cmd -o ./coverage/coverage_combined.out + make go-test - name: Publish pacts run: | @@ -75,4 +72,4 @@ jobs: uses: codecov/codecov-action@v3 with: flags: unittests - files: ./coverage/coverage_combined.out + files: ./coverage.out diff --git a/Makefile b/Makefile index 181cd48310..096d72e201 100644 --- a/Makefile +++ b/Makefile @@ -24,10 +24,10 @@ help: ##@other Show this help. @perl -e '$(HELP_FUN)' $(MAKEFILE_LIST) go-test: ##@testing Runs full go test suite - find . -name go.mod -execdir go test ./... -race -covermode=atomic -coverprofile=coverage.out \; + go test ./... -race -covermode=atomic -coverprofile=coverage.out go-generate: ##@testing Runs go generate - find . -name go.mod -execdir go generate ./... \; + go generate ./... coverage: ##@testing Produces coverage report and launches browser line based coverage explorer. To test a specific internal package pass in the package name e.g. make coverage package=page ifdef package diff --git a/cypress/e2e/donor/who-is-the-lpa-for.cy.js b/cypress/e2e/donor/who-is-the-lpa-for.cy.js deleted file mode 100644 index 52232e2b63..0000000000 --- a/cypress/e2e/donor/who-is-the-lpa-for.cy.js +++ /dev/null @@ -1,24 +0,0 @@ -describe('Who is the lpa for', () => { - beforeEach(() => { - cy.visit('/testing-start?redirect=/who-is-the-lpa-for'); - }); - - it('can be submitted', () => { - cy.get('#f-who-for').check('me'); - - cy.checkA11yApp(); - - cy.contains('button', 'Continue').click(); - cy.url().should('contain', '/lpa-type'); - }); - - it('errors when unselected', () => { - cy.contains('button', 'Continue').click(); - - cy.get('.govuk-error-summary').within(() => { - cy.contains('Select who the LPA is for'); - }); - - cy.contains('.govuk-fieldset .govuk-error-message', 'Select who the LPA is for'); - }); -}); diff --git a/cypress/e2e/donor/your-address.cy.js b/cypress/e2e/donor/your-address.cy.js index 83dee19bb6..3f11f11993 100644 --- a/cypress/e2e/donor/your-address.cy.js +++ b/cypress/e2e/donor/your-address.cy.js @@ -1,4 +1,4 @@ -import {AddressFormAssertions} from "../../support/e2e"; +import { AddressFormAssertions } from "../../support/e2e"; describe('Donor address', () => { beforeEach(() => { @@ -7,17 +7,17 @@ describe('Donor address', () => { it('address can be looked up', () => { AddressFormAssertions.assertCanAddAddressFromSelect() - cy.url().should('contain', '/who-is-the-lpa-for'); + cy.url().should('contain', '/lpa-type'); }); it('address can be entered manually if not found', () => { AddressFormAssertions.assertCanAddAddressManually('I can’t find my address in the list') - cy.url().should('contain', '/who-is-the-lpa-for'); + cy.url().should('contain', '/lpa-type'); }); it('address can be entered manually on invalid postcode', () => { AddressFormAssertions.assertCanAddAddressManually('Enter address manually', true) - cy.url().should('contain', '/who-is-the-lpa-for'); + cy.url().should('contain', '/lpa-type'); }); it('errors when empty postcode', () => { diff --git a/internal/page/data.go b/internal/page/data.go index e95eba5665..ed3c24c408 100644 --- a/internal/page/data.go +++ b/internal/page/data.go @@ -116,8 +116,6 @@ type Lpa struct { AttorneyDecisions actor.AttorneyDecisions // The certificate provider named in the LPA CertificateProvider actor.CertificateProvider - // Who the LPA is being drafted for (set, but not used) - WhoFor string // Type of LPA being drafted Type LpaType // ApplicationReason is why the application is being made diff --git a/internal/page/donor/certificate_provider_address_test.go b/internal/page/donor/certificate_provider_address_test.go index ab6b59a7bd..f97608ecac 100644 --- a/internal/page/donor/certificate_provider_address_test.go +++ b/internal/page/donor/certificate_provider_address_test.go @@ -198,7 +198,6 @@ func TestPostCertificateProviderAddressManualFromStore(t *testing.T) { FirstNames: "John", Address: testAddress, }, - WhoFor: "me", }). Return(nil) @@ -208,7 +207,6 @@ func TestPostCertificateProviderAddressManualFromStore(t *testing.T) { FirstNames: "John", Address: place.Address{Line1: "abc"}, }, - WhoFor: "me", }) resp := w.Result() diff --git a/internal/page/donor/choose_attorneys_address_test.go b/internal/page/donor/choose_attorneys_address_test.go index d36d223e12..27e248129f 100644 --- a/internal/page/donor/choose_attorneys_address_test.go +++ b/internal/page/donor/choose_attorneys_address_test.go @@ -295,7 +295,6 @@ func TestPostChooseAttorneysAddressManualFromStore(t *testing.T) { FirstNames: "John", Address: testAddress, }}}, - WhoFor: "me", }). Return(nil) @@ -306,7 +305,6 @@ func TestPostChooseAttorneysAddressManualFromStore(t *testing.T) { FirstNames: "John", Address: place.Address{Line1: "abc"}, }}}, - WhoFor: "me", }) resp := w.Result() diff --git a/internal/page/donor/choose_replacement_attorneys_address_test.go b/internal/page/donor/choose_replacement_attorneys_address_test.go index b7e760eca9..9bd0556611 100644 --- a/internal/page/donor/choose_replacement_attorneys_address_test.go +++ b/internal/page/donor/choose_replacement_attorneys_address_test.go @@ -260,8 +260,7 @@ func TestPostChooseReplacementAttorneysAddressManualFromStore(t *testing.T) { FirstNames: "John", Address: testAddress, }}}, - WhoFor: "me", - Tasks: page.Tasks{ChooseReplacementAttorneys: actor.TaskCompleted}, + Tasks: page.Tasks{ChooseReplacementAttorneys: actor.TaskCompleted}, }). Return(nil) @@ -272,7 +271,6 @@ func TestPostChooseReplacementAttorneysAddressManualFromStore(t *testing.T) { FirstNames: "John", Address: place.Address{Line1: "abc"}, }}}, - WhoFor: "me", }) resp := w.Result() diff --git a/internal/page/donor/enter_replacement_trust_corporation_address_test.go b/internal/page/donor/enter_replacement_trust_corporation_address_test.go index 1c7b435611..adc9ffeb6a 100644 --- a/internal/page/donor/enter_replacement_trust_corporation_address_test.go +++ b/internal/page/donor/enter_replacement_trust_corporation_address_test.go @@ -174,7 +174,6 @@ func TestPostEnterReplacementTrustCorporationAddressManualFromStore(t *testing.T Name: "John", Address: testAddress, }}, - WhoFor: "me", }). Return(nil) @@ -184,7 +183,6 @@ func TestPostEnterReplacementTrustCorporationAddressManualFromStore(t *testing.T Name: "John", Address: place.Address{Line1: "abc"}, }}, - WhoFor: "me", }) resp := w.Result() diff --git a/internal/page/donor/enter_trust_corporation_address_test.go b/internal/page/donor/enter_trust_corporation_address_test.go index 4430c920af..9240328319 100644 --- a/internal/page/donor/enter_trust_corporation_address_test.go +++ b/internal/page/donor/enter_trust_corporation_address_test.go @@ -174,7 +174,6 @@ func TestPostEnterTrustCorporationAddressManualFromStore(t *testing.T) { Name: "John", Address: testAddress, }}, - WhoFor: "me", }). Return(nil) @@ -184,7 +183,6 @@ func TestPostEnterTrustCorporationAddressManualFromStore(t *testing.T) { Name: "John", Address: place.Address{Line1: "abc"}, }}, - WhoFor: "me", }) resp := w.Result() diff --git a/internal/page/donor/register.go b/internal/page/donor/register.go index 5bd62b1e7f..59a7f1434b 100644 --- a/internal/page/donor/register.go +++ b/internal/page/donor/register.go @@ -189,8 +189,6 @@ func Register( YourDetails(tmpls.Get("your_details.gohtml"), donorStore, sessionStore)) handleWithLpa(page.Paths.YourAddress, None, YourAddress(logger, tmpls.Get("your_address.gohtml"), addressClient, donorStore)) - handleWithLpa(page.Paths.WhoIsTheLpaFor, None, - WhoIsTheLpaFor(tmpls.Get("who_is_the_lpa_for.gohtml"), donorStore)) handleWithLpa(page.Paths.LpaType, None, LpaType(tmpls.Get("lpa_type.gohtml"), donorStore)) handleWithLpa(page.Paths.ApplicationReason, None, diff --git a/internal/page/donor/who_is_the_lpa_for.go b/internal/page/donor/who_is_the_lpa_for.go deleted file mode 100644 index 2105709b49..0000000000 --- a/internal/page/donor/who_is_the_lpa_for.go +++ /dev/null @@ -1,59 +0,0 @@ -package donor - -import ( - "net/http" - - "github.com/ministryofjustice/opg-go-common/template" - "github.com/ministryofjustice/opg-modernising-lpa/internal/page" - "github.com/ministryofjustice/opg-modernising-lpa/internal/validation" -) - -type whoIsTheLpaForData struct { - App page.AppData - Errors validation.List - WhoFor string -} - -func WhoIsTheLpaFor(tmpl template.Template, donorStore DonorStore) Handler { - return func(appData page.AppData, w http.ResponseWriter, r *http.Request, lpa *page.Lpa) error { - data := &whoIsTheLpaForData{ - App: appData, - WhoFor: lpa.WhoFor, - } - - if r.Method == http.MethodPost { - form := readWhoIsTheLpaForForm(r) - data.Errors = form.Validate() - - if data.Errors.None() { - lpa.WhoFor = form.WhoFor - if err := donorStore.Put(r.Context(), lpa); err != nil { - return err - } - - return appData.Redirect(w, r, lpa, page.Paths.LpaType.Format(lpa.ID)) - } - } - - return tmpl(w, data) - } -} - -type whoIsTheLpaForForm struct { - WhoFor string -} - -func readWhoIsTheLpaForForm(r *http.Request) *whoIsTheLpaForForm { - return &whoIsTheLpaForForm{ - WhoFor: page.PostFormString(r, "who-for"), - } -} - -func (f *whoIsTheLpaForForm) Validate() validation.List { - var errors validation.List - - errors.String("who-for", "whoTheLpaIsFor", f.WhoFor, - validation.Select("me", "someone-else")) - - return errors -} diff --git a/internal/page/donor/who_is_the_lpa_for_test.go b/internal/page/donor/who_is_the_lpa_for_test.go deleted file mode 100644 index 67a9bd49fd..0000000000 --- a/internal/page/donor/who_is_the_lpa_for_test.go +++ /dev/null @@ -1,176 +0,0 @@ -package donor - -import ( - "net/http" - "net/http/httptest" - "net/url" - "strings" - "testing" - - "github.com/ministryofjustice/opg-modernising-lpa/internal/page" - "github.com/ministryofjustice/opg-modernising-lpa/internal/validation" - "github.com/stretchr/testify/assert" -) - -func TestGetWhoIsTheLpaFor(t *testing.T) { - w := httptest.NewRecorder() - r, _ := http.NewRequest(http.MethodGet, "/", nil) - - template := newMockTemplate(t) - template. - On("Execute", w, &whoIsTheLpaForData{ - App: testAppData, - }). - Return(nil) - - err := WhoIsTheLpaFor(template.Execute, nil)(testAppData, w, r, &page.Lpa{}) - resp := w.Result() - - assert.Nil(t, err) - assert.Equal(t, http.StatusOK, resp.StatusCode) -} - -func TestGetWhoIsTheLpaForFromStore(t *testing.T) { - w := httptest.NewRecorder() - r, _ := http.NewRequest(http.MethodGet, "/", nil) - - template := newMockTemplate(t) - template. - On("Execute", w, &whoIsTheLpaForData{ - App: testAppData, - WhoFor: "me", - }). - Return(nil) - - err := WhoIsTheLpaFor(template.Execute, nil)(testAppData, w, r, &page.Lpa{WhoFor: "me"}) - resp := w.Result() - - assert.Nil(t, err) - assert.Equal(t, http.StatusOK, resp.StatusCode) -} - -func TestGetWhoIsTheLpaForWhenTemplateErrors(t *testing.T) { - w := httptest.NewRecorder() - r, _ := http.NewRequest(http.MethodGet, "/", nil) - - template := newMockTemplate(t) - template. - On("Execute", w, &whoIsTheLpaForData{ - App: testAppData, - }). - Return(expectedError) - - err := WhoIsTheLpaFor(template.Execute, nil)(testAppData, w, r, &page.Lpa{}) - resp := w.Result() - - assert.Equal(t, expectedError, err) - assert.Equal(t, http.StatusOK, resp.StatusCode) -} - -func TestPostWhoIsTheLpaFor(t *testing.T) { - form := url.Values{ - "who-for": {"me"}, - } - - w := httptest.NewRecorder() - r, _ := http.NewRequest(http.MethodPost, "/", strings.NewReader(form.Encode())) - r.Header.Add("Content-Type", page.FormUrlEncoded) - - donorStore := newMockDonorStore(t) - donorStore. - On("Put", r.Context(), &page.Lpa{ID: "lpa-id", WhoFor: "me"}). - Return(nil) - - err := WhoIsTheLpaFor(nil, donorStore)(testAppData, w, r, &page.Lpa{ID: "lpa-id"}) - resp := w.Result() - - assert.Nil(t, err) - assert.Equal(t, http.StatusFound, resp.StatusCode) - assert.Equal(t, page.Paths.LpaType.Format("lpa-id"), resp.Header.Get("Location")) -} - -func TestPostWhoIsTheLpaForWhenStoreErrors(t *testing.T) { - form := url.Values{ - "who-for": {"me"}, - } - - w := httptest.NewRecorder() - r, _ := http.NewRequest(http.MethodPost, "/", strings.NewReader(form.Encode())) - r.Header.Add("Content-Type", page.FormUrlEncoded) - - donorStore := newMockDonorStore(t) - donorStore. - On("Put", r.Context(), &page.Lpa{WhoFor: "me"}). - Return(expectedError) - - err := WhoIsTheLpaFor(nil, donorStore)(testAppData, w, r, &page.Lpa{}) - - assert.Equal(t, expectedError, err) -} - -func TestPostWhoIsTheLpaForWhenValidationErrors(t *testing.T) { - w := httptest.NewRecorder() - r, _ := http.NewRequest(http.MethodPost, "/", strings.NewReader("")) - r.Header.Add("Content-Type", page.FormUrlEncoded) - - template := newMockTemplate(t) - template. - On("Execute", w, &whoIsTheLpaForData{ - App: testAppData, - Errors: validation.With("who-for", validation.SelectError{Label: "whoTheLpaIsFor"}), - }). - Return(nil) - - err := WhoIsTheLpaFor(template.Execute, nil)(testAppData, w, r, &page.Lpa{}) - resp := w.Result() - - assert.Nil(t, err) - assert.Equal(t, http.StatusOK, resp.StatusCode) -} - -func TestReadWhoIsTheLpaForForm(t *testing.T) { - form := url.Values{ - "who-for": {"me"}, - } - - r, _ := http.NewRequest(http.MethodPost, "/", strings.NewReader(form.Encode())) - r.Header.Add("Content-Type", page.FormUrlEncoded) - - result := readWhoIsTheLpaForForm(r) - - assert.Equal(t, "me", result.WhoFor) -} - -func TestWhoIsTheLpaForFormValidate(t *testing.T) { - testCases := map[string]struct { - form *whoIsTheLpaForForm - errors validation.List - }{ - "me": { - form: &whoIsTheLpaForForm{ - WhoFor: "me", - }, - }, - "someone-else": { - form: &whoIsTheLpaForForm{ - WhoFor: "someone-else", - }, - }, - "missing": { - form: &whoIsTheLpaForForm{}, - errors: validation.With("who-for", validation.SelectError{Label: "whoTheLpaIsFor"}), - }, - "invalid": { - form: &whoIsTheLpaForForm{ - WhoFor: "what", - }, - errors: validation.With("who-for", validation.SelectError{Label: "whoTheLpaIsFor"}), - }, - } - - for name, tc := range testCases { - t.Run(name, func(t *testing.T) { - assert.Equal(t, tc.errors, tc.form.Validate()) - }) - } -} diff --git a/internal/page/donor/your_address.go b/internal/page/donor/your_address.go index b7b28f1b76..feef28c2e1 100644 --- a/internal/page/donor/your_address.go +++ b/internal/page/donor/your_address.go @@ -38,7 +38,7 @@ func YourAddress(logger Logger, tmpl template.Template, addressClient AddressCli return err } - return appData.Redirect(w, r, lpa, page.Paths.WhoIsTheLpaFor.Format(lpa.ID)) + return appData.Redirect(w, r, lpa, page.Paths.LpaType.Format(lpa.ID)) } case "postcode-select": diff --git a/internal/page/donor/your_address_test.go b/internal/page/donor/your_address_test.go index d4d3d2d190..a9e9e5de00 100644 --- a/internal/page/donor/your_address_test.go +++ b/internal/page/donor/your_address_test.go @@ -139,7 +139,7 @@ func TestPostYourAddressManual(t *testing.T) { assert.Nil(t, err) assert.Equal(t, http.StatusFound, resp.StatusCode) - assert.Equal(t, page.Paths.WhoIsTheLpaFor.Format("lpa-id"), resp.Header.Get("Location")) + assert.Equal(t, page.Paths.LpaType.Format("lpa-id"), resp.Header.Get("Location")) } func TestPostYourAddressManualWhenPostcodeNotChanged(t *testing.T) { @@ -178,7 +178,7 @@ func TestPostYourAddressManualWhenPostcodeNotChanged(t *testing.T) { assert.Nil(t, err) assert.Equal(t, http.StatusFound, resp.StatusCode) - assert.Equal(t, page.Paths.WhoIsTheLpaFor.Format("lpa-id"), resp.Header.Get("Location")) + assert.Equal(t, page.Paths.LpaType.Format("lpa-id"), resp.Header.Get("Location")) } func TestPostYourAddressManualWhenStoreErrors(t *testing.T) { @@ -231,7 +231,6 @@ func TestPostYourAddressManualFromStore(t *testing.T) { FirstNames: "John", Address: testAddress, }, - WhoFor: "me", }). Return(nil) @@ -241,13 +240,12 @@ func TestPostYourAddressManualFromStore(t *testing.T) { FirstNames: "John", Address: place.Address{Line1: "abc"}, }, - WhoFor: "me", }) resp := w.Result() assert.Nil(t, err) assert.Equal(t, http.StatusFound, resp.StatusCode) - assert.Equal(t, page.Paths.WhoIsTheLpaFor.Format("lpa-id"), resp.Header.Get("Location")) + assert.Equal(t, page.Paths.LpaType.Format("lpa-id"), resp.Header.Get("Location")) } func TestPostYourAddressManualWhenValidationError(t *testing.T) { diff --git a/internal/page/donor/your_independent_witness_address_test.go b/internal/page/donor/your_independent_witness_address_test.go index 32768f066f..893ca45b68 100644 --- a/internal/page/donor/your_independent_witness_address_test.go +++ b/internal/page/donor/your_independent_witness_address_test.go @@ -200,7 +200,6 @@ func TestPostYourIndependentWitnessAddressManualFromStore(t *testing.T) { FirstNames: "John", Address: testAddress, }, - WhoFor: "me", Tasks: page.Tasks{ ChooseYourSignatory: actor.TaskCompleted, }, @@ -213,7 +212,6 @@ func TestPostYourIndependentWitnessAddressManualFromStore(t *testing.T) { FirstNames: "John", Address: place.Address{Line1: "abc"}, }, - WhoFor: "me", }) resp := w.Result() diff --git a/internal/page/paths.go b/internal/page/paths.go index a3ef5a95cd..9b00d94029 100644 --- a/internal/page/paths.go +++ b/internal/page/paths.go @@ -190,7 +190,6 @@ type AppPaths struct { WhatYoullNeedToConfirmYourIdentity LpaPath WhenCanTheLpaBeUsed LpaPath WhichFeeTypeAreYouApplyingFor LpaPath - WhoIsTheLpaFor LpaPath WitnessingAsCertificateProvider LpaPath WitnessingAsIndependentWitness LpaPath WitnessingYourSignature LpaPath @@ -346,7 +345,6 @@ var Paths = AppPaths{ WhatYoullNeedToConfirmYourIdentity: "/what-youll-need-to-confirm-your-identity", WhenCanTheLpaBeUsed: "/when-can-the-lpa-be-used", WhichFeeTypeAreYouApplyingFor: "/which-fee-type-are-you-applying-for", - WhoIsTheLpaFor: "/who-is-the-lpa-for", WitnessingAsCertificateProvider: "/witnessing-as-certificate-provider", WitnessingAsIndependentWitness: "/witnessing-as-independent-witness", WitnessingYourSignature: "/witnessing-your-signature", diff --git a/internal/page/testing_start.go b/internal/page/testing_start.go index 878a38e796..74a99f943a 100644 --- a/internal/page/testing_start.go +++ b/internal/page/testing_start.go @@ -263,7 +263,6 @@ func TestingStart(store sesh.Store, donorStore DonorStore, randomString func(int } } - lpa.WhoFor = "me" lpa.Type = LpaTypePropertyFinance lpa.UID = random.UuidString() lpa.Tasks.YourDetails = actor.TaskCompleted diff --git a/lang/cy.json b/lang/cy.json index 8c8fd1d163..929bae37a3 100644 --- a/lang/cy.json +++ b/lang/cy.json @@ -97,11 +97,6 @@ "yourAddressFromTheList": "eich cyfeiriad o’r rhestr", "noAddressesFound": "Welsh", "noYourAddressesFound": "Welsh", - "whoIsThisLpaFor": "Ar gyfer pwy mae’r LPA hon?", - "whoTheLpaIsFor": "Welsh", - "forMe": "Fi fy hun", - "forSomeoneElse": "Rhywun arall", - "imHelping": "Rydw i’n helpu rhywun arall i lenwi’r ffurflen LPA.", "email": "Cyfeiriad e-bost", "emailOptional": "Cyfeiriad e-bost (dewisol)", "phone": "Ffôn", @@ -403,7 +398,7 @@ "howShouldReplacementAttorneysStepInDetailSomeOtherWay": "

Gallwch ddewis pryd fydd eich atwrneiod wrth gefn yn camu i mewn ac ym mha drefn.

Mae’r rhan fwyaf o roddwyr yn dewis i’w holl atwrneiod wrth gefn gamu i mewn ar yr un pryd, hynny yw, cyn gynted ag y bydd un o’u hatwrneiod gwreiddiol yn methu â gweithredu mwyach. Serch hynny, os byddai’n well gennych i’ch atwrneiod wrth gefn gamu i mewn yn hwyrach neu mewn trefn benodol, dewiswch un o’r 2 opsiwn arall.

", "howShouldReplacementAttorneysStepInDetail": "

Welsh

", "whenOneCanNoLongerAct": "Cyn gynted ag y bydd un o’ch atwrneiod gwreiddiol yn methu â gweithredu mwyach, dylai eich holl atwrneiod wrth gefn gamu i mewn ar yr un pryd. Byddant yn gallu gwneud penderfyniadau ar y cyd ac yn unigol.", - "whenNoneCanNoLongerAct": "Pan na all unrhyw un o’ch atwrneiod gwreiddiol weithredu, bydd eich holl atwrneiod wrth gefn yn camu i mewn ar yr un pryd. Gallwch ddewis sut maen nhw'n gwneud penderfyniadau ar y dudalen nesaf.", + "whenNoneCanNoLongerAct": "Pan na all unrhyw un o’ch atwrneiod gwreiddiol weithredu, bydd eich holl atwrneiod wrth gefn yn camu i mewn ar yr un pryd. Gallwch ddewis sut maen nhw’n gwneud penderfyniadau ar y dudalen nesaf.", "otherWay": "Mewn rhyw ffordd arall", "otherWayHint": "Disgrifiwch isod sut hoffech i hyn ddigwydd. Byddwch yn ofalus - po fwyaf penodol yw eich cyfarwyddiadau, y mwyaf tebygol na fydd eich atwrneiod wrth gefn yn gallu eu dilyn. Os oes gennych unrhyw amheuon, gofynnwch am gyngor cyfreithiol.", "whenYourReplacementAttorneysStepIn": "Pryd fydd eich atwrneiod wrth gefn yn camu i mewn", diff --git a/lang/en.json b/lang/en.json index c604fa3e79..587a4fd176 100644 --- a/lang/en.json +++ b/lang/en.json @@ -95,11 +95,6 @@ "yourAddressFromTheList": "your address from the list", "noAddressesFound": "We could not find any addresses for that postcode. Check the postcode is correct, or enter the address manually.", "noYourAddressesFound": "We could not find any addresses for that postcode. Check your postcode is correct, or enter your address manually.", - "whoIsThisLpaFor": "Who is this LPA for?", - "whoTheLpaIsFor": "who the LPA is for", - "forMe": "For me", - "forSomeoneElse": "For someone else", - "imHelping": "I’m helping someone else fill in the LPA form.", "email": "Email address", "emailOptional": "Email address (optional)", "phone": "Phone", diff --git a/web/template/who_is_the_lpa_for.gohtml b/web/template/who_is_the_lpa_for.gohtml deleted file mode 100644 index 5015e1bbb8..0000000000 --- a/web/template/who_is_the_lpa_for.gohtml +++ /dev/null @@ -1,33 +0,0 @@ -{{ template "page" . }} - -{{ define "pageTitle" }}{{ tr .App "whoIsThisLpaFor" }}{{ end }} - -{{ define "main" }} -
-
-
-
-
- -

- {{ tr .App "whoIsThisLpaFor" }} -

- - - {{ template "error-message" (errorMessage . "who-for") }} - - {{ template "radios" (items . "who-for" .WhoFor - (item "me" "forMe") - (item "someone-else" "forSomeoneElse" "hint" "imHelping") - ) }} -
-
- -
- {{ template "continue-button" . }} -
- {{ template "csrf-field" . }} -
-
-
-{{ end }}