Merge branch 'release/1.30.0'

jac-uk · Dec 1, 2020 · 84d9707 · 84d9707
2 parents acace13 + 977606a
commit 84d9707
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "application-form",
-  "version": "1.29.0",
+  "version": "1.30.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --mode develop",

diff --git a/src/filters.js b/src/filters.js
@@ -153,6 +153,7 @@ const lookup = (value) => {
       'jewish': 'Jewish',
       'judicial-office-extranet': 'Judicial Office Extranet',
       'judicial-functions': 'The carrying-out of judicial functions of any court or tribunal',
+      'judging-your-future-newsletter': 'Judging Your Future Newsletter',
       'lands-chamber': 'Lands Chamber',
       'leadership-non-legal': 'Leadership - non legal',
       'leadership': 'Leadership',

diff --git a/src/views/Apply/AccountProfile/EqualityAndDiversitySurvey.vue b/src/views/Apply/AccountProfile/EqualityAndDiversitySurvey.vue
@@ -286,7 +286,7 @@
           id="ethnic-group"
           v-model="equalityAndDiversitySurvey.ethnicGroup"
           required
-          label="What's your ethnic group?"
+          label="What is your ethnic group?"
         >
           <p class="govuk-heading-s govuk-!-margin-top-6">
             Asian/Asian British
@@ -425,7 +425,7 @@
           id="gender"
           v-model="equalityAndDiversitySurvey.gender"
           required
-          label="What gender are you?"
+          label="What is your sex?"
         >
           <RadioItem
             value="female"
@@ -441,12 +441,12 @@
           />
           <RadioItem
             value="other-gender"
-            label="Other"
+            label="Other sex"
           >
             <TextField
               id="other-gender-details"
               v-model="equalityAndDiversitySurvey.otherGenderDetails"
-              label="Other gender"
+              label="Other sex"
               class="govuk-!-width-two-thirds"
             />
           </RadioItem>
@@ -460,7 +460,7 @@
           id="changed-gender"
           v-model="equalityAndDiversitySurvey.changedGender"
           required
-          label="Is your gender identity the same as the sex you were assigned at birth?"
+          label="Is the gender you identify with the same as your sex registered at birth?"
           hint="This is about gender re-assignment."
         >
           <RadioItem
@@ -470,7 +470,14 @@
           <RadioItem
             :value="false"
             label="No"
-          />
+          >
+            <TextField
+              id="gender-indentity-details"
+              v-model="equalityAndDiversitySurvey.genderIdentityDetails"
+              label="Please enter your gender identity"
+              class="govuk-!-width-two-thirds"
+            />
+          </RadioItem>
           <RadioItem
             value="prefer-not-to-say"
             label="Prefer not to say"
@@ -557,7 +564,7 @@
           id="religion-faith"
           v-model="equalityAndDiversitySurvey.religionFaith"
           required
-          label="What religion or belief do you have?"
+          label="What is your religion?"
         >
           <RadioItem
             value="no-religion"
@@ -654,7 +661,7 @@
           id="has-taken-paje"
           v-model="equalityAndDiversitySurvey.hasTakenPAJE"
           required
-          label="Have you taken part in the Pre-Application Judicial Education programme (PAJE)?"
+          label="Have you taken part in the Pre-Application Judicial Education Programme (PAJE)?"
         >
           <p class="govuk-hint govuk-!-margin-top-0">
             The

diff --git a/src/views/Apply/AccountProfile/PAJE.vue b/src/views/Apply/AccountProfile/PAJE.vue
@@ -1,5 +1,5 @@
 <template>
-  <h1>Tell us if you've taken part in Pre-Application Judicial Education programme (PAJE)</h1>
+  <h1>Tell us if you've taken part in Pre-Application Judicial Education Programme (PAJE)</h1>
 </template>
 
 export default {}
diff --git a/src/views/Apply/AdditionalInformation.vue b/src/views/Apply/AdditionalInformation.vue
@@ -40,6 +40,10 @@
             value="judicial-office-extranet"
             label="Judicial Office Extranet"
           />
+          <CheckboxItem
+            value="judging-your-future-newsletter"
+            label="Judging Your Future Newsletter"
+          />
           <CheckboxItem
             value="twitter"
             label="Twitter"

diff --git a/src/views/Apply/FinalCheck/Review.vue b/src/views/Apply/FinalCheck/Review.vue
@@ -421,7 +421,7 @@
 
             <div class="govuk-summary-list__row">
               <dt class="govuk-summary-list__key">
-                Ethnic group
+                What is your ethnic group?
               </dt>
               <dd class="govuk-summary-list__value">
                 <p
@@ -465,7 +465,7 @@
 
             <div class="govuk-summary-list__row">
               <dt class="govuk-summary-list__key">
-                Gender
+                What is your sex?
               </dt>
               <dd class="govuk-summary-list__value">
                 <p
@@ -481,7 +481,7 @@
 
             <div class="govuk-summary-list__row">
               <dt class="govuk-summary-list__key">
-                Gender is the same as sex assigned at birth
+                Is the gender you identify with the same as your sex registered at birth?
               </dt>
               <dd class="govuk-summary-list__value">
                 {{ application.equalityAndDiversitySurvey.changedGender | lookup | toYesNo }}
@@ -522,7 +522,7 @@
 
             <div class="govuk-summary-list__row">
               <dt class="govuk-summary-list__key">
-                Religion or faith
+                What is your religion?
               </dt>
               <dd class="govuk-summary-list__value">
                 <p

diff --git a/src/views/DiversityInformation.vue b/src/views/DiversityInformation.vue
@@ -93,7 +93,7 @@
               scope="row"
               class="govuk-table__header"
             >
-              Religious beliefs
+              Religion
             </th>
             <td class="govuk-table__cell">
               <a href="name">Change</a>

diff --git a/src/views/Vacancy/VacancyDetails.vue b/src/views/Vacancy/VacancyDetails.vue
@@ -120,7 +120,7 @@
         class="govuk-button info-link--vacancy-details--you-been-invited-to-this-exercise"
         data-module="govuk-button"
         :to="{ name: 'eligibility' }"
-        >
+      >
         You've been invited to this exercise, click here to apply 
       </RouterLink>
 

diff --git a/tests/journeys/page-titles.spec.js b/tests/journeys/page-titles.spec.js
@@ -1,7 +1,3 @@
-// @FIXME@ *error-four* Quite a different test base, couldnt manage to successfully integrate helpers
-// couldnt tell how to add necessary logic to either 
-// this file or ../helpers.js
-
 import App from '@/App';
 // import Router from 'vue-router';
 // import Vuex from 'vuex';
@@ -28,7 +24,7 @@ const routes = [
   ['confirmation', 'Confirmation'],
 ];
 
-xdescribe('Page titles', () => {
+describe('Page titles', () => {
   let wrapper;
   beforeEach(() => {
     // const localVue = createLocalVue();