Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Denmark marriage tool update - Content change request #2653

Merged
merged 13 commits into from
Jul 21, 2016

Conversation

pmanrubia
Copy link
Contributor

@pmanrubia pmanrubia commented Jul 21, 2016

Supersedes #2576

Trello card

Description

This story is linked to this Zendesk ticket.

Updates outcomes copy where a citizen lives in Uk or in Denmark according to this document.

Factcheck

denmark-marriage-tool-update-content-change-request

Expected changes (1)

Before

screen shot 2016-06-07 at 17 13 58

### After

screen shot 2016-06-07 at 17 13 48

## Expected changes (2) - [URL on GOV.UK](https://gov.uk/marriage-abroad/y/denmark/denmark/partner_local/same_sex) ### Before

screen shot 2016-06-07 at 17 17 49

### After

screen shot 2016-06-07 at 17 13 48

In preparation to extract a new Outcome for Denmark (opposite and same sex)
duplicates target outcome by:

`cp lib/smart_answer_flows/marriage-abroad/outcomes/outcome_opposite_sex_marriage_in_consular_cni_countries_when_residing_in_uk_or_ceremony_country.govspeak.erb lib/smart_answer_flows/marriage-abroad/outcomes/outcome_ceremonies_in_denmark_when_residing_in_uk_or_denmark.govspeak.erb`

There is a discussion explaining why it is extracted and not added to the
current outcome in [Trello][1]. See comment from @chrisroos

[1]: https://trello.com/c/9mdERL9m/125-denmark-marriage-tool-update-content-change-request
pmanrubia added 12 commits July 21, 2016 16:28
The flow is updated to display the outcome:
`outcome_ceremonies_in_denmark_when_residing_in_uk_or_denmark` for opposite
sex ceremonies in Denmark only when the user is resident of UK.
Removes Denmark dependent code for UK residents from the outcome:
`outcome_opposite_sex_marriage_in_consular_cni_countries_when_residing_in_uk_or_ceremony_country.govspeak.erb.`

Under the new circumstances the outcome will never be reached.
Removes non-Denmark dependent code, as the outcome: `outcome_ceremonies_in_denmark_when_residing_in_uk_or_denmark.govspeak.`
is specific to Denmark.
Update `outcome_ceremonies_in_denmark_when_residing_in_uk_or_denmark`
for opposite-sex and Living in UK.

Update the outcome according to the requirements described in [document][1]:

[1]: https://trello.com/c/9mdERL9m/125-denmark-marriage-tool-update-content-change-request
The flow is updated to display the outcome: `outcome_ceremonies_in_denmark_when_residing_in_uk_or_denmark`
for same sex ceremonies in Denmark only when the user is UK resident.
Update `outcome_ceremonies_in_denmark_when_residing_in_uk_or_denmark`
for same_sex and Living in UK.

Update the outcome according to the requirements described in [document][1]:

[1]: https://trello.com/c/9mdERL9m/125-denmark-marriage-tool-update-content-change-request
The flow is updated to display the outcome:
`outcome_ceremonies_in_denmark_when_residing_in_uk_or_denmark` for opposite sex
ceremonies in Denmark when the user is resident in Denmark
The flow is updated to display the outcome: `outcome_ceremonies_in_denmark`
for opposite sex ceremonies in Denmark when the user is resident in Denmark
The callout "Your partner will need to follow the same process and pay
the fees to get their own CNI." should be placed below the informational
paragraph starting "The names on all documents you provide must appear
exactly as ..." to below the new "No trace letters" section.
Removes Denmark dependent code from `outcome_opposite_sex_marriage_in_consular_cni_countries_when_residing_in_uk_or_ceremony_country.govspeak.erb` because ceremonies in Denmark never reach that outcome.
@pmanrubia pmanrubia force-pushed the marriage-abroad-denmark-supersed-2576 branch from 1f052e6 to 8d8272e Compare July 21, 2016 15:32
@pmanrubia
Copy link
Contributor Author

No need to pass a code review again, as it just supersedes #2576 without adding new features. #2576 has been fact-checked by the department, and I have checked that the artefacts on this PR are the same.

So, rebasing against master and force pushing in preparation for merging.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant