Update minimum wage calculator variable holding first response to be more communicative about its purpose.

Author: erkde

lib/smart_answer/calculators/minimum_wage_calculator.rb

@@ -4,14 +4,14 @@ class MinimumWageCalculator
     attr_accessor :age, :pay_frequency, :basic_hours, :basic_pay, :is_apprentice,
       :overtime_hours, :overtime_hourly_rate, :accommodation_cost
 
-    attr_reader :check, :date
+    attr_reader :date, :what_to_check
 
     def initialize(params = {})
       @age = params[:age]
       @date = (params[:date].nil? ? Date.today : params[:date])
       @basic_hours = params[:basic_hours].to_f
       @basic_pay = params[:basic_pay].to_f
-      @check = params[:check]
+      @what_to_check = params[:what_to_check]
       @is_apprentice = params[:is_apprentice]
       @pay_frequency = params[:pay_frequency] || 7
       @overtime_hours = params[:overtime_hours].to_i || 0

lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_above.govspeak.erb

@@ -1,6 +1,6 @@
 <% content_for :body do %>
   $C
-  <% if calculator.check == 'current_payment_april_2016' && calculator.eligible_for_living_wage? %>
+  <% if calculator.what_to_check == 'current_payment_april_2016' && calculator.eligible_for_living_wage? %>
     <% if calculator.living_wage_or_above? %>
       You will be getting the national living wage
     <% else %>
@@ -11,13 +11,13 @@
   <% end %>
   $C
 
-  <% if calculator.check == 'current_payment_april_2016' && calculator.eligible_for_living_wage? %>
+  <% if calculator.what_to_check == 'current_payment_april_2016' && calculator.eligible_for_living_wage? %>
     The national living wage per hour for your age will be | Your actual pay
   <% else %>
     The National Minimum Wage per hour for your age | Your actual pay
   <% end %>
     - | -
-  <% if calculator.check == 'current_payment_april_2016' && calculator.eligible_for_living_wage? %>
+  <% if calculator.what_to_check == 'current_payment_april_2016' && calculator.eligible_for_living_wage? %>
     <%= format_money(calculator.national_living_wage_rate) %> | <%= format_money(calculator.total_hourly_rate) %>
   <% else %>
     <%= format_money(calculator.minimum_hourly_rate) %> | <%= format_money(calculator.total_hourly_rate) %>

lib/smart_answer_flows/shared_logic/minimum_wage.rb

@@ -5,7 +5,7 @@
   option "current_payment_april_2016" if self.flow_name == 'am-i-getting-minimum-wage'
 
   calculate :calculator do |response|
-    Calculators::MinimumWageCalculator.new(check: response)
+    Calculators::MinimumWageCalculator.new(what_to_check: response)
   end
 
   permitted_next_nodes = [
@@ -96,7 +96,7 @@
 # Q3
 value_question :how_old_are_you?, parse: Integer do
   precalculate :age_title do
-    if calculator.check == 'current_payment_april_2016'
+    if calculator.what_to_check == 'current_payment_april_2016'
       PhraseList.new(:how_old_are_you_april_2016)
     else
       PhraseList.new(:how_old_are_you)

test/data/am-i-getting-minimum-wage-files.yml

@@ -4,14 +4,14 @@ lib/smart_answer_flows/locales/en/am-i-getting-minimum-wage.yml: ae4dcf74d09e349
 test/data/am-i-getting-minimum-wage-questions-and-responses.yml: 9448744e58e3e268ba6911a58c3a1e6e
 test/data/am-i-getting-minimum-wage-responses-and-expected-results.yml: fc0c41b148a393cf887ba11754a361ec
 lib/smart_answer_flows/am-i-getting-minimum-wage/am_i_getting_minimum_wage.govspeak.erb: e3bad2e005bb806999594e9f87f5e5ae
-lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_above.govspeak.erb: 6974ca63f1a321313c1719c289049edf
+lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_above.govspeak.erb: 9b82c9fc163ecff3b9d55e6352afbddd
 lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_below.govspeak.erb: c5df501d4653304260fb0a95111ff111
 lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/does_not_apply_to_historical_apprentices.govspeak.erb: bd846fa5585f32e995c74bb714f6d600
 lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/past_payment_above.govspeak.erb: 83b499f49b224ef3faf022f3f5df0ac1
 lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/past_payment_below.govspeak.erb: b53b6378246a28ae3b8706d54d09bd75
 lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/under_school_leaving_age.govspeak.erb: 44bf68757d1ef90249d19f5d88ad4bc2
 lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/under_school_leaving_age_past.govspeak.erb: 2182c103915b753894722760c9a56cf3
 lib/smart_answer_flows/shared/minimum_wage/_acas_information.govspeak.erb: 0d2f7c4d01e3c928701e7d649663707e
-lib/smart_answer_flows/shared_logic/minimum_wage.rb: eb55e4750f2d2d852c2a1a5007c62289
-lib/smart_answer/calculators/minimum_wage_calculator.rb: 5a10cc40f2abe6e303adfd47893d6ac0
+lib/smart_answer_flows/shared_logic/minimum_wage.rb: 92717bc9411a427bc422e9b528e0db36
+lib/smart_answer/calculators/minimum_wage_calculator.rb: f1091e755f1889d259dc511607cf59bc
 lib/data/minimum_wage_data.yml: 3feed11191d68237289203a2c659ecf9

test/data/minimum-wage-calculator-employers-files.yml

@@ -12,6 +12,6 @@ lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/past_payment_b
 lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/under_school_leaving_age.govspeak.erb: 13de5d10bbbb015df597f78c66da1b67
 lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/under_school_leaving_age_past.govspeak.erb: 9c56f76e04984f07627efbc1f42b2b63
 lib/smart_answer_flows/shared/minimum_wage/_acas_information.govspeak.erb: 0d2f7c4d01e3c928701e7d649663707e
-lib/smart_answer_flows/shared_logic/minimum_wage.rb: eb55e4750f2d2d852c2a1a5007c62289
-lib/smart_answer/calculators/minimum_wage_calculator.rb: 5a10cc40f2abe6e303adfd47893d6ac0
+lib/smart_answer_flows/shared_logic/minimum_wage.rb: 92717bc9411a427bc422e9b528e0db36
+lib/smart_answer/calculators/minimum_wage_calculator.rb: f1091e755f1889d259dc511607cf59bc
 lib/data/minimum_wage_data.yml: 3feed11191d68237289203a2c659ecf9