From 4ca00b4bdd642a14c6b90056dcf45bb5c20a37aa Mon Sep 17 00:00:00 2001
From: Chris Roos <chris@seagul.co.uk>
Date: Thu, 17 Mar 2016 20:32:30 +1100
Subject: [PATCH 1/9] Add #outcome_path_when_resident_in_uk
We're aiming toward having the `MarriageAbroadCalculator` be the only
object required to render outcomes.
Moving the logic of this `:uk_residence_outcome_path` precalculate block
is the first step toward me being able to remove the block.
---
.../calculators/marriage_abroad_calculator.rb | 8 ++++++++
lib/smart_answer_flows/marriage-abroad.rb | 6 +++---
.../calculators/marriage_abroad_calculator_test.rb | 12 ++++++++++++
3 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/lib/smart_answer/calculators/marriage_abroad_calculator.rb b/lib/smart_answer/calculators/marriage_abroad_calculator.rb
index c62f66b7778..6bcbfee531b 100644
--- a/lib/smart_answer/calculators/marriage_abroad_calculator.rb
+++ b/lib/smart_answer/calculators/marriage_abroad_calculator.rb
@@ -231,5 +231,13 @@ def civil_partnership_institution_name
'British embassy or consulate'
end
end
+
+ def outcome_path_when_resident_in_uk
+ [
+ '', 'marriage-abroad', 'y',
+ @ceremony_country, 'uk',
+ @partner_nationality, @sex_of_your_partner
+ ].join('/')
+ end
end
end
diff --git a/lib/smart_answer_flows/marriage-abroad.rb b/lib/smart_answer_flows/marriage-abroad.rb
index d8b447124b4..d6bd178b745 100644
--- a/lib/smart_answer_flows/marriage-abroad.rb
+++ b/lib/smart_answer_flows/marriage-abroad.rb
@@ -221,7 +221,7 @@ def define
end
precalculate :uk_residence_outcome_path do
- current_path.gsub('third_country', 'uk')
+ calculator.outcome_path_when_resident_in_uk
end
precalculate :ceremony_country_residence_outcome_path do
@@ -259,7 +259,7 @@ def define
end
precalculate :uk_residence_outcome_path do
- current_path.gsub('third_country', 'uk')
+ calculator.outcome_path_when_resident_in_uk
end
precalculate :ceremony_country_residence_outcome_path do
@@ -281,7 +281,7 @@ def define
end
precalculate :uk_residence_outcome_path do
- current_path.gsub('third_country', 'uk')
+ calculator.outcome_path_when_resident_in_uk
end
precalculate :ceremony_country_residence_outcome_path do
diff --git a/test/unit/calculators/marriage_abroad_calculator_test.rb b/test/unit/calculators/marriage_abroad_calculator_test.rb
index 8798c53f350..41e9ffbcafa 100644
--- a/test/unit/calculators/marriage_abroad_calculator_test.rb
+++ b/test/unit/calculators/marriage_abroad_calculator_test.rb
@@ -736,6 +736,18 @@ class MarriageAbroadCalculatorTest < ActiveSupport::TestCase
assert_equal 'British embassy or consulate', calculator.civil_partnership_institution_name
end
end
+
+ context '#outcome_path_when_resident_in_uk' do
+ should 'build the path' do
+ calculator = MarriageAbroadCalculator.new
+ calculator.ceremony_country = 'ceremony-country'
+ calculator.partner_nationality = 'partner-nationality'
+ calculator.sex_of_your_partner = 'sex-of-your-partner'
+
+ expected_path = '/marriage-abroad/y/ceremony-country/uk/partner-nationality/sex-of-your-partner'
+ assert_equal expected_path, calculator.outcome_path_when_resident_in_uk
+ end
+ end
end
end
end
From be7e01098a6969ddeca187966284ef7c35e4e128 Mon Sep 17 00:00:00 2001
From: Chris Roos <chris@seagul.co.uk>
Date: Thu, 17 Mar 2016 20:38:23 +1100
Subject: [PATCH 2/9] Add #outcome_path_when_resident_in_ceremony_country
We're aiming toward having the `MarriageAbroadCalculator` be the only
object required to render outcomes.
Moving the logic of this `:ceremony_country_residence_outcome_path`
precalculate block is the first step toward me being able to remove the
block.
---
.../calculators/marriage_abroad_calculator.rb | 8 ++++++++
lib/smart_answer_flows/marriage-abroad.rb | 6 +++---
.../calculators/marriage_abroad_calculator_test.rb | 12 ++++++++++++
3 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/lib/smart_answer/calculators/marriage_abroad_calculator.rb b/lib/smart_answer/calculators/marriage_abroad_calculator.rb
index 6bcbfee531b..bd98f08aab9 100644
--- a/lib/smart_answer/calculators/marriage_abroad_calculator.rb
+++ b/lib/smart_answer/calculators/marriage_abroad_calculator.rb
@@ -239,5 +239,13 @@ def outcome_path_when_resident_in_uk
@partner_nationality, @sex_of_your_partner
].join('/')
end
+
+ def outcome_path_when_resident_in_ceremony_country
+ [
+ '', 'marriage-abroad', 'y',
+ @ceremony_country, 'ceremony_country',
+ @partner_nationality, @sex_of_your_partner
+ ].join('/')
+ end
end
end
diff --git a/lib/smart_answer_flows/marriage-abroad.rb b/lib/smart_answer_flows/marriage-abroad.rb
index d6bd178b745..c47c3a3ea77 100644
--- a/lib/smart_answer_flows/marriage-abroad.rb
+++ b/lib/smart_answer_flows/marriage-abroad.rb
@@ -225,7 +225,7 @@ def define
end
precalculate :ceremony_country_residence_outcome_path do
- current_path.gsub('third_country', 'ceremony_country')
+ calculator.outcome_path_when_resident_in_ceremony_country
end
end
@@ -263,7 +263,7 @@ def define
end
precalculate :ceremony_country_residence_outcome_path do
- current_path.gsub('third_country', 'ceremony_country')
+ calculator.outcome_path_when_resident_in_ceremony_country
end
end
@@ -285,7 +285,7 @@ def define
end
precalculate :ceremony_country_residence_outcome_path do
- current_path.gsub('third_country', 'ceremony_country')
+ calculator.outcome_path_when_resident_in_ceremony_country
end
end
diff --git a/test/unit/calculators/marriage_abroad_calculator_test.rb b/test/unit/calculators/marriage_abroad_calculator_test.rb
index 41e9ffbcafa..9610ee1d8c0 100644
--- a/test/unit/calculators/marriage_abroad_calculator_test.rb
+++ b/test/unit/calculators/marriage_abroad_calculator_test.rb
@@ -748,6 +748,18 @@ class MarriageAbroadCalculatorTest < ActiveSupport::TestCase
assert_equal expected_path, calculator.outcome_path_when_resident_in_uk
end
end
+
+ context '#outcome_path_when_resident_in_ceremony_country' do
+ should 'build the path' do
+ calculator = MarriageAbroadCalculator.new
+ calculator.ceremony_country = 'ceremony-country'
+ calculator.partner_nationality = 'partner-nationality'
+ calculator.sex_of_your_partner = 'sex-of-your-partner'
+
+ expected_path = '/marriage-abroad/y/ceremony-country/ceremony_country/partner-nationality/sex-of-your-partner'
+ assert_equal expected_path, calculator.outcome_path_when_resident_in_ceremony_country
+ end
+ end
end
end
end
From e36f9a2fb0a82b67f9be34c21dcf0e979bd0fd11 Mon Sep 17 00:00:00 2001
From: Chris Roos <chris@seagul.co.uk>
Date: Thu, 17 Mar 2016 21:06:57 +1100
Subject: [PATCH 3/9] DRY up
outcome_path_when_resident_in_[uk|ceremony_country] methods
---
.../calculators/marriage_abroad_calculator.rb | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/lib/smart_answer/calculators/marriage_abroad_calculator.rb b/lib/smart_answer/calculators/marriage_abroad_calculator.rb
index bd98f08aab9..3276665987b 100644
--- a/lib/smart_answer/calculators/marriage_abroad_calculator.rb
+++ b/lib/smart_answer/calculators/marriage_abroad_calculator.rb
@@ -233,17 +233,19 @@ def civil_partnership_institution_name
end
def outcome_path_when_resident_in_uk
- [
- '', 'marriage-abroad', 'y',
- @ceremony_country, 'uk',
- @partner_nationality, @sex_of_your_partner
- ].join('/')
+ outcome_path_when_resident_in('uk')
end
def outcome_path_when_resident_in_ceremony_country
+ outcome_path_when_resident_in('ceremony_country')
+ end
+
+ private
+
+ def outcome_path_when_resident_in(uk_or_ceremony_country)
[
'', 'marriage-abroad', 'y',
- @ceremony_country, 'ceremony_country',
+ @ceremony_country, uk_or_ceremony_country,
@partner_nationality, @sex_of_your_partner
].join('/')
end
From d24a238c6d0db192bf7dbc20ee62f6ef494ba5d2 Mon Sep 17 00:00:00 2001
From: Chris Roos <chris@seagul.co.uk>
Date: Thu, 17 Mar 2016 20:39:55 +1100
Subject: [PATCH 4/9] Remove unused current_path precalculate block
This was previously used in the `:uk_residence_outcome_path` and
`:ceremony_country_residence_outcome_path` precalculate blocks. It's no
longer required now that the logic of those precalculate blocks has been
moved to the `MarriageAbroadCalculator`.
---
lib/smart_answer_flows/marriage-abroad.rb | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/lib/smart_answer_flows/marriage-abroad.rb b/lib/smart_answer_flows/marriage-abroad.rb
index c47c3a3ea77..a5fb2c519e8 100644
--- a/lib/smart_answer_flows/marriage-abroad.rb
+++ b/lib/smart_answer_flows/marriage-abroad.rb
@@ -216,10 +216,6 @@ def define
outcome :outcome_os_germany
outcome :outcome_os_kuwait do
- precalculate :current_path do
- (['/marriage-abroad/y'] + responses).join('/')
- end
-
precalculate :uk_residence_outcome_path do
calculator.outcome_path_when_resident_in_uk
end
@@ -254,10 +250,6 @@ def define
outcome :outcome_monaco
outcome :outcome_spain do
- precalculate :current_path do
- (['/marriage-abroad/y'] + responses).join('/')
- end
-
precalculate :uk_residence_outcome_path do
calculator.outcome_path_when_resident_in_uk
end
@@ -276,10 +268,6 @@ def define
outcome :outcome_os_italy
outcome :outcome_consular_cni_os_residing_in_third_country do
- precalculate :current_path do
- (['/marriage-abroad/y'] + responses).join('/')
- end
-
precalculate :uk_residence_outcome_path do
calculator.outcome_path_when_resident_in_uk
end
From 629f0fd3a4555505d0e3f22e5e6133b6d0a5e05a Mon Sep 17 00:00:00 2001
From: Chris Roos <chris@seagul.co.uk>
Date: Thu, 17 Mar 2016 20:48:06 +1100
Subject: [PATCH 5/9] Use #outcome_path_when_resident_in_uk in outcomes
Using this `MarriageAbroadCalculator` method will allow me to remove the
`:uk_residence_outcome_path` precalculate block.
---
...e_consular_cni_os_residing_in_third_country.govspeak.erb | 6 +++---
.../marriage-abroad/outcomes/outcome_os_kuwait.govspeak.erb | 2 +-
.../marriage-abroad/outcomes/outcome_spain.govspeak.erb | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_consular_cni_os_residing_in_third_country.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_consular_cni_os_residing_in_third_country.govspeak.erb
index 7e4a3ff0c8f..989d3a1d11c 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_consular_cni_os_residing_in_third_country.govspeak.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_consular_cni_os_residing_in_third_country.govspeak.erb
@@ -20,7 +20,7 @@
<% if calculator.ceremony_country == 'norway' %>
You’ll need to prove that you’re allowed to marry. There are 2 ways you can do this:
- - [go to the UK and post notice with a UK registrar](<%= uk_residence_outcome_path %>)
+ - [go to the UK and post notice with a UK registrar](<%= calculator.outcome_path_when_resident_in_uk %>)
- [go to <%= calculator.country_name_lowercase_prefix %> and swear an affidavit (written statement of facts) that you’re free to marry](<%= ceremony_country_residence_outcome_path %>)
<% else %>
<%= render partial: 'you_will_be_asked_for_cni.govspeak.erb' %>
@@ -28,7 +28,7 @@
<% if calculator.ceremony_country == 'nicaragua' %>
There are 2 ways you can get a CNI:
- - [go to the UK and post notice with a UK registrar](<%= uk_residence_outcome_path %>)
+ - [go to the UK and post notice with a UK registrar](<%= calculator.outcome_path_when_resident_in_uk %>)
- [arrange this through the British Embassy in Costa Rica](<%= ceremony_country_residence_outcome_path %>)
@@ -36,7 +36,7 @@
<% else %>
There are 2 ways you can get a CNI:
- - [go to the UK and post notice with a UK registrar](<%= uk_residence_outcome_path %>)
+ - [go to the UK and post notice with a UK registrar](<%= calculator.outcome_path_when_resident_in_uk %>)
- [go to <%= calculator.country_name_lowercase_prefix %> and post notice at the embassy or consulate there](<%= ceremony_country_residence_outcome_path %>)
<% if calculator.ceremony_country == 'greece' %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_kuwait.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_kuwait.govspeak.erb
index 359be9f03ad..fb3753fb35e 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_kuwait.govspeak.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_kuwait.govspeak.erb
@@ -87,7 +87,7 @@
There are 2 ways you can get a CNI:
- - [go to the UK and post notice with a UK registrar](<%= uk_residence_outcome_path %>)
+ - [go to the UK and post notice with a UK registrar](<%= calculator.outcome_path_when_resident_in_uk %>)
- [go to <%= calculator.country_name_lowercase_prefix %> and post notice at the embassy or consulate there](<%= ceremony_country_residence_outcome_path %>)
<%= render partial: 'you_will_have_to_wait_to_get_married.govspeak.erb',
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_spain.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_spain.govspeak.erb
index 109c390a831..0d53a2f0ccc 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_spain.govspeak.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_spain.govspeak.erb
@@ -42,7 +42,7 @@
There are 2 ways you can get these certificates:
- - [go to the UK and post notice with a UK registrar](<%= uk_residence_outcome_path %>)
+ - [go to the UK and post notice with a UK registrar](<%= calculator.outcome_path_when_resident_in_uk %>)
- [go to <%= calculator.country_name_lowercase_prefix %> and post notice at the embassy or consulate there](<%= ceremony_country_residence_outcome_path %>)
You need to apply for all certificates at least 3 months before the date you intend to get married.
From 11302545fc9180c8cc050f8dcb64ae071e94077a Mon Sep 17 00:00:00 2001
From: Chris Roos <chris@seagul.co.uk>
Date: Thu, 17 Mar 2016 20:48:29 +1100
Subject: [PATCH 6/9] Remove uk_residence_outcome_path precalculate block
This is no longer required as I'm using
`MarriageAbroadCalculator#outcome_path_when_resident_in_uk` in the
outcomes.
---
lib/smart_answer_flows/marriage-abroad.rb | 12 ------------
.../smart_answer_flows/marriage_abroad_test.rb | 13 -------------
2 files changed, 25 deletions(-)
diff --git a/lib/smart_answer_flows/marriage-abroad.rb b/lib/smart_answer_flows/marriage-abroad.rb
index a5fb2c519e8..ee676f41024 100644
--- a/lib/smart_answer_flows/marriage-abroad.rb
+++ b/lib/smart_answer_flows/marriage-abroad.rb
@@ -216,10 +216,6 @@ def define
outcome :outcome_os_germany
outcome :outcome_os_kuwait do
- precalculate :uk_residence_outcome_path do
- calculator.outcome_path_when_resident_in_uk
- end
-
precalculate :ceremony_country_residence_outcome_path do
calculator.outcome_path_when_resident_in_ceremony_country
end
@@ -250,10 +246,6 @@ def define
outcome :outcome_monaco
outcome :outcome_spain do
- precalculate :uk_residence_outcome_path do
- calculator.outcome_path_when_resident_in_uk
- end
-
precalculate :ceremony_country_residence_outcome_path do
calculator.outcome_path_when_resident_in_ceremony_country
end
@@ -268,10 +260,6 @@ def define
outcome :outcome_os_italy
outcome :outcome_consular_cni_os_residing_in_third_country do
- precalculate :uk_residence_outcome_path do
- calculator.outcome_path_when_resident_in_uk
- end
-
precalculate :ceremony_country_residence_outcome_path do
calculator.outcome_path_when_resident_in_ceremony_country
end
diff --git a/test/integration/smart_answer_flows/marriage_abroad_test.rb b/test/integration/smart_answer_flows/marriage_abroad_test.rb
index 63f7cbf648c..dcde237823d 100644
--- a/test/integration/smart_answer_flows/marriage_abroad_test.rb
+++ b/test/integration/smart_answer_flows/marriage_abroad_test.rb
@@ -353,7 +353,6 @@ def self.translations
should "go to outcome_consular_cni_os_residing_in_third_country" do
assert_current_node :outcome_consular_cni_os_residing_in_third_country
assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/estonia/ceremony_country/partner_british/opposite_sex"
- assert_state_variable :uk_residence_outcome_path, "/marriage-abroad/y/estonia/uk/partner_british/opposite_sex"
end
end
@@ -407,7 +406,6 @@ def self.translations
should "go to outcome_consular_cni_os_residing_in_third_country" do
assert_current_node :outcome_consular_cni_os_residing_in_third_country
assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/italy/ceremony_country/partner_other/opposite_sex"
- assert_state_variable :uk_residence_outcome_path, "/marriage-abroad/y/italy/uk/partner_other/opposite_sex"
end
end
@@ -519,7 +517,6 @@ def self.translations
should "go to outcome_consular_cni_os_residing_in_third_country" do
assert_current_node :outcome_consular_cni_os_residing_in_third_country
assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/denmark/ceremony_country/partner_british/opposite_sex"
- assert_state_variable :uk_residence_outcome_path, "/marriage-abroad/y/denmark/uk/partner_british/opposite_sex"
end
end
@@ -575,7 +572,6 @@ def self.translations
should "go to outcome_spain with third country OS specific phrases" do
assert_current_node :outcome_spain
assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/spain/ceremony_country/partner_other/opposite_sex"
- assert_state_variable :uk_residence_outcome_path, "/marriage-abroad/y/spain/uk/partner_other/opposite_sex"
end
end
@@ -601,7 +597,6 @@ def self.translations
should "go to outcome_spain with third country SS specific phrases" do
assert_current_node :outcome_spain
assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/spain/ceremony_country/partner_other/same_sex"
- assert_state_variable :uk_residence_outcome_path, "/marriage-abroad/y/spain/uk/partner_other/same_sex"
end
end
end
@@ -643,7 +638,6 @@ def self.translations
should "go to outcome_consular_cni_os_residing_in_third_country" do
assert_current_node :outcome_consular_cni_os_residing_in_third_country
assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/azerbaijan/ceremony_country/partner_local/opposite_sex"
- assert_state_variable :uk_residence_outcome_path, "/marriage-abroad/y/azerbaijan/uk/partner_local/opposite_sex"
end
end
@@ -658,7 +652,6 @@ def self.translations
should "go to outcome_consular_cni_os_residing_in_third_country" do
assert_current_node :outcome_consular_cni_os_residing_in_third_country
assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/poland/ceremony_country/partner_british/opposite_sex"
- assert_state_variable :uk_residence_outcome_path, "/marriage-abroad/y/poland/uk/partner_british/opposite_sex"
end
end
@@ -964,7 +957,6 @@ def self.translations
should "go to outcome_consular_cni_os_residing_in_third_country" do
assert_current_node :outcome_consular_cni_os_residing_in_third_country
assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/macedonia/ceremony_country/partner_other/opposite_sex"
- assert_state_variable :uk_residence_outcome_path, "/marriage-abroad/y/macedonia/uk/partner_other/opposite_sex"
end
end
@@ -1780,7 +1772,6 @@ def self.translations
should "go to outcome_consular_cni_os_residing_in_third_country" do
assert_current_node :outcome_consular_cni_os_residing_in_third_country
assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/kazakhstan/ceremony_country/partner_british/opposite_sex"
- assert_state_variable :uk_residence_outcome_path, "/marriage-abroad/y/kazakhstan/uk/partner_british/opposite_sex"
end
end
@@ -1928,7 +1919,6 @@ def self.translations
add_response 'opposite_sex'
assert_current_node :outcome_consular_cni_os_residing_in_third_country
assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/mexico/ceremony_country/partner_british/opposite_sex"
- assert_state_variable :uk_residence_outcome_path, "/marriage-abroad/y/mexico/uk/partner_british/opposite_sex"
end
should "show outcome_os_consular_cni when partner is local" do
@@ -1957,7 +1947,6 @@ def self.translations
should "lead to outcome_consular_cni_os_residing_in_third_country" do
assert_current_node :outcome_consular_cni_os_residing_in_third_country
assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/albania/ceremony_country/partner_british/opposite_sex"
- assert_state_variable :uk_residence_outcome_path, "/marriage-abroad/y/albania/uk/partner_british/opposite_sex"
end
end
@@ -1972,7 +1961,6 @@ def self.translations
should "lead to outcome_consular_cni_os_residing_in_third_country" do
assert_current_node :outcome_consular_cni_os_residing_in_third_country
assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/democratic-republic-of-congo/ceremony_country/partner_british/opposite_sex"
- assert_state_variable :uk_residence_outcome_path, "/marriage-abroad/y/democratic-republic-of-congo/uk/partner_british/opposite_sex"
end
end
@@ -2105,7 +2093,6 @@ def self.translations
should "leads to outcome_consular_cni_os_residing_in_third_country" do
assert_current_node :outcome_consular_cni_os_residing_in_third_country
assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/greece/ceremony_country/partner_other/opposite_sex"
- assert_state_variable :uk_residence_outcome_path, "/marriage-abroad/y/greece/uk/partner_other/opposite_sex"
end
end
From 430ad5bfea15f38649db51c31b592fa3fd9ce3b4 Mon Sep 17 00:00:00 2001
From: Chris Roos <chris@seagul.co.uk>
Date: Thu, 17 Mar 2016 20:45:57 +1100
Subject: [PATCH 7/9] Use #outcome_path_when_resident_in_ceremony_country in
outcomes
Using this `MarriageAbroadCalculator` method will allow me to remove the
`:ceremony_country_residence_outcome_path` precalculate block.
---
...e_consular_cni_os_residing_in_third_country.govspeak.erb | 6 +++---
.../marriage-abroad/outcomes/outcome_os_kuwait.govspeak.erb | 2 +-
.../marriage-abroad/outcomes/outcome_spain.govspeak.erb | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_consular_cni_os_residing_in_third_country.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_consular_cni_os_residing_in_third_country.govspeak.erb
index 989d3a1d11c..4a9b8ff53e9 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_consular_cni_os_residing_in_third_country.govspeak.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_consular_cni_os_residing_in_third_country.govspeak.erb
@@ -21,7 +21,7 @@
You’ll need to prove that you’re allowed to marry. There are 2 ways you can do this:
- [go to the UK and post notice with a UK registrar](<%= calculator.outcome_path_when_resident_in_uk %>)
- - [go to <%= calculator.country_name_lowercase_prefix %> and swear an affidavit (written statement of facts) that you’re free to marry](<%= ceremony_country_residence_outcome_path %>)
+ - [go to <%= calculator.country_name_lowercase_prefix %> and swear an affidavit (written statement of facts) that you’re free to marry](<%= calculator.outcome_path_when_resident_in_ceremony_country %>)
<% else %>
<%= render partial: 'you_will_be_asked_for_cni.govspeak.erb' %>
@@ -29,7 +29,7 @@
There are 2 ways you can get a CNI:
- [go to the UK and post notice with a UK registrar](<%= calculator.outcome_path_when_resident_in_uk %>)
- - [arrange this through the British Embassy in Costa Rica](<%= ceremony_country_residence_outcome_path %>)
+ - [arrange this through the British Embassy in Costa Rica](<%= calculator.outcome_path_when_resident_in_ceremony_country %>)
%If you choose to post notice in Costa Rica, you’ll normally have to wait at least 10 days before you can get married.%
@@ -37,7 +37,7 @@
There are 2 ways you can get a CNI:
- [go to the UK and post notice with a UK registrar](<%= calculator.outcome_path_when_resident_in_uk %>)
- - [go to <%= calculator.country_name_lowercase_prefix %> and post notice at the embassy or consulate there](<%= ceremony_country_residence_outcome_path %>)
+ - [go to <%= calculator.country_name_lowercase_prefix %> and post notice at the embassy or consulate there](<%= calculator.outcome_path_when_resident_in_ceremony_country %>)
<% if calculator.ceremony_country == 'greece' %>
%If you choose to post notice in <%= calculator.country_name_lowercase_prefix %>, you’ll normally have to wait at least 14 days before you can apply to get married.%
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_kuwait.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_kuwait.govspeak.erb
index fb3753fb35e..2026bb9c053 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_kuwait.govspeak.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_kuwait.govspeak.erb
@@ -88,7 +88,7 @@
There are 2 ways you can get a CNI:
- [go to the UK and post notice with a UK registrar](<%= calculator.outcome_path_when_resident_in_uk %>)
- - [go to <%= calculator.country_name_lowercase_prefix %> and post notice at the embassy or consulate there](<%= ceremony_country_residence_outcome_path %>)
+ - [go to <%= calculator.country_name_lowercase_prefix %> and post notice at the embassy or consulate there](<%= calculator.outcome_path_when_resident_in_ceremony_country %>)
<%= render partial: 'you_will_have_to_wait_to_get_married.govspeak.erb',
locals: { calculator: calculator } %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_spain.govspeak.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_spain.govspeak.erb
index 0d53a2f0ccc..606af454ca8 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_spain.govspeak.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_spain.govspeak.erb
@@ -43,7 +43,7 @@
There are 2 ways you can get these certificates:
- [go to the UK and post notice with a UK registrar](<%= calculator.outcome_path_when_resident_in_uk %>)
- - [go to <%= calculator.country_name_lowercase_prefix %> and post notice at the embassy or consulate there](<%= ceremony_country_residence_outcome_path %>)
+ - [go to <%= calculator.country_name_lowercase_prefix %> and post notice at the embassy or consulate there](<%= calculator.outcome_path_when_resident_in_ceremony_country %>)
You need to apply for all certificates at least 3 months before the date you intend to get married.
From f20300417850a2e040b9832c4e4b0ea53c921029 Mon Sep 17 00:00:00 2001
From: Chris Roos <chris@seagul.co.uk>
Date: Thu, 17 Mar 2016 20:47:22 +1100
Subject: [PATCH 8/9] Remove ceremony_country_residence_outcome_path
precalculate blocks
This is no longer required as I'm using
`MarriageAbroadCalculator#outcome_path_when_resident_in_ceremony_country`
in the outcomes.
---
lib/smart_answer_flows/marriage-abroad.rb | 18 +++---------------
.../smart_answer_flows/marriage_abroad_test.rb | 13 -------------
2 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/lib/smart_answer_flows/marriage-abroad.rb b/lib/smart_answer_flows/marriage-abroad.rb
index ee676f41024..fdcac11ad1e 100644
--- a/lib/smart_answer_flows/marriage-abroad.rb
+++ b/lib/smart_answer_flows/marriage-abroad.rb
@@ -215,11 +215,7 @@ def define
outcome :outcome_os_germany
- outcome :outcome_os_kuwait do
- precalculate :ceremony_country_residence_outcome_path do
- calculator.outcome_path_when_resident_in_ceremony_country
- end
- end
+ outcome :outcome_os_kuwait
outcome :outcome_os_indonesia
@@ -245,11 +241,7 @@ def define
outcome :outcome_monaco
- outcome :outcome_spain do
- precalculate :ceremony_country_residence_outcome_path do
- calculator.outcome_path_when_resident_in_ceremony_country
- end
- end
+ outcome :outcome_spain
outcome :outcome_os_commonwealth
@@ -259,11 +251,7 @@ def define
outcome :outcome_os_italy
- outcome :outcome_consular_cni_os_residing_in_third_country do
- precalculate :ceremony_country_residence_outcome_path do
- calculator.outcome_path_when_resident_in_ceremony_country
- end
- end
+ outcome :outcome_consular_cni_os_residing_in_third_country
outcome :outcome_os_consular_cni do
precalculate :three_day_residency_requirement_applies do
diff --git a/test/integration/smart_answer_flows/marriage_abroad_test.rb b/test/integration/smart_answer_flows/marriage_abroad_test.rb
index dcde237823d..648caf76483 100644
--- a/test/integration/smart_answer_flows/marriage_abroad_test.rb
+++ b/test/integration/smart_answer_flows/marriage_abroad_test.rb
@@ -352,7 +352,6 @@ def self.translations
end
should "go to outcome_consular_cni_os_residing_in_third_country" do
assert_current_node :outcome_consular_cni_os_residing_in_third_country
- assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/estonia/ceremony_country/partner_british/opposite_sex"
end
end
@@ -405,7 +404,6 @@ def self.translations
end
should "go to outcome_consular_cni_os_residing_in_third_country" do
assert_current_node :outcome_consular_cni_os_residing_in_third_country
- assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/italy/ceremony_country/partner_other/opposite_sex"
end
end
@@ -516,7 +514,6 @@ def self.translations
end
should "go to outcome_consular_cni_os_residing_in_third_country" do
assert_current_node :outcome_consular_cni_os_residing_in_third_country
- assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/denmark/ceremony_country/partner_british/opposite_sex"
end
end
@@ -571,7 +568,6 @@ def self.translations
should "go to outcome_spain with third country OS specific phrases" do
assert_current_node :outcome_spain
- assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/spain/ceremony_country/partner_other/opposite_sex"
end
end
@@ -596,7 +592,6 @@ def self.translations
should "go to outcome_spain with third country SS specific phrases" do
assert_current_node :outcome_spain
- assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/spain/ceremony_country/partner_other/same_sex"
end
end
end
@@ -637,7 +632,6 @@ def self.translations
end
should "go to outcome_consular_cni_os_residing_in_third_country" do
assert_current_node :outcome_consular_cni_os_residing_in_third_country
- assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/azerbaijan/ceremony_country/partner_local/opposite_sex"
end
end
@@ -651,7 +645,6 @@ def self.translations
end
should "go to outcome_consular_cni_os_residing_in_third_country" do
assert_current_node :outcome_consular_cni_os_residing_in_third_country
- assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/poland/ceremony_country/partner_british/opposite_sex"
end
end
@@ -956,7 +949,6 @@ def self.translations
end
should "go to outcome_consular_cni_os_residing_in_third_country" do
assert_current_node :outcome_consular_cni_os_residing_in_third_country
- assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/macedonia/ceremony_country/partner_other/opposite_sex"
end
end
@@ -1771,7 +1763,6 @@ def self.translations
end
should "go to outcome_consular_cni_os_residing_in_third_country" do
assert_current_node :outcome_consular_cni_os_residing_in_third_country
- assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/kazakhstan/ceremony_country/partner_british/opposite_sex"
end
end
@@ -1918,7 +1909,6 @@ def self.translations
add_response 'partner_british'
add_response 'opposite_sex'
assert_current_node :outcome_consular_cni_os_residing_in_third_country
- assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/mexico/ceremony_country/partner_british/opposite_sex"
end
should "show outcome_os_consular_cni when partner is local" do
@@ -1946,7 +1936,6 @@ def self.translations
end
should "lead to outcome_consular_cni_os_residing_in_third_country" do
assert_current_node :outcome_consular_cni_os_residing_in_third_country
- assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/albania/ceremony_country/partner_british/opposite_sex"
end
end
@@ -1960,7 +1949,6 @@ def self.translations
end
should "lead to outcome_consular_cni_os_residing_in_third_country" do
assert_current_node :outcome_consular_cni_os_residing_in_third_country
- assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/democratic-republic-of-congo/ceremony_country/partner_british/opposite_sex"
end
end
@@ -2092,7 +2080,6 @@ def self.translations
should "leads to outcome_consular_cni_os_residing_in_third_country" do
assert_current_node :outcome_consular_cni_os_residing_in_third_country
- assert_state_variable :ceremony_country_residence_outcome_path, "/marriage-abroad/y/greece/ceremony_country/partner_other/opposite_sex"
end
end
From 71df7e3e02579a6c5c0c93b14e9da24b9341e236 Mon Sep 17 00:00:00 2001
From: Chris Roos <chris@seagul.co.uk>
Date: Thu, 17 Mar 2016 21:12:44 +1100
Subject: [PATCH 9/9] Update checksum data for marriage-abroad
The marriage-abroad regression tests are passing.
Updated using:
$ rails r script/generate-checksums-for-smart-answer.rb \
marriage-abroad
---
test/data/marriage-abroad-files.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/test/data/marriage-abroad-files.yml b/test/data/marriage-abroad-files.yml
index ae4ada43d64..a0f55dd0dec 100644
--- a/test/data/marriage-abroad-files.yml
+++ b/test/data/marriage-abroad-files.yml
@@ -1,5 +1,5 @@
---
-lib/smart_answer_flows/marriage-abroad.rb: ed2aff846cd31fbdc8cdad871069f758
+lib/smart_answer_flows/marriage-abroad.rb: 53f3fd0c409d6d5cb3980fbc7ecc3b1f
test/data/marriage-abroad-questions-and-responses.yml: 87f39a00d77fe0566a79e5cddbca765e
test/data/marriage-abroad-responses-and-expected-results.yml: c388fc820b41309bb7594e9ef908a70e
lib/smart_answer_flows/marriage-abroad/marriage_abroad.govspeak.erb: b4d0cfc1c7c4776d968c9b5b6df85027
@@ -89,7 +89,7 @@ lib/smart_answer_flows/marriage-abroad/outcomes/os_affirmation/_contact.govspeak
lib/smart_answer_flows/marriage-abroad/outcomes/os_affirmation/_fees.govspeak.erb: 91a208d92860e994e6f903cbd8a0d90a
lib/smart_answer_flows/marriage-abroad/outcomes/os_affirmation/_what_you_need_to_do.govspeak.erb: f3b26a16b87e458dec9f089f527061a1
lib/smart_answer_flows/marriage-abroad/outcomes/outcome_brazil_not_living_in_the_uk.govspeak.erb: e3fb0ad81caf8965909db65b7e14603f
-lib/smart_answer_flows/marriage-abroad/outcomes/outcome_consular_cni_os_residing_in_third_country.govspeak.erb: 611b13466b903e147bf7c6d4bd9442e2
+lib/smart_answer_flows/marriage-abroad/outcomes/outcome_consular_cni_os_residing_in_third_country.govspeak.erb: 1e7a021cd26dda11e159552200f61920
lib/smart_answer_flows/marriage-abroad/outcomes/outcome_cp_all_other_countries.govspeak.erb: 7e4e34579ba21e10c2a36b0a11241c24
lib/smart_answer_flows/marriage-abroad/outcomes/outcome_cp_commonwealth_countries.govspeak.erb: 19bb1b2a9333666a3cc254bfbc863ee2
lib/smart_answer_flows/marriage-abroad/outcomes/outcome_cp_consular.govspeak.erb: ea8d9a8a82daae843679eff7d942a627
@@ -113,7 +113,7 @@ lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_indonesia.govspeak.er
lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_italy.govspeak.erb: 3ea5afa19033b886f75fdb0b0f0733de
lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_japan.govspeak.erb: 12f014b4ee31161a7f5a63291ec4dbae
lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_kosovo.govspeak.erb: c4885ff578037256da2ac442212ef797
-lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_kuwait.govspeak.erb: 6e146806532d41312428c5441bd28dbc
+lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_kuwait.govspeak.erb: ce1cc1249bd11dc2e8c96ad1db0d6f21
lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_laos.govspeak.erb: 9b46da7e894654d0c83bd6d5a53f8a35
lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_marriage_impossible_no_laos_locals.govspeak.erb: 23fc1e82a139254773a19515d8cb73b7
lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_no_cni.govspeak.erb: 5f136e2925649eb32a8769ada47adb79
@@ -122,7 +122,7 @@ lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_other_countries.govsp
lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_poland.govspeak.erb: 7d0b5e2490e3fd1d8b2657a5881533ad
lib/smart_answer_flows/marriage-abroad/outcomes/outcome_os_slovenia.govspeak.erb: fedf4a19edb9a7677d59b27ad0e491dc
lib/smart_answer_flows/marriage-abroad/outcomes/outcome_portugal.govspeak.erb: 7928e930761d5d6d2f32491194004c15
-lib/smart_answer_flows/marriage-abroad/outcomes/outcome_spain.govspeak.erb: fee5ed8d96ede70c1dd3a97b4cfc8362
+lib/smart_answer_flows/marriage-abroad/outcomes/outcome_spain.govspeak.erb: 0695f1ee4b15779de0023eadd377f8e8
lib/smart_answer_flows/marriage-abroad/outcomes/outcome_ss_affirmation.govspeak.erb: cb480b319be828564ae5577ff5558034
lib/smart_answer_flows/marriage-abroad/outcomes/outcome_ss_marriage.govspeak.erb: d35500623beb6fd1efc1ecbf9ff92eb9
lib/smart_answer_flows/marriage-abroad/outcomes/outcome_ss_marriage_malta.govspeak.erb: 198f2cf34a2c9e2f91466fcbb6ceb15d
@@ -133,7 +133,7 @@ lib/smart_answer_flows/marriage-abroad/questions/legal_residency.govspeak.erb: 7
lib/smart_answer_flows/marriage-abroad/questions/marriage_or_pacs.govspeak.erb: a51aecfac697188f90ca9efefcb2e0ea
lib/smart_answer_flows/marriage-abroad/questions/partner_opposite_or_same_sex.govspeak.erb: 40d0c99a5be50f0625c6562f06fe4afd
lib/smart_answer_flows/marriage-abroad/questions/what_is_your_partners_nationality.govspeak.erb: 80e04f36c75c232bede1a244d621471e
-lib/smart_answer/calculators/marriage_abroad_calculator.rb: 1805a4e2e55cbd297c4eea99aaa435e8
+lib/smart_answer/calculators/marriage_abroad_calculator.rb: 96c48c4f5edd8bec13854adf2fdcd974
lib/smart_answer_flows/shared/_overseas_passports_embassies.govspeak.erb: 2f521bae99c2f48b49d07bcb283a8063
lib/smart_answer/calculators/marriage_abroad_data_query.rb: 80043ce123ab86befc4def86361abb81
lib/smart_answer/calculators/country_name_formatter.rb: 69a0726640385f42de50b80fdb144ff8