Content changes for Marriage Abroad (same sex civil partnerships in Greece)

[robinjam]

Trello card
Zendesk ticket

Description

Change same-sex outcomes for Greece as a result of changes to the law in Greece making civil partnerships legal.

Factcheck

Preview link for factcheck

Original version on gov.uk

Expected changes

All outcomes where user lives in UK

• https://smart-answers-pr-2708.herokuapp.com/marriage-abroad/y/greece/uk/partner_local/same_sex
• https://smart-answers-pr-2708.herokuapp.com/marriage-abroad/y/greece/uk/partner_british/same_sex
• https://smart-answers-pr-2708.herokuapp.com/marriage-abroad/y/greece/uk/partner_other/same_sex

Before

After

All outcomes where user lives outside UK

• https://smart-answers-pr-2708.herokuapp.com/marriage-abroad/y/greece/third_country/partner_british/same_sex
• https://smart-answers-pr-2708.herokuapp.com/marriage-abroad/y/greece/third_country/partner_local/same_sex
• https://smart-answers-pr-2708.herokuapp.com/marriage-abroad/y/greece/third_country/partner_other/same_sex
• https://smart-answers-pr-2708.herokuapp.com/marriage-abroad/y/greece/ceremony_country/partner_other/same_sex
• https://smart-answers-pr-2708.herokuapp.com/marriage-abroad/y/greece/ceremony_country/partner_local/same_sex
• https://smart-answers-pr-2708.herokuapp.com/marriage-abroad/y/greece/ceremony_country/partner_british/same_sex

Before

After

[leenagupte]

There is a partial template (_partner_naturalisation_in_uk.govspeak.erb) where the wording is identical to what is written here. The only difference is that the partial links to the "Become a British citizen" page on GOV.UK.

There is a case to be made for reusing the partial here.

[robinjam]

Done

[leenagupte]

@robinjam Teeny thing. Can you keep git commit messages to 50/72 characters (see commit 1fdbeaf).

Otherwise 👍 LGTM

[pmanrubia]

@robinjam / @leenagupte another option for keeping the commits atomic could be:

1. Add the outcome to the flow but copying the same content as in opposite sex.
   cp pathto/outcome_same_sex_marriage_and_civil_partnership_not_possible pathto/outcome_same_sex_civiil_partnership_in_greece
   Update the flow and keep the same content.
   Clarifying in the commit notes that this is a preparatory commit in order to change the copy of the outcome: there should not be any changes to the artefacts (all tests should be green)
2. Do the copy changes, regenerate artefacts and commit all together. Again a green commit.
3. Extract partial.

This way we have three atomic (and self-explanatory) commits

[leenagupte]

@pmanrubia @robinjam Where a brand new outcome is involved, I don't think it's helpful to initially create the outcome template with the wrong text in it. Personally, I would find that more confusing.

If we wanted to make what's happening clearer, I would add a line of explanation to the commit note. For example, previously it wasn't possible to get a same-sex civil partnership in Greece. This rule was changed... etc

[pmanrubia]

I would prefer having atomic commits where all tests are green in every moment. This approach will help us, for example, to run git bisect at any time, which is always a good thing. In my opinion, the commit history would be clear with my suggestion as we are moving our codebase slowly, in smaller chunks, and always in Green state. And a side note, this would not be the wrong text, it would just be the same status of the app expressed in a different way (the new outcome)

You can find similar (but not identical) examples in:

• Same sex marriage in Italy #2688
• Denmark marriage tool update - Content change request #2653

In any case, this is your call @robinjam and @leenagupte. I don't have strong opinions on the way you have played this card.

[robinjam]

@leenagupte @pmanrubia In this particular case the change is so small that it's probably easiest if I just squash this PR down into a single commit.

[pmanrubia]

I would still prefer having commits split as described in #2708 (comment), but that shouldn't prevent this PR from being merged.

LGTM