From b6c7297417a10ef3e00db510a9decf58e0ed6bd8 Mon Sep 17 00:00:00 2001
From: AnumehaSrivastava05 <anumeha.saran@gmail.com>
Date: Fri, 18 Mar 2022 10:59:02 -0600
Subject: [PATCH 1/5] 6050: R50a and R50c enhancements

1. Added new immigration codes
2. Added new confirmation page
3. Added button
---
 .../enrollment/RegistrationConfirmation.vue   |  8 ++++
 .../RegistrationConfirmationWithPHN.vue       | 40 +++++++++++++++++++
 frontend/src/util/constants.js                |  2 +
 .../enrollment/AddVisaResidentWithPHN.vue     |  6 +--
 4 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 frontend/src/components/coverage/enrollment/RegistrationConfirmationWithPHN.vue

diff --git a/frontend/src/components/coverage/enrollment/RegistrationConfirmation.vue b/frontend/src/components/coverage/enrollment/RegistrationConfirmation.vue
index 04e4d493..538da363 100644
--- a/frontend/src/components/coverage/enrollment/RegistrationConfirmation.vue
+++ b/frontend/src/components/coverage/enrollment/RegistrationConfirmation.vue
@@ -10,6 +10,7 @@
         <AppOutput label="Name" :value="fullName" />
       </AppCol>
     </AppRow>
+    <AppButton @click="goToAddVisaResidentWithoutPHN()" mode="primary" type="button">Add Another Permit Holder Without PHN</AppButton>
   </div>
 </template>
 
@@ -29,5 +30,12 @@ export default {
       return formatPersonName(this.resident)
     },
   },
+
+  methods: {
+    goToAddVisaResidentWithoutPHN() {
+      this.$router.push('/coverage/enrollment/addStudyPermitHolderWithoutPHN')
+      this.$router.go()
+    },
+  },
 }
 </script>
diff --git a/frontend/src/components/coverage/enrollment/RegistrationConfirmationWithPHN.vue b/frontend/src/components/coverage/enrollment/RegistrationConfirmationWithPHN.vue
new file mode 100644
index 00000000..872e7f0b
--- /dev/null
+++ b/frontend/src/components/coverage/enrollment/RegistrationConfirmationWithPHN.vue
@@ -0,0 +1,40 @@
+<template>
+  <div>
+    <AppRow>
+      <AppCol class="col3">
+        <AppOutput label="PHN" :value="resident?.phn" />
+      </AppCol>
+    </AppRow>
+    <AppRow>
+      <AppCol>
+        <AppOutput label="Name" :value="fullName" />
+      </AppCol>
+    </AppRow>
+    <AppButton mode="primary" @click="goToAddStudyPermitHolderWithPHN()" type="button">Add Another Permit Holder With PHN</AppButton>
+  </div>
+</template>
+
+<script>
+import { formatPersonName } from '../../../util/utils'
+
+export default {
+  name: 'RegistrationConfirmationWithPHN',
+  props: {
+    resident: {
+      required: true,
+      type: Object,
+    },
+  },
+  computed: {
+    fullName() {
+      return formatPersonName(this.resident)
+    },
+  },
+
+  methods: {
+    goToAddStudyPermitHolderWithPHN() {
+      this.$router.go()
+    },
+  },
+}
+</script>
diff --git a/frontend/src/util/constants.js b/frontend/src/util/constants.js
index 1fbfb658..2fd4a870 100644
--- a/frontend/src/util/constants.js
+++ b/frontend/src/util/constants.js
@@ -40,6 +40,8 @@ export const PROVINCES = [
 export const IMMIGRATION_CODES = [
   { text: 'Select', value: '' },
   { text: 'Student Authorization', value: 'S' },
+  { text: 'Employment Authorization', value: 'W' },
+  { text: 'Diplomat', value: 'D' },
 ]
 
 // Prior Residence drop down options
diff --git a/frontend/src/views/coverage/enrollment/AddVisaResidentWithPHN.vue b/frontend/src/views/coverage/enrollment/AddVisaResidentWithPHN.vue
index 6b3e9c8e..8b0784b2 100644
--- a/frontend/src/views/coverage/enrollment/AddVisaResidentWithPHN.vue
+++ b/frontend/src/views/coverage/enrollment/AddVisaResidentWithPHN.vue
@@ -1,7 +1,7 @@
 <template>
   <ResidentPHN v-if="isPhnSearch" @update-resident="updateResident" :searching="searching" />
   <ResidentDetails v-else-if="isStudentRegistration" @register-resident="registerResident" :submitting="submitting" />
-  <RegistrationConfirmation v-else-if="isConfirmation" :resident="this.getPersonDetailsResult?.person" />
+  <RegistrationConfirmationWithPHN v-else-if="isConfirmation" :resident="this.getPersonDetailsResult?.person" />
 </template>
 
 <script>
@@ -9,14 +9,14 @@ import EnrollmentService from '../../../services/EnrollmentService'
 import { formatPersonName } from '../../../util/utils'
 import ResidentPHN from '../../../components/coverage/enrollment/ResidentPHN.vue'
 import ResidentDetails from '../../../components/coverage/enrollment/ResidentDetails.vue'
-import RegistrationConfirmation from '../../../components/coverage/enrollment/RegistrationConfirmation.vue'
+import RegistrationConfirmationWithPHN from '../../../components/coverage/enrollment/RegistrationConfirmationWithPHN.vue'
 
 export default {
   name: 'AddVisaResidentWithPHN',
   components: {
     ResidentPHN,
     ResidentDetails,
-    RegistrationConfirmation,
+    RegistrationConfirmationWithPHN,
   },
   data() {
     return {

From 35fe099fdf663fa83976bf060a1767a7d0abc56b Mon Sep 17 00:00:00 2001
From: AnumehaSrivastava05 <anumeha.saran@gmail.com>
Date: Mon, 21 Mar 2022 12:40:06 -0600
Subject: [PATCH 2/5] 6050: Enhancements R50 and R50c

1. Deleted immigration code fpr Diplomat
2. Updated method for button
3. Updated view
---
 .../enrollment/RegistrationConfirmation.vue   |  12 +-
 .../RegistrationConfirmationWithPHN.vue       |  40 ---
 frontend/src/util/constants.js                |   1 -
 .../enrollment/AddVisaResidentWithPHN.vue     |   6 +-
 .../enrollment/AddVisaResidentWithPHNTest.js  | 255 ++++++++++--------
 5 files changed, 151 insertions(+), 163 deletions(-)
 delete mode 100644 frontend/src/components/coverage/enrollment/RegistrationConfirmationWithPHN.vue

diff --git a/frontend/src/components/coverage/enrollment/RegistrationConfirmation.vue b/frontend/src/components/coverage/enrollment/RegistrationConfirmation.vue
index 538da363..07a0a16a 100644
--- a/frontend/src/components/coverage/enrollment/RegistrationConfirmation.vue
+++ b/frontend/src/components/coverage/enrollment/RegistrationConfirmation.vue
@@ -10,7 +10,7 @@
         <AppOutput label="Name" :value="fullName" />
       </AppCol>
     </AppRow>
-    <AppButton @click="goToAddVisaResidentWithoutPHN()" mode="primary" type="button">Add Another Permit Holder Without PHN</AppButton>
+    <AppButton @click="goToAddAnotherPermitHolder()" mode="primary" type="button">Add Another Permit Holder</AppButton>
   </div>
 </template>
 
@@ -32,9 +32,13 @@ export default {
   },
 
   methods: {
-    goToAddVisaResidentWithoutPHN() {
-      this.$router.push('/coverage/enrollment/addStudyPermitHolderWithoutPHN')
-      this.$router.go()
+    goToAddAnotherPermitHolder() {
+      if (this.$route.query.pageAction === 'REGISTRATION') {
+        this.$router.replace({ query: null })
+        this.$router.push('/coverage/enrollment/addStudyPermitHolderWithoutPHN')
+      } else {
+        this.$router.go()
+      }
     },
   },
 }
diff --git a/frontend/src/components/coverage/enrollment/RegistrationConfirmationWithPHN.vue b/frontend/src/components/coverage/enrollment/RegistrationConfirmationWithPHN.vue
deleted file mode 100644
index 872e7f0b..00000000
--- a/frontend/src/components/coverage/enrollment/RegistrationConfirmationWithPHN.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<template>
-  <div>
-    <AppRow>
-      <AppCol class="col3">
-        <AppOutput label="PHN" :value="resident?.phn" />
-      </AppCol>
-    </AppRow>
-    <AppRow>
-      <AppCol>
-        <AppOutput label="Name" :value="fullName" />
-      </AppCol>
-    </AppRow>
-    <AppButton mode="primary" @click="goToAddStudyPermitHolderWithPHN()" type="button">Add Another Permit Holder With PHN</AppButton>
-  </div>
-</template>
-
-<script>
-import { formatPersonName } from '../../../util/utils'
-
-export default {
-  name: 'RegistrationConfirmationWithPHN',
-  props: {
-    resident: {
-      required: true,
-      type: Object,
-    },
-  },
-  computed: {
-    fullName() {
-      return formatPersonName(this.resident)
-    },
-  },
-
-  methods: {
-    goToAddStudyPermitHolderWithPHN() {
-      this.$router.go()
-    },
-  },
-}
-</script>
diff --git a/frontend/src/util/constants.js b/frontend/src/util/constants.js
index 2fd4a870..8822c640 100644
--- a/frontend/src/util/constants.js
+++ b/frontend/src/util/constants.js
@@ -41,7 +41,6 @@ export const IMMIGRATION_CODES = [
   { text: 'Select', value: '' },
   { text: 'Student Authorization', value: 'S' },
   { text: 'Employment Authorization', value: 'W' },
-  { text: 'Diplomat', value: 'D' },
 ]
 
 // Prior Residence drop down options
diff --git a/frontend/src/views/coverage/enrollment/AddVisaResidentWithPHN.vue b/frontend/src/views/coverage/enrollment/AddVisaResidentWithPHN.vue
index 8b0784b2..6b3e9c8e 100644
--- a/frontend/src/views/coverage/enrollment/AddVisaResidentWithPHN.vue
+++ b/frontend/src/views/coverage/enrollment/AddVisaResidentWithPHN.vue
@@ -1,7 +1,7 @@
 <template>
   <ResidentPHN v-if="isPhnSearch" @update-resident="updateResident" :searching="searching" />
   <ResidentDetails v-else-if="isStudentRegistration" @register-resident="registerResident" :submitting="submitting" />
-  <RegistrationConfirmationWithPHN v-else-if="isConfirmation" :resident="this.getPersonDetailsResult?.person" />
+  <RegistrationConfirmation v-else-if="isConfirmation" :resident="this.getPersonDetailsResult?.person" />
 </template>
 
 <script>
@@ -9,14 +9,14 @@ import EnrollmentService from '../../../services/EnrollmentService'
 import { formatPersonName } from '../../../util/utils'
 import ResidentPHN from '../../../components/coverage/enrollment/ResidentPHN.vue'
 import ResidentDetails from '../../../components/coverage/enrollment/ResidentDetails.vue'
-import RegistrationConfirmationWithPHN from '../../../components/coverage/enrollment/RegistrationConfirmationWithPHN.vue'
+import RegistrationConfirmation from '../../../components/coverage/enrollment/RegistrationConfirmation.vue'
 
 export default {
   name: 'AddVisaResidentWithPHN',
   components: {
     ResidentPHN,
     ResidentDetails,
-    RegistrationConfirmationWithPHN,
+    RegistrationConfirmation,
   },
   data() {
     return {
diff --git a/frontend/tests/e2e/tests/enrollment/AddVisaResidentWithPHNTest.js b/frontend/tests/e2e/tests/enrollment/AddVisaResidentWithPHNTest.js
index 4cd1d8ac..785f4056 100644
--- a/frontend/tests/e2e/tests/enrollment/AddVisaResidentWithPHNTest.js
+++ b/frontend/tests/e2e/tests/enrollment/AddVisaResidentWithPHNTest.js
@@ -1,10 +1,9 @@
-import dayjs from 'dayjs'
-
-import { OUTPUT_DATE_FORMAT } from '../../../../src/util/constants'
-import { SITE_UNDER_TEST } from '../../configuration'
-import AlertPage from '../../pages/AlertPage'
 import AddVisaResidentWithPHNPage from '../../pages/enrollment/AddVisaResidentWithPHNPage'
+import AlertPage from '../../pages/AlertPage'
+import { OUTPUT_DATE_FORMAT } from '../../../../src/util/constants'
 import PersonDetails from '../../pages/enrollment/PersonDetailsPage'
+import { SITE_UNDER_TEST } from '../../configuration'
+import dayjs from 'dayjs'
 import { regularAccUser } from '../../roles/roles'
 
 const immigrationCodeOption = AddVisaResidentWithPHNPage.immigrationCodeSelect.find('option')
@@ -31,125 +30,151 @@ const PHONE_NUMBER_VALIDATION_MESSAGE = 'Only numbers 0 to 9 are valid. Phone Nu
 
 const PAGE_TO_TEST = SITE_UNDER_TEST + '/coverage/enrollment/addStudyPermitHolderWithPHN'
 
-fixture(`AddVisaResidentWithPHN Page`)
-.disablePageCaching `Test AddVisaResidentWithPHN`
-    .beforeEach(async t => {
-        await t
-            .useRole(regularAccUser)
-    })
-    .page(PAGE_TO_TEST)
+fixture(`AddVisaResidentWithPHN Page`).disablePageCaching`Test AddVisaResidentWithPHN`
+  .beforeEach(async (t) => {
+    await t.useRole(regularAccUser)
+  })
+  .page(PAGE_TO_TEST)
 
-test('Check required fields validation', async t => {
-    await t
-        .typeText(PersonDetails.phnInput, '9882807277')
-        .click(PersonDetails.submitButton)
-        .wait(5000)
-        // Given required fields aren't filled out 
-        
-        // When I click the submit button
-        .click(AddVisaResidentWithPHNPage.submitButton)
-        .wait(1000)
-        // I expect an error message stating the page had errors and individual error messages for each required field
-        .expect(AlertPage.alertBannerText.textContent).contains(ERROR_MESSAGE)
-        .expect(AddVisaResidentWithPHNPage.errorText.nth(0).textContent).contains(GROUPNUMBER_REQUIRED_MESSAGE)
-        .expect(AddVisaResidentWithPHNPage.errorText.nth(1).textContent).contains(IMMIGRATION_CODE_REQUIRED_MESSAGE)
-        .expect(AddVisaResidentWithPHNPage.errorText.nth(2).textContent).contains(PERMIT_ISSUE_DATE_REQUIRED_MESSAGE)
-        .expect(AddVisaResidentWithPHNPage.errorText.nth(3).textContent).contains(PERMIT_EXPIRY_DATE_REQUIRED_MESSAGE)
-        .expect(AddVisaResidentWithPHNPage.errorText.nth(4).textContent).contains(RESIDENCE_DATE_REQUIRED_MESSAGE)
-        .expect(AddVisaResidentWithPHNPage.errorText.nth(5).textContent).contains(COVERAGE_CANCELLATION_DATE_REQUIRED_MESSAGE)
-        .expect(AddVisaResidentWithPHNPage.errorText.nth(6).textContent).contains(HOME_ADDRESS_REQUIRED_MESSAGE)
-        .expect(AddVisaResidentWithPHNPage.errorText.nth(7).textContent).contains(CITY_REQUIRED_MESSAGE)
-        .expect(AddVisaResidentWithPHNPage.errorText.nth(8).textContent).contains(PROVINCE_REQUIRED_MESSAGE)
-        .expect(AddVisaResidentWithPHNPage.errorText.nth(9).textContent).contains(POSTAL_CODE_REQUIRED_MESSAGE)
-        .expect(AddVisaResidentWithPHNPage.errorText.nth(10).textContent).contains(PRIOR_RESIDENCE_REQUIRED_MESSAGE)
+test('Check required fields validation', async (t) => {
+  await t
+    .typeText(PersonDetails.phnInput, '9882807277')
+    .click(PersonDetails.submitButton)
+    .wait(5000)
+    // Given required fields aren't filled out
+
+    // When I click the submit button
+    .click(AddVisaResidentWithPHNPage.submitButton)
+    .wait(1000)
+    // I expect an error message stating the page had errors and individual error messages for each required field
+    .expect(AlertPage.alertBannerText.textContent)
+    .contains(ERROR_MESSAGE)
+    .expect(AddVisaResidentWithPHNPage.errorText.nth(0).textContent)
+    .contains(GROUPNUMBER_REQUIRED_MESSAGE)
+    .expect(AddVisaResidentWithPHNPage.errorText.nth(1).textContent)
+    .contains(IMMIGRATION_CODE_REQUIRED_MESSAGE)
+    .expect(AddVisaResidentWithPHNPage.errorText.nth(2).textContent)
+    .contains(PERMIT_ISSUE_DATE_REQUIRED_MESSAGE)
+    .expect(AddVisaResidentWithPHNPage.errorText.nth(3).textContent)
+    .contains(PERMIT_EXPIRY_DATE_REQUIRED_MESSAGE)
+    .expect(AddVisaResidentWithPHNPage.errorText.nth(4).textContent)
+    .contains(RESIDENCE_DATE_REQUIRED_MESSAGE)
+    .expect(AddVisaResidentWithPHNPage.errorText.nth(5).textContent)
+    .contains(COVERAGE_CANCELLATION_DATE_REQUIRED_MESSAGE)
+    .expect(AddVisaResidentWithPHNPage.errorText.nth(6).textContent)
+    .contains(HOME_ADDRESS_REQUIRED_MESSAGE)
+    .expect(AddVisaResidentWithPHNPage.errorText.nth(7).textContent)
+    .contains(CITY_REQUIRED_MESSAGE)
+    .expect(AddVisaResidentWithPHNPage.errorText.nth(8).textContent)
+    .contains(PROVINCE_REQUIRED_MESSAGE)
+    .expect(AddVisaResidentWithPHNPage.errorText.nth(9).textContent)
+    .contains(POSTAL_CODE_REQUIRED_MESSAGE)
+    .expect(AddVisaResidentWithPHNPage.errorText.nth(10).textContent)
+    .contains(PRIOR_RESIDENCE_REQUIRED_MESSAGE)
 })
 
-test('Check properly filled form passes validation', async t => {
-    await t
-        .typeText(PersonDetails.phnInput, '9882807277')
-        .click(PersonDetails.submitButton)
-        .wait(5000)
-        // Given the page is filled out correctly
-        .typeText(AddVisaResidentWithPHNPage.groupNumberInput, '6337109')
-        .click(AddVisaResidentWithPHNPage.immigrationCodeSelect)
-        .click(immigrationCodeOption.withText("Student Authorization"))
-        .typeText(AddVisaResidentWithPHNPage.departmentNumberInput, '123456')
-        .typeText(AddVisaResidentWithPHNPage.visaIssueDateInput, '20210101')
-        .typeText(AddVisaResidentWithPHNPage.visaExpiryDateInput, '20221231')
-        .typeText(AddVisaResidentWithPHNPage.residenceDateInput, '20191108')
-        .typeText(AddVisaResidentWithPHNPage.coverageEffectiveDateInput, '20210401')
-        .typeText(AddVisaResidentWithPHNPage.coverageCancellationDateInput, '20211231')
-        .typeText(AddVisaResidentWithPHNPage.telephoneInput, '7802024022')
-        .typeText(AddVisaResidentWithPHNPage.address1Input, 'Test 111 ST')
-        .typeText(AddVisaResidentWithPHNPage.cityInput, 'VICTORIA')
-        .click(AddVisaResidentWithPHNPage.provinceSelect)
-        .click(provinceOption.withText('British Columbia'))
-        .typeText(AddVisaResidentWithPHNPage.postalCodeInput, 'V8V8V8')
-        .click(AddVisaResidentWithPHNPage.priorResidenceCodeInput)
-        .click(priorResidenceCodeOption.withText('British Columbia'))
+test('Check properly filled form passes validation', async (t) => {
+  await t
+    .typeText(PersonDetails.phnInput, '9882807277')
+    .click(PersonDetails.submitButton)
+    .wait(5000)
+    // Given the page is filled out correctly
+    .typeText(AddVisaResidentWithPHNPage.groupNumberInput, '6337109')
+    .click(AddVisaResidentWithPHNPage.immigrationCodeSelect)
+    .click(immigrationCodeOption.withText('Employment Authorization'))
+    .typeText(AddVisaResidentWithPHNPage.departmentNumberInput, '123456')
+    .typeText(AddVisaResidentWithPHNPage.visaIssueDateInput, '20210101')
+    .typeText(AddVisaResidentWithPHNPage.visaExpiryDateInput, '20221231')
+    .typeText(AddVisaResidentWithPHNPage.residenceDateInput, '20191108')
+    .typeText(AddVisaResidentWithPHNPage.coverageEffectiveDateInput, '20210401')
+    .typeText(AddVisaResidentWithPHNPage.coverageCancellationDateInput, '20211231')
+    .typeText(AddVisaResidentWithPHNPage.telephoneInput, '7802024022')
+    .typeText(AddVisaResidentWithPHNPage.address1Input, 'Test 111 ST')
+    .typeText(AddVisaResidentWithPHNPage.cityInput, 'VICTORIA')
+    .click(AddVisaResidentWithPHNPage.provinceSelect)
+    .click(provinceOption.withText('British Columbia'))
+    .typeText(AddVisaResidentWithPHNPage.postalCodeInput, 'V8V8V8')
+    .click(AddVisaResidentWithPHNPage.priorResidenceCodeInput)
+    .click(priorResidenceCodeOption.withText('British Columbia'))
 
-        // When I click the submit button
-		.click(AddVisaResidentWithPHNPage.submitButton)
-        // I expect a success message
-        .expect(AlertPage.alertBannerText.textContent).contains(SUCCESS_MESSAGE)
+    // When I click the submit button
+    .click(AddVisaResidentWithPHNPage.submitButton)
+    // I expect a success message
+    .expect(AlertPage.alertBannerText.textContent)
+    .contains(SUCCESS_MESSAGE)
 })
 
-test('Check invalid field validation', async t => {
-    await t
+test('Check invalid field validation', async (t) => {
+  await t
     .typeText(PersonDetails.phnInput, '9882807277')
     .click(PersonDetails.submitButton)
-        .wait(1000)
-        // Given a Group Number entered with an invalid format
-        .typeText(AddVisaResidentWithPHNPage.groupNumberInput, '9000444000')
-        .typeText(AddVisaResidentWithPHNPage.groupMemberNumberInput, '9000444000')
-        .typeText(AddVisaResidentWithPHNPage.departmentNumberInput, '9000444^^')
-        .typeText(AddVisaResidentWithPHNPage.telephoneInput, '7807777')
-        // When I click the submit button
-		.click(AddVisaResidentWithPHNPage.submitButton)
-        // I expect an error message stating the page had errors and an individual error message for the PHN format
-        .expect(AddVisaResidentWithPHNPage.errorText.nth(0).textContent).contains(INVALID_GROUP_NUMBER_ERROR_MESSAGE)
-        .expect(AddVisaResidentWithPHNPage.errorText.nth(2).textContent).contains(INVALID_GROUP_MEMBER_NUMBER_ERROR_MESSAGE)
-        .expect(AddVisaResidentWithPHNPage.errorText.nth(4).textContent).contains(INVALID_DEPARTMENT_NUMBER_VALIDATION_MESSAGE)
-        .expect(AddVisaResidentWithPHNPage.errorText.nth(7).textContent).contains(PHONE_NUMBER_VALIDATION_MESSAGE)
-        .expect(AlertPage.alertBannerText.textContent).contains(ERROR_MESSAGE)
-
+    .wait(1000)
+    // Given a Group Number entered with an invalid format
+    .typeText(AddVisaResidentWithPHNPage.groupNumberInput, '9000444000')
+    .typeText(AddVisaResidentWithPHNPage.groupMemberNumberInput, '9000444000')
+    .typeText(AddVisaResidentWithPHNPage.departmentNumberInput, '9000444^^')
+    .typeText(AddVisaResidentWithPHNPage.telephoneInput, '7807777')
+    // When I click the submit button
+    .click(AddVisaResidentWithPHNPage.submitButton)
+    // I expect an error message stating the page had errors and an individual error message for the PHN format
+    .expect(AddVisaResidentWithPHNPage.errorText.nth(0).textContent)
+    .contains(INVALID_GROUP_NUMBER_ERROR_MESSAGE)
+    .expect(AddVisaResidentWithPHNPage.errorText.nth(2).textContent)
+    .contains(INVALID_GROUP_MEMBER_NUMBER_ERROR_MESSAGE)
+    .expect(AddVisaResidentWithPHNPage.errorText.nth(4).textContent)
+    .contains(INVALID_DEPARTMENT_NUMBER_VALIDATION_MESSAGE)
+    .expect(AddVisaResidentWithPHNPage.errorText.nth(7).textContent)
+    .contains(PHONE_NUMBER_VALIDATION_MESSAGE)
+    .expect(AlertPage.alertBannerText.textContent)
+    .contains(ERROR_MESSAGE)
 })
 
-test('Check clear button clears the form', async t => {	  
-    await t
+test('Check clear button clears the form', async (t) => {
+  await t
     .typeText(PersonDetails.phnInput, '9882807277')
     .click(PersonDetails.submitButton)
-        // Given the page is filled out correctly
-        .typeText(AddVisaResidentWithPHNPage.groupNumberInput, '6337109')
-        .click(AddVisaResidentWithPHNPage.immigrationCodeSelect)
-        .click(immigrationCodeOption.withText("Student Authorization"))
-        .typeText(AddVisaResidentWithPHNPage.departmentNumberInput, '6337109')
-        .typeText(AddVisaResidentWithPHNPage.visaIssueDateInput, '20210101')
-        .typeText(AddVisaResidentWithPHNPage.visaExpiryDateInput, '20221231')
-        .typeText(AddVisaResidentWithPHNPage.residenceDateInput, '20191108')
-        .typeText(AddVisaResidentWithPHNPage.coverageEffectiveDateInput, '20210301')
-        .typeText(AddVisaResidentWithPHNPage.coverageCancellationDateInput, '20211231')
-        .typeText(AddVisaResidentWithPHNPage.telephoneInput, '7802024022')
-        .typeText(AddVisaResidentWithPHNPage.address1Input, 'Test 111 ST')
-        .typeText(AddVisaResidentWithPHNPage.cityInput, 'VICTORIA')
-        .click(AddVisaResidentWithPHNPage.provinceSelect)
-        .click(provinceOption.withText('British Columbia'))
-        .typeText(AddVisaResidentWithPHNPage.postalCodeInput, 'V8V8V8')
-        .click(AddVisaResidentWithPHNPage.priorResidenceCodeInput)
-        .click(priorResidenceCodeOption.withText('British Columbia'))
-    
-        // When I click the clear button
-		.click(AddVisaResidentWithPHNPage.clearButton)
-        // I expect the form to be cleared
-        .expect(AddVisaResidentWithPHNPage.groupNumberInput.value).eql('')
-        .expect(AddVisaResidentWithPHNPage.immigrationCodeSelect.value).eql('')
-        .expect(AddVisaResidentWithPHNPage.visaIssueDateInput.value).eql('')
-        .expect(AddVisaResidentWithPHNPage.visaExpiryDateInput.value).eql('')
-        .expect(AddVisaResidentWithPHNPage.residenceDateInput.value).eql('')
-        .expect(AddVisaResidentWithPHNPage.coverageEffectiveDateInput.value).eql(dayjs().startOf('month').format(OUTPUT_DATE_FORMAT))
-        .expect(AddVisaResidentWithPHNPage.coverageCancellationDateInput.value).eql('')
-        .expect(AddVisaResidentWithPHNPage.cityInput.value).eql('')
-        .expect(AddVisaResidentWithPHNPage.provinceSelect.value).eql('')
-        .expect(AddVisaResidentWithPHNPage.postalCodeInput.value).eql('')
-        .expect(AddVisaResidentWithPHNPage.telephoneInput.value).eql('')
-})
\ No newline at end of file
+    // Given the page is filled out correctly
+    .typeText(AddVisaResidentWithPHNPage.groupNumberInput, '6337109')
+    .click(AddVisaResidentWithPHNPage.immigrationCodeSelect)
+    .click(immigrationCodeOption.withText('Student Authorization'))
+    .typeText(AddVisaResidentWithPHNPage.departmentNumberInput, '6337109')
+    .typeText(AddVisaResidentWithPHNPage.visaIssueDateInput, '20210101')
+    .typeText(AddVisaResidentWithPHNPage.visaExpiryDateInput, '20221231')
+    .typeText(AddVisaResidentWithPHNPage.residenceDateInput, '20191108')
+    .typeText(AddVisaResidentWithPHNPage.coverageEffectiveDateInput, '20210301')
+    .typeText(AddVisaResidentWithPHNPage.coverageCancellationDateInput, '20211231')
+    .typeText(AddVisaResidentWithPHNPage.telephoneInput, '7802024022')
+    .typeText(AddVisaResidentWithPHNPage.address1Input, 'Test 111 ST')
+    .typeText(AddVisaResidentWithPHNPage.cityInput, 'VICTORIA')
+    .click(AddVisaResidentWithPHNPage.provinceSelect)
+    .click(provinceOption.withText('British Columbia'))
+    .typeText(AddVisaResidentWithPHNPage.postalCodeInput, 'V8V8V8')
+    .click(AddVisaResidentWithPHNPage.priorResidenceCodeInput)
+    .click(priorResidenceCodeOption.withText('British Columbia'))
+
+    // When I click the clear button
+    .click(AddVisaResidentWithPHNPage.clearButton)
+    // I expect the form to be cleared
+    .expect(AddVisaResidentWithPHNPage.groupNumberInput.value)
+    .eql('')
+    .expect(AddVisaResidentWithPHNPage.immigrationCodeSelect.value)
+    .eql('')
+    .expect(AddVisaResidentWithPHNPage.visaIssueDateInput.value)
+    .eql('')
+    .expect(AddVisaResidentWithPHNPage.visaExpiryDateInput.value)
+    .eql('')
+    .expect(AddVisaResidentWithPHNPage.residenceDateInput.value)
+    .eql('')
+    .expect(AddVisaResidentWithPHNPage.coverageEffectiveDateInput.value)
+    .eql(dayjs().startOf('month').format(OUTPUT_DATE_FORMAT))
+    .expect(AddVisaResidentWithPHNPage.coverageCancellationDateInput.value)
+    .eql('')
+    .expect(AddVisaResidentWithPHNPage.cityInput.value)
+    .eql('')
+    .expect(AddVisaResidentWithPHNPage.provinceSelect.value)
+    .eql('')
+    .expect(AddVisaResidentWithPHNPage.postalCodeInput.value)
+    .eql('')
+    .expect(AddVisaResidentWithPHNPage.telephoneInput.value)
+    .eql('')
+})

From fe5cf78e464f262c89cffd0e426cdf952da2e89e Mon Sep 17 00:00:00 2001
From: AnumehaSrivastava05 <anumeha.saran@gmail.com>
Date: Tue, 22 Mar 2022 11:15:21 -0600
Subject: [PATCH 3/5] Addressed review comments

---
 .../enrollment/RegistrationConfirmation.vue        | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/coverage/enrollment/RegistrationConfirmation.vue b/frontend/src/components/coverage/enrollment/RegistrationConfirmation.vue
index 07a0a16a..16ecee7d 100644
--- a/frontend/src/components/coverage/enrollment/RegistrationConfirmation.vue
+++ b/frontend/src/components/coverage/enrollment/RegistrationConfirmation.vue
@@ -10,7 +10,8 @@
         <AppOutput label="Name" :value="fullName" />
       </AppCol>
     </AppRow>
-    <AppButton @click="goToAddAnotherPermitHolder()" mode="primary" type="button">Add Another Permit Holder</AppButton>
+    <AppButton v-if="this.$route.query.pageAction === 'REGISTRATION' || this.$route.name === 'AddVisaResidentWithoutPHN'" @click="addAnotherPermitHolderWithoutPHN()" mode="primary" type="button">Add Another Permit Holder without PHN</AppButton>
+    <AppButton v-else @click="addAnotherPermitHolderWithPHN()" mode="primary" type="button">Add Another Permit Holder with PHN</AppButton>
   </div>
 </template>
 
@@ -32,13 +33,16 @@ export default {
   },
 
   methods: {
-    goToAddAnotherPermitHolder() {
+    addAnotherPermitHolderWithoutPHN() {
       if (this.$route.query.pageAction === 'REGISTRATION') {
+        this.$store.commit('alert/dismissAlert')
         this.$router.replace({ query: null })
         this.$router.push('/coverage/enrollment/addStudyPermitHolderWithoutPHN')
-      } else {
-        this.$router.go()
-      }
+      } else this.$router.go()
+    },
+
+    addAnotherPermitHolderWithPHN() {
+      this.$router.go()
     },
   },
 }

From 0cbdc79b36e3375f1711f275dd7d0d474c278936 Mon Sep 17 00:00:00 2001
From: AnumehaSrivastava05 <anumeha.saran@gmail.com>
Date: Tue, 22 Mar 2022 11:58:30 -0600
Subject: [PATCH 4/5] Reverted Changes

Added dynamic button name
---
 .../coverage/enrollment/RegistrationConfirmation.vue | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/coverage/enrollment/RegistrationConfirmation.vue b/frontend/src/components/coverage/enrollment/RegistrationConfirmation.vue
index 16ecee7d..f691a3e1 100644
--- a/frontend/src/components/coverage/enrollment/RegistrationConfirmation.vue
+++ b/frontend/src/components/coverage/enrollment/RegistrationConfirmation.vue
@@ -10,8 +10,7 @@
         <AppOutput label="Name" :value="fullName" />
       </AppCol>
     </AppRow>
-    <AppButton v-if="this.$route.query.pageAction === 'REGISTRATION' || this.$route.name === 'AddVisaResidentWithoutPHN'" @click="addAnotherPermitHolderWithoutPHN()" mode="primary" type="button">Add Another Permit Holder without PHN</AppButton>
-    <AppButton v-else @click="addAnotherPermitHolderWithPHN()" mode="primary" type="button">Add Another Permit Holder with PHN</AppButton>
+    <AppButton @click="addAnotherPermitHolder()" mode="primary" type="button">{{ addAnotherButtonText }}</AppButton>
   </div>
 </template>
 
@@ -30,20 +29,19 @@ export default {
     fullName() {
       return formatPersonName(this.resident)
     },
+    addAnotherButtonText() {
+      return this.$route.query.pageAction === 'REGISTRATION' || this.$route.name === 'AddVisaResidentWithoutPHN' ? 'Add Another Permit Holder without PHN' : 'Add Another Permit Holder with PHN'
+    },
   },
 
   methods: {
-    addAnotherPermitHolderWithoutPHN() {
+    addAnotherPermitHolder() {
       if (this.$route.query.pageAction === 'REGISTRATION') {
         this.$store.commit('alert/dismissAlert')
         this.$router.replace({ query: null })
         this.$router.push('/coverage/enrollment/addStudyPermitHolderWithoutPHN')
       } else this.$router.go()
     },
-
-    addAnotherPermitHolderWithPHN() {
-      this.$router.go()
-    },
   },
 }
 </script>

From 80bcb853ba3b9d11d4c59f8e1e3b077433a0133a Mon Sep 17 00:00:00 2001
From: AnumehaSrivastava05 <anumeha.saran@gmail.com>
Date: Tue, 22 Mar 2022 12:30:49 -0600
Subject: [PATCH 5/5] Added missing parenthesis

---
 .../coverage/enrollment/RegistrationConfirmation.vue          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/coverage/enrollment/RegistrationConfirmation.vue b/frontend/src/components/coverage/enrollment/RegistrationConfirmation.vue
index f691a3e1..72f6c301 100644
--- a/frontend/src/components/coverage/enrollment/RegistrationConfirmation.vue
+++ b/frontend/src/components/coverage/enrollment/RegistrationConfirmation.vue
@@ -40,7 +40,9 @@ export default {
         this.$store.commit('alert/dismissAlert')
         this.$router.replace({ query: null })
         this.$router.push('/coverage/enrollment/addStudyPermitHolderWithoutPHN')
-      } else this.$router.go()
+      } else {
+        this.$router.go()
+      }
     },
   },
 }