SW-5471 fix link for change firm (#286)

* SW-5471 fix change firm link * missing > * SW-5471 address go lint errors by swapping date format around in tests
ministryofjustice · Mar 2, 2023 · 0c96716 · 0c96716
1 parent 107fdf0
commit 0c96716
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/cypress/e2e/pro-hub/change-firm.cy.js b/cypress/e2e/pro-hub/change-firm.cy.js
@@ -6,7 +6,8 @@ describe("Change Firm", () => {
 
     describe("Changing a firm", () => {
         beforeEach(() => {
-            cy.visit("/supervision/deputies/3/change-firm");
+            cy.visit("/supervision/deputies/3");
+            cy.get("#change-firm").click();
         });
 
         it("shows title for page", () => {

diff --git a/internal/sirius/get_deputy_clients_test.go b/internal/sirius/get_deputy_clients_test.go
@@ -616,8 +616,8 @@ func TestReformatCompletedDateReturnsDateInCorrectFormat(t *testing.T) {
 }
 
 func TestGetOrderStatusReturnsOldestActiveOrder(t *testing.T) {
-	dateOne, _ := time.Parse("2006-02-01 00:00:00 +0000 UTC", "2014-12-01 00:00:00 +0000 UTC")
-	dateTwo, _ := time.Parse("2006-02-01 00:00:00 +0000 UTC", "2017-12-01 00:00:00 +0000 UTC")
+	dateOne, _ := time.Parse("2006-01-02 00:00:00 +0000 UTC", "2014-01-12 00:00:00 +0000 UTC")
+	dateTwo, _ := time.Parse("2006-01-02 00:00:00 +0000 UTC", "2017-01-12 00:00:00 +0000 UTC")
 
 	orderData := Orders{
 		Order{OrderStatus: "Active", SupervisionLevel: "General", OrderDate: dateOne},
@@ -629,8 +629,8 @@ func TestGetOrderStatusReturnsOldestActiveOrder(t *testing.T) {
 	assert.Equal(t, expectedResponse, result)
 }
 func TestGetOrderStatusReturnsOldestNonActiveOrder(t *testing.T) {
-	dateOne, _ := time.Parse("2006-02-01 00:00:00 +0000 UTC", "2014-12-01 00:00:00 +0000 UTC")
-	dateTwo, _ := time.Parse("2006-02-01 00:00:00 +0000 UTC", "2017-12-01 00:00:00 +0000 UTC")
+	dateOne, _ := time.Parse("2006-01-02 00:00:00 +0000 UTC", "2014-01-12 00:00:00 +0000 UTC")
+	dateTwo, _ := time.Parse("2006-01-02 00:00:00 +0000 UTC", "2017-01-12 00:00:00 +0000 UTC")
 
 	orderData := Orders{
 		Order{OrderStatus: "Close", SupervisionLevel: "General", OrderDate: dateOne},
@@ -643,8 +643,8 @@ func TestGetOrderStatusReturnsOldestNonActiveOrder(t *testing.T) {
 }
 
 func TestGetMostRecentSupervisionLevel(t *testing.T) {
-	dateOne, _ := time.Parse("2006-02-01 00:00:00 +0000 UTC", "2014-12-01 00:00:00 +0000 UTC")
-	dateTwo, _ := time.Parse("2006-02-01 00:00:00 +0000 UTC", "2017-12-01 00:00:00 +0000 UTC")
+	dateOne, _ := time.Parse("2006-01-02 00:00:00 +0000 UTC", "2014-01-12 00:00:00 +0000 UTC")
+	dateTwo, _ := time.Parse("2006-01-02 00:00:00 +0000 UTC", "2017-01-12 00:00:00 +0000 UTC")
 
 	orderData := Orders{
 		Order{OrderStatus: "Close", SupervisionLevel: "Minimal", OrderDate: dateOne},

diff --git a/web/template/manage-deputy-contact-details.gotmpl b/web/template/manage-deputy-contact-details.gotmpl
@@ -13,8 +13,9 @@
             <div class="govuk-grid-row">
                 <div class="govuk-grid-column-one-half">
                     <p class="govuk-body govuk-!-margin-bottom-5">
-                        <a href="">Change the deputy&apos;s firm</a> if
-                        they&apos;ve moved to a different organisation
+                        <a 
+                            href="{{ prefix (printf "/%d/change-firm" .DeputyDetails.ID) }}">Change the deputy&apos;s firm
+                        </a> if they&apos;ve moved to a different organisation
                     </p>
 
                     <form