-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1504 from ministryofjustice/add-missing-personali…
…sation-to-failed-vouch-email MLPAB-2530 Add missing personalisation to failed vouch email and remove deleted email
- Loading branch information
Showing
4 changed files
with
52 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,6 @@ import ( | |
| "net/http" | ||
| "net/http/httptest" | ||
| "net/url" | ||
| "strconv" | ||
| "strings" | ||
| "testing" | ||
|
|
||
|
|
@@ -104,7 +103,7 @@ func TestGetConfirmAllowedToVouch(t *testing.T) { | |
| Execute(w, tc.data). | ||
| Return(nil) | ||
|
|
||
| err := ConfirmAllowedToVouch(template.Execute, lpaStoreResolvingService, nil, nil, nil)(testAppData, w, r, tc.provided) | ||
| err := ConfirmAllowedToVouch(template.Execute, lpaStoreResolvingService, nil, nil, nil, "app://")(testAppData, w, r, tc.provided) | ||
| resp := w.Result() | ||
|
|
||
| assert.Nil(t, err) | ||
|
|
@@ -124,7 +123,7 @@ func TestGetConfirmAllowedToVouchWhenLpaStoreResolvingServiceErrors(t *testing.T | |
| Get(r.Context()). | ||
| Return(donor, expectedError) | ||
|
|
||
| err := ConfirmAllowedToVouch(nil, lpaStoreResolvingService, nil, nil, nil)(testAppData, w, r, nil) | ||
| err := ConfirmAllowedToVouch(nil, lpaStoreResolvingService, nil, nil, nil, "app://")(testAppData, w, r, nil) | ||
|
|
||
| assert.Equal(t, expectedError, err) | ||
| } | ||
|
|
@@ -143,7 +142,7 @@ func TestGetConfirmAllowedToVouchWhenTemplateErrors(t *testing.T) { | |
| Execute(w, mock.Anything). | ||
| Return(expectedError) | ||
|
|
||
| err := ConfirmAllowedToVouch(template.Execute, lpaStoreResolvingService, nil, nil, nil)(testAppData, w, r, &voucherdata.Provided{}) | ||
| err := ConfirmAllowedToVouch(template.Execute, lpaStoreResolvingService, nil, nil, nil, "app://")(testAppData, w, r, &voucherdata.Provided{}) | ||
|
|
||
| assert.Equal(t, expectedError, err) | ||
| } | ||
|
|
@@ -174,7 +173,7 @@ func TestPostConfirmAllowedToVouch(t *testing.T) { | |
| Put(r.Context(), &voucherdata.Provided{LpaID: "lpa-id", Tasks: tasks}). | ||
| Return(nil) | ||
|
|
||
| err := ConfirmAllowedToVouch(nil, lpaStoreResolvingService, voucherStore, nil, nil)(testAppData, w, r, &voucherdata.Provided{LpaID: "lpa-id", Tasks: voucherdata.Tasks{ConfirmYourIdentity: taskState}}) | ||
| err := ConfirmAllowedToVouch(nil, lpaStoreResolvingService, voucherStore, nil, nil, "app://")(testAppData, w, r, &voucherdata.Provided{LpaID: "lpa-id", Tasks: voucherdata.Tasks{ConfirmYourIdentity: taskState}}) | ||
| resp := w.Result() | ||
|
|
||
| assert.Nil(t, err) | ||
|
|
@@ -185,52 +184,47 @@ func TestPostConfirmAllowedToVouch(t *testing.T) { | |
| } | ||
|
|
||
| func TestPostConfirmAllowedToVouchWhenNo(t *testing.T) { | ||
| testcases := map[int]notify.Email{ | ||
| 0: notify.VoucherFirstFailedVouchAttempt{Greeting: "Email greeting", VoucherFullName: "a b"}, | ||
| 1: notify.VoucherSecondFailedVouchAttempt{Greeting: "Email greeting", VoucherFullName: "a b"}, | ||
| f := url.Values{ | ||
| form.FieldNames.YesNo: {form.No.String()}, | ||
| } | ||
|
|
||
| for failedVouchAttempts, email := range testcases { | ||
| t.Run(strconv.Itoa(failedVouchAttempts), func(t *testing.T) { | ||
| f := url.Values{ | ||
| form.FieldNames.YesNo: {form.No.String()}, | ||
| } | ||
| w := httptest.NewRecorder() | ||
| r, _ := http.NewRequest(http.MethodPost, "/", strings.NewReader(f.Encode())) | ||
| r.Header.Add("Content-Type", page.FormUrlEncoded) | ||
|
|
||
| w := httptest.NewRecorder() | ||
| r, _ := http.NewRequest(http.MethodPost, "/", strings.NewReader(f.Encode())) | ||
| r.Header.Add("Content-Type", page.FormUrlEncoded) | ||
| lpa := &lpadata.Lpa{Donor: lpadata.Donor{LastName: "Smith", Email: "[email protected]"}, LpaUID: "lpa-uid"} | ||
|
|
||
| lpa := &lpadata.Lpa{Donor: lpadata.Donor{LastName: "Smith", Email: "[email protected]"}, LpaUID: "lpa-uid"} | ||
| lpaStoreResolvingService := newMockLpaStoreResolvingService(t) | ||
| lpaStoreResolvingService.EXPECT(). | ||
| Get(r.Context()). | ||
| Return(lpa, nil) | ||
|
|
||
| lpaStoreResolvingService := newMockLpaStoreResolvingService(t) | ||
| lpaStoreResolvingService.EXPECT(). | ||
| Get(r.Context()). | ||
| Return(lpa, nil) | ||
|
|
||
| notifyClient := newMockNotifyClient(t) | ||
| notifyClient.EXPECT(). | ||
| EmailGreeting(lpa). | ||
| Return("Email greeting") | ||
| notifyClient.EXPECT(). | ||
| SendActorEmail(r.Context(), "[email protected]", "lpa-uid", email). | ||
| Return(nil) | ||
| notifyClient := newMockNotifyClient(t) | ||
| notifyClient.EXPECT(). | ||
| EmailGreeting(lpa). | ||
| Return("Email greeting") | ||
| notifyClient.EXPECT(). | ||
| SendActorEmail(r.Context(), "[email protected]", "lpa-uid", notify.VouchingFailedAttempt{ | ||
| Greeting: "Email greeting", | ||
| VoucherFullName: "a b", | ||
| DonorStartPageURL: "app://" + page.PathStart.Format(), | ||
| }). | ||
| Return(nil) | ||
|
|
||
| donorStore := newMockDonorStore(t) | ||
| donorStore.EXPECT(). | ||
| GetAny(r.Context()). | ||
| Return(&donordata.Provided{FailedVouchAttempts: failedVouchAttempts}, nil) | ||
| donorStore.EXPECT(). | ||
| Put(r.Context(), &donordata.Provided{FailedVouchAttempts: failedVouchAttempts + 1}). | ||
| Return(nil) | ||
| donorStore := newMockDonorStore(t) | ||
| donorStore.EXPECT(). | ||
| GetAny(r.Context()). | ||
| Return(&donordata.Provided{FailedVouchAttempts: 1}, nil) | ||
| donorStore.EXPECT(). | ||
| Put(r.Context(), &donordata.Provided{FailedVouchAttempts: 2}). | ||
| Return(nil) | ||
|
|
||
| err := ConfirmAllowedToVouch(nil, lpaStoreResolvingService, nil, notifyClient, donorStore)(testAppData, w, r, &voucherdata.Provided{LpaID: "lpa-id", FirstNames: "a", LastName: "b"}) | ||
| resp := w.Result() | ||
| err := ConfirmAllowedToVouch(nil, lpaStoreResolvingService, nil, notifyClient, donorStore, "app://")(testAppData, w, r, &voucherdata.Provided{LpaID: "lpa-id", FirstNames: "a", LastName: "b"}) | ||
| resp := w.Result() | ||
|
|
||
| assert.Nil(t, err) | ||
| assert.Equal(t, http.StatusFound, resp.StatusCode) | ||
| assert.Equal(t, voucher.PathYouCannotVouchForDonor.Format("lpa-id"), resp.Header.Get("Location")) | ||
| }) | ||
| } | ||
| assert.Nil(t, err) | ||
| assert.Equal(t, http.StatusFound, resp.StatusCode) | ||
| assert.Equal(t, voucher.PathYouCannotVouchForDonor.Format("lpa-id"), resp.Header.Get("Location")) | ||
| } | ||
|
|
||
| func TestPostConfirmAllowedToVouchWhenStoreErrors(t *testing.T) { | ||
|
|
@@ -252,7 +246,7 @@ func TestPostConfirmAllowedToVouchWhenStoreErrors(t *testing.T) { | |
| Put(r.Context(), mock.Anything). | ||
| Return(expectedError) | ||
|
|
||
| err := ConfirmAllowedToVouch(nil, lpaStoreResolvingService, voucherStore, nil, nil)(testAppData, w, r, &voucherdata.Provided{LpaID: "lpa-id"}) | ||
| err := ConfirmAllowedToVouch(nil, lpaStoreResolvingService, voucherStore, nil, nil, "app://")(testAppData, w, r, &voucherdata.Provided{LpaID: "lpa-id"}) | ||
| assert.Equal(t, expectedError, err) | ||
| } | ||
|
|
||
|
|
@@ -283,7 +277,7 @@ func TestPostConfirmAllowedToVouchWhenNoWhenNotifyClientError(t *testing.T) { | |
| GetAny(r.Context()). | ||
| Return(&donordata.Provided{}, nil) | ||
|
|
||
| err := ConfirmAllowedToVouch(nil, lpaStoreResolvingService, nil, notifyClient, donorStore)(testAppData, w, r, &voucherdata.Provided{LpaID: "lpa-id"}) | ||
| err := ConfirmAllowedToVouch(nil, lpaStoreResolvingService, nil, notifyClient, donorStore, "app://")(testAppData, w, r, &voucherdata.Provided{LpaID: "lpa-id"}) | ||
| resp := w.Result() | ||
|
|
||
| assert.Error(t, err) | ||
|
|
@@ -346,7 +340,7 @@ func TestPostConfirmAllowedToVouchWhenNoWhenDonorStoreErrors(t *testing.T) { | |
| Get(mock.Anything). | ||
| Return(&lpadata.Lpa{}, nil) | ||
|
|
||
| err := ConfirmAllowedToVouch(nil, lpaStoreResolvingService, nil, tc.notifyClient(t), tc.donorStore(t))(testAppData, w, r, &voucherdata.Provided{LpaID: "lpa-id"}) | ||
| err := ConfirmAllowedToVouch(nil, lpaStoreResolvingService, nil, tc.notifyClient(t), tc.donorStore(t), "app://")(testAppData, w, r, &voucherdata.Provided{LpaID: "lpa-id"}) | ||
| resp := w.Result() | ||
|
|
||
| assert.Error(t, err) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters