-
Notifications
You must be signed in to change notification settings - Fork 120
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
Rename marriage-abroad outcomes #2409
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for all opposite sex marriages in Germany.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for all opposite sex marriages in Kuwait.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for all opposite sex marriages in Indonesia.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for opposite sex marriages in Laos when marrying a Lao national.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for all opposite sex marriages in Japan.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for all opposite sex marriages in Hong Kong.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for opposite sex marriages in Kosovo when the applicant resides in either the UK or Kosovo.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for all opposite sex marriages in Cambodia.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for all opposite sex marriages in Colombia.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for all opposite sex marriages in Oman.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for opposite sex marriages in Poland when the applicant resides in either the UK or Poland.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for opposite sex marriages in Slovenia when the applicant resides in either the UK or Slovenia.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for opposite sex marriages in Commonwealth countries.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for opposite sex marriages in British overseas territories.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for all opposite sex marriages in Belarus.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for opposite sex marriages in Italy when the applicant resides in either the UK or Italy.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for opposite sex marriages in consular CNI countries where the applicant resides in a third country.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for opposite sex marriages in consular CNI countries where the applicant resides in either the UK or the ceremony country.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for all marriages in France or French overseas territories.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for opposite sex marriages in affirmation countries.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for opposite sex marriages in no-CNI countries when the applicant resides in either the ceremony or a third country. NOTE. This is true for all countries except st-martin and saint-barthelemy, where this outcome is also displayed for UK residents, and for same sex ceremonies. I'm going to investigate that separately as it doesn't seem quite right.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for opposite sex marriages in various countries. It looks as though it might not be too difficult to split this outcome into country specific outcomes, although that'll have to wait for another time.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for same sex civil partnerships in various countries.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for civil partnerships in France and French overseas territories. I've added 'or_french_overseas_territory' to mirror the naming of outcome_opposite_sex_in_france_or_french_overseas_territory. I've removed 'pacs' from the name as I believe that's equivalent to 'civil_partnership', and we're already using 'civil partnership' elsewhere.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for same sex civil partnerships in no-CNI countries.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for same sex civil partnerships in Commonwealth countries.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for same sex civil partnerships in consular countries.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for same sex marriages and civil partnerships in various countries. I've changed 'all_other_countries' to 'other_countries' to mirror the naming of 'outcome_opposite_sex_other_countries'. NOTE: This is essentially a duplicate of outcome_same_sex_marriage_not_possible but I'm going to investigate that separately.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for same sex marriages and civil partnerships when they're not possible. NOTE: This is essentially a duplicate of outcome_same_sex_marriage_and_civil_partnership_other_countries but I'm going to investigate that separately.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for same sex marriages and civil partnerships in Malta.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for same sex marriages and civil partnerships in various countries.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for same sex civil partnerships in affirmation countries.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for for opposite sex marriages in Laos when the applicant isn't marrying a Lao national.
I used the marriage-abroad-responses-and-expected-results.yml file to confirm that this outcome is used for all ceremonies in Ireland.
I used the marriage-abroad-responses-and-expected-results.yml file to confirm that this outcome is used for all ceremonies in Switzerland.
I used the marriage-abroad-responses-and-expected-results.yml file to confirm that this outcome is used for all ceremonies in Portugal.
I used the marriage-abroad-responses-and-expected-results.yml file to confirm that this outcome is used for all ceremonies in Monaco.
I used the marriage-abroad-responses-and-expected-results.yml file to confirm that this outcome is used for all ceremonies in Spain.
I used the marriage-abroad-responses-and-expected-results.yml file to confirm that this outcome is used for ceremonies in Brazil where the applicant resides in Brazil or a third country.
I used the marriage-abroad-responses-and-expected-results.yml file to confirm that this outcome is used for all ceremonies in the Dominican Republic.
I used a combination of the marriage-abroad-responses-and-expected-results.yml file and outcome template to confirm that this outcome is used for all ceremonies in the Netherlands and for opposite sex marriage ceremonies in various local authority countries.
I copied all outcomes to the clipboard, ran `pbpaste | sort | pbcopy` in the terminal and pasted the result back into the flow. I think it's probably possible to manually improve this ordering but I think this is better than what was there previously.
The marriage-abroad regression tests are passing so I'm updating the checksum data. Updated using: $ rails r script/generate-checksums-for-smart-answer.rb \ marriage-abroad
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This supersedes PR #2389 having addressed @floehopper's feedback.
I've attempted to consistently name the outcomes in the hope that it makes it easier to work on/continue to refactor this Smart Answers.
I've expanded abbreviations (e.g. "os" becomes "opposite_sex", "bot" becomes "british_overseas_territory") so that the outcome names are more self explanatory.
I've added more information to the outcome names where they're specific to a set of responses. As @floehopper pointed out in a comment on PR #2389, it'd be preferable to have outcomes that describe the result rather than the inputs. Unfortunately, I think most/all marriage-abroad outcomes are currently named based on the inputs in some way (e.g. outcome_spain, outcome_consular_cni_os_residing_in_third_country) so renaming them to reflect the result will have to wait.
Although there are some small changes between this branch and that in PR #2389, I don't think any of them require further review so I'm going to get this branch merged.