From cc9f16d36cbb3a7b2e4c772d9117bc3de0ef9828 Mon Sep 17 00:00:00 2001 From: tomlovesgithub <44227249+tomlovesgithub@users.noreply.github.com> Date: Fri, 27 Nov 2020 09:52:10 +0000 Subject: [PATCH 1/3] 640/equality diversity changes (#645) * equality-diversity-changes * rebase-develop --- .../EqualityAndDiversitySurvey.vue | 23 ++++++++++++------- src/views/Apply/AccountProfile/PAJE.vue | 2 +- src/views/Apply/FinalCheck/Review.vue | 8 +++---- src/views/DiversityInformation.vue | 2 +- src/views/Vacancy/VacancyDetails.vue | 2 +- tests/journeys/page-titles.spec.js | 6 +---- 6 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/views/Apply/AccountProfile/EqualityAndDiversitySurvey.vue b/src/views/Apply/AccountProfile/EqualityAndDiversitySurvey.vue index fc3ed20ba..3bf1df976 100644 --- 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?" >

Asian/Asian British @@ -425,7 +425,7 @@ id="gender" v-model="equalityAndDiversitySurvey.gender" required - label="What gender are you?" + label="What is your sex?" > @@ -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." > + > + +

The diff --git a/src/views/Apply/AccountProfile/PAJE.vue b/src/views/Apply/AccountProfile/PAJE.vue index d921b4e62..0b3142296 100644 --- a/src/views/Apply/AccountProfile/PAJE.vue +++ b/src/views/Apply/AccountProfile/PAJE.vue @@ -1,5 +1,5 @@ export default {} diff --git a/src/views/Apply/FinalCheck/Review.vue b/src/views/Apply/FinalCheck/Review.vue index 5a73f9bec..60cdb0f5b 100644 --- a/src/views/Apply/FinalCheck/Review.vue +++ b/src/views/Apply/FinalCheck/Review.vue @@ -421,7 +421,7 @@

- Ethnic group + What is your ethnic group?

- Gender + What is your sex?

- Gender is the same as sex assigned at birth + Is the gender you identify with the same as your sex registered at birth?
{{ application.equalityAndDiversitySurvey.changedGender | lookup | toYesNo }} @@ -522,7 +522,7 @@
- Religion or faith + What is your religion?

- Religious beliefs + Religion Change diff --git a/src/views/Vacancy/VacancyDetails.vue b/src/views/Vacancy/VacancyDetails.vue index 337feb3f9..37d7cf3fd 100644 --- 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 diff --git a/tests/journeys/page-titles.spec.js b/tests/journeys/page-titles.spec.js index fd64dd304..b05b08d90 100644 --- 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(); From 27c4a7947267ccdc848e6792884e09fdd6cf1832 Mon Sep 17 00:00:00 2001 From: Maria Brookes <40855898+mbrookeswebdev@users.noreply.github.com> Date: Fri, 27 Nov 2020 16:49:34 +0000 Subject: [PATCH 2/3] #647 Added an extra option (#648) Co-authored-by: Maria Brookes --- src/filters.js | 1 + src/views/Apply/AdditionalInformation.vue | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/filters.js b/src/filters.js index e13121d65..4ca414416 100644 --- 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/AdditionalInformation.vue b/src/views/Apply/AdditionalInformation.vue index 6aea3945d..c91b646f2 100644 --- a/src/views/Apply/AdditionalInformation.vue +++ b/src/views/Apply/AdditionalInformation.vue @@ -40,6 +40,10 @@ value="judicial-office-extranet" label="Judicial Office Extranet" /> + Date: Mon, 30 Nov 2020 13:27:06 +0000 Subject: [PATCH 3/3] Increase version number to 1.30.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1edc8a0be..9dc6b99f4 100644 --- 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",