Remove and deprecate section_slug within flows

alext · alext · commit 8bee67ea43dc · 2012-09-17T15:22:39.000Z
Left methods with deprecation warning to avoid blowing up with any
unmerged answers.
diff --git a/lib/flows/additional-commodity-code.rb b/lib/flows/additional-commodity-code.rb
@@ -1,5 +1,4 @@
 status :draft
-section_slug "money-and-tax"
 satisfies_need "2013"
 
 # Q1
diff --git a/lib/flows/am-i-getting-minimum-wage.rb b/lib/flows/am-i-getting-minimum-wage.rb
@@ -1,6 +1,4 @@
 status :draft
-section_slug "money-and-tax"
-subsection_slug "tax"
 satisfies_need "2013"
 
 # Q1
diff --git a/lib/flows/appeal-a-benefits-decision.rb b/lib/flows/appeal-a-benefits-decision.rb
@@ -1,6 +1,5 @@
 satisfies_need "845"
 status :draft
-section_slug "money-and-tax"
 
 decision_appeal_limit_in_months = 13
 
diff --git a/lib/flows/auto-enrolled-into-workplace-pension.rb b/lib/flows/auto-enrolled-into-workplace-pension.rb
@@ -1,6 +1,4 @@
 status :draft
-section_slug "money-and-tax"
-subsection_slug "pension"
 satisfies_need "2483"
 
 multiple_choice :work_in_uk? do
@@ -58,4 +56,4 @@
 outcome :enrolled_overseas
 outcome :enrolled_contract
 outcome :not_enrolled_office
-outcome :enrolled
+outcome :enrolled
diff --git a/lib/flows/become-a-driving-instructor.rb b/lib/flows/become-a-driving-instructor.rb
@@ -1,7 +1,5 @@
 satisfies_need "B188"
 status :published
-section_slug "driving"
-subsection_slug "driving-instructors"
 
 multiple_choice :are_you_21_or_over? do
   option :yes => :have_you_had_licence_for_3_years?
diff --git a/lib/flows/become-a-motorcycle-instructor.rb b/lib/flows/become-a-motorcycle-instructor.rb
@@ -1,6 +1,5 @@
 satisfies_need "999999"
 status :draft
-section_slug "driving"
 
 multiple_choice :qualified_motorcycle_instructor? do
   option :no => :over_21?
@@ -30,4 +29,4 @@
 outcome :too_young
 outcome :need_licence
 outcome :application_instructions
-outcome :need_longer_licence
+outcome :need_longer_licence
diff --git a/lib/flows/benefits-if-you-are-abroad.rb b/lib/flows/benefits-if-you-are-abroad.rb
@@ -1,6 +1,5 @@
 satisfies_need "392"
 status :draft
-section_slug "money-and-tax"
 
 # Q1
 multiple_choice :have_you_told_jobcentre_plus do
diff --git a/lib/flows/calculate-agricultural-holiday-entitlement.rb b/lib/flows/calculate-agricultural-holiday-entitlement.rb
@@ -1,5 +1,4 @@
 status :draft
-section_slug "work"
 
 calculator = AgriculturalHolidayEntitlementCalculator.new()
 
diff --git a/lib/flows/calculate-child-maintenance-draft.rb b/lib/flows/calculate-child-maintenance-draft.rb
@@ -1,5 +1,4 @@
 status :draft
-section_slug "money-and-tax"
 
 ## Q1
 value_question :how_many_children_paid_for? do
diff --git a/lib/flows/calculate-employee-redundancy-pay.rb b/lib/flows/calculate-employee-redundancy-pay.rb
@@ -1,6 +1,4 @@
 status :published
-section_slug "business"
-subsection_slug "employing-people"
 satisfies_need "1761"
 
 use_shared_logic "redundancy_pay"
diff --git a/lib/flows/calculate-married-couples-allowance.rb b/lib/flows/calculate-married-couples-allowance.rb
@@ -1,7 +1,4 @@
 status :published
-
-section_slug "money-and-tax"
-subsection_slug "tax"
 satisfies_need 2012
 
 multiple_choice :were_you_or_your_partner_born_on_or_before_6_april_1935? do
diff --git a/lib/flows/calculate-night-work-hours.rb b/lib/flows/calculate-night-work-hours.rb
@@ -1,5 +1,4 @@
 status :draft
-section_slug "work"
 
 multiple_choice :how_old? do
   option '18-or-over' => :exception_to_limits?
@@ -144,4 +143,4 @@
 outcome :not_a_night_worker
 outcome :limit_exceeded
 outcome :within_legal_limit
-outcome :outside_legal_limit
+outcome :outside_legal_limit
diff --git a/lib/flows/calculate-state-pension.rb b/lib/flows/calculate-state-pension.rb
@@ -1,6 +1,4 @@
 status :draft
-section_slug "money-and-tax"
-subsection_slug "pension"
 satisfies_need "564"
 
 multiple_choice :which_calculation? do
diff --git a/lib/flows/calculate-statutory-sick-pay.rb b/lib/flows/calculate-statutory-sick-pay.rb
@@ -1,5 +1,4 @@
 status :draft
-section_slug "money-and-tax"
 satisfies_need "2013"
 
 ## Q1
diff --git a/lib/flows/calculate-your-holiday-entitlement.rb b/lib/flows/calculate-your-holiday-entitlement.rb
@@ -1,6 +1,5 @@
 status :published
 satisfies_need 355
-section_slug "work"
 
 multiple_choice :what_is_your_employment_status? do
   option "full-time" => :full_time_how_long_employed?
diff --git a/lib/flows/calculate-your-redundancy-pay.rb b/lib/flows/calculate-your-redundancy-pay.rb
@@ -1,6 +1,4 @@
 status :published
-section_slug "work"
-subsection_slug "ending-work"
 satisfies_need "1761"
 
 use_shared_logic "redundancy_pay"
diff --git a/lib/flows/can-i-get-a-british-passport.rb b/lib/flows/can-i-get-a-british-passport.rb
@@ -1,6 +1,4 @@
 status :draft
-section_slug "travel"
-subsection_slug "passports"
 
 multiple_choice :do_you_have? do
   option :british_citizenship => :is_one_of_these_true?
diff --git a/lib/flows/child-benefit-tax-calculator.rb b/lib/flows/child-benefit-tax-calculator.rb
@@ -1,5 +1,4 @@
 status :draft
-section_slug "money-and-tax"
 
 # Question 1
 multiple_choice :which_tax_year? do
diff --git a/lib/flows/childcare-costs-for-tax-credits.rb b/lib/flows/childcare-costs-for-tax-credits.rb
@@ -1,7 +1,5 @@
 satisfies_need "9999"
 status :draft
-section_slug "money-and-tax"
-subsection_slug "tax"
 
 # Questions
 #
diff --git a/lib/flows/claim-a-national-insurance-refund.rb b/lib/flows/claim-a-national-insurance-refund.rb
@@ -1,6 +1,4 @@
 satisfies_need "B148"
-status :published
-section_slug "money-and-tax"
 
 multiple_choice :which_class? do
   save_input_as :ni_class
@@ -48,4 +46,4 @@
 outcome :outcome_3
 outcome :outcome_4
 outcome :outcome_5
-outcome :outcome_6
+outcome :outcome_6
diff --git a/lib/flows/driving-in-the-uk-on-a-foreign-licence.rb b/lib/flows/driving-in-the-uk-on-a-foreign-licence.rb
@@ -1,5 +1,4 @@
 satisfies_need 9999
-section_slug "driving"
 status :draft
 
 multiple_choice :are_you? do
@@ -84,4 +83,4 @@
 outcome :a11
 outcome :a12
 outcome :a13
-outcome :a14
+outcome :a14
diff --git a/lib/flows/estimate-self-assessment-penalties.rb b/lib/flows/estimate-self-assessment-penalties.rb
@@ -1,6 +1,5 @@
 status :draft
 satisfies_need "B692"
-section_slug "money-and-tax"
 
 calculator_dates = {
   :online_filing_deadline => {
diff --git a/lib/flows/exchange-a-foreign-driving-licence.rb b/lib/flows/exchange-a-foreign-driving-licence.rb
@@ -1,5 +1,4 @@
 satisfies_need 9999
-section_slug "driving"
 status :draft
 
 multiple_choice :are_you_resident_in_gb? do
diff --git a/lib/flows/inherits-someone-dies-without-will.rb b/lib/flows/inherits-someone-dies-without-will.rb
@@ -1,6 +1,4 @@
 satisfies_need 2006
-section_slug "family"
-subsection_slug "death-and-bereavement"
 status :published
 
 
diff --git a/lib/flows/legal-right-to-work-in-the-uk.rb b/lib/flows/legal-right-to-work-in-the-uk.rb
@@ -1,6 +1,4 @@
 satisfies_need "B91"
-section_slug "business"
-subsection_slug "employing-people"
 status :published
 
 multiple_choice :have_uk_passport? do
diff --git a/lib/flows/maternity-benefits.rb b/lib/flows/maternity-benefits.rb
@@ -1,6 +1,4 @@
 satisfies_need 1660
-section_slug "family"
-subsection_slug "maternity-and-paternity"
 status :published
 
 date_question :when_is_your_baby_due? do
diff --git a/lib/flows/maternity-paternity-calculator.rb b/lib/flows/maternity-paternity-calculator.rb
@@ -1,6 +1,4 @@
 status :draft
-section_slug "money-and-tax"
-subsection_slug "tax"
 satisfies_need "2013"
 
 ## Q1
diff --git a/lib/flows/recognise-a-trade-union.rb b/lib/flows/recognise-a-trade-union.rb
@@ -1,5 +1,4 @@
 satisfies_need "B193"
-section_slug "work"
 status :draft
 
 # Q1
diff --git a/lib/flows/register-a-death.rb b/lib/flows/register-a-death.rb
@@ -1,6 +1,5 @@
 satisfies_need "2189"
 status :draft
-section_slug "family"
 
 
 multiple_choice :where_did_the_death_happen? do
diff --git a/lib/flows/report-a-lost-or-stolen-passport.rb b/lib/flows/report-a-lost-or-stolen-passport.rb
@@ -1,5 +1,4 @@
 status :draft
-section_slug "travel"
 
 multiple_choice :has_your_passport_been_lost_or_stolen? do
   option :lost
diff --git a/lib/flows/request-for-flexible-working.rb b/lib/flows/request-for-flexible-working.rb
@@ -1,5 +1,4 @@
 status :draft
-section_slug "work"
 satisfies_need "9999"
 
 ## Q1
@@ -73,4 +72,4 @@
 ## A1
 outcome :no_right_to_apply
 ## A2
-outcome :right_to_apply
+outcome :right_to_apply
diff --git a/lib/flows/student-finance-calculator.rb b/lib/flows/student-finance-calculator.rb
@@ -1,6 +1,4 @@
 satisfies_need 2175
-section_slug "education"
-subsection_slug "student-money"
 status :published
 
 multiple_choice :are_you_a_full_time_or_part_time_student? do
diff --git a/lib/flows/towing-rules.rb b/lib/flows/towing-rules.rb
@@ -1,6 +1,4 @@
 satisfies_need 9999
-section_slug "family"
-subsection_slug "driving"
 status :draft
 
 ## Cars and light vehicles
diff --git a/lib/flows/vehicles-you-can-drive.rb b/lib/flows/vehicles-you-can-drive.rb
@@ -1,5 +1,4 @@
 satisfies_need 1625
-section_slug ""
 status :draft
 
 ## Q1
diff --git a/lib/smart_answer/flow.rb b/lib/smart_answer/flow.rb
@@ -38,13 +38,13 @@ def status(s=nil)
     end
 
     def section_slug(s=nil)
-      @section_slug = s if s
-      @section_slug
+      ActiveSupport::Deprecation.warn("Sections are no longer handled within smartanswers.", caller(1))
+      nil
     end
 
     def subsection_slug(s=nil)
-      @subsection_slug = s if s
-      @subsection_slug
+      ActiveSupport::Deprecation.warn("Sections are no longer handled within smartanswers.", caller(1))
+      nil
     end
 
     def multiple_choice(name, options = {}, &block)
diff --git a/test/fixtures/flow_registraion_presenter_sample/flow-sample.rb b/test/fixtures/flow_registraion_presenter_sample/flow-sample.rb
@@ -1,4 +1,3 @@
-section_slug "sample"
 satisfies_need 4242
 
 multiple_choice :hotter_or_colder? do
diff --git a/test/fixtures/flow_registraion_presenter_sample/flow_sample.yml b/test/fixtures/flow_registraion_presenter_sample/flow_sample.yml
@@ -5,8 +5,6 @@ en-GB:
         description: FLOW_DESCRIPTION
       title:
         FLOW_TITLE
-      section:
-        SECTION
       body: |
         FLOW_BODY
       hotter_or_colder?:
diff --git a/test/fixtures/flow_registraion_presenter_sample/flow_sample_interpolation.yml b/test/fixtures/flow_registraion_presenter_sample/flow_sample_interpolation.yml
@@ -5,8 +5,6 @@ en-GB:
         description: FLOW_DESCRIPTION
       title:
         FLOW_TITLE
-      section:
-        SECTION
       body: |
         FLOW_BODY
       hotter_or_colder?:
diff --git a/test/fixtures/flow_sample.rb b/test/fixtures/flow_sample.rb
@@ -1,4 +1,3 @@
-section_slug "sample"
 
 multiple_choice :hotter_or_colder? do
   option :hotter => :hot
diff --git a/test/fixtures/smart_answers_controller_test/section_name.yml b/test/fixtures/smart_answers_controller_test/section_name.yml
diff --git a/test/functional/smart_answers_controller_test.rb b/test/functional/smart_answers_controller_test.rb
@@ -14,7 +14,6 @@ def setup
       name :sample
 
       satisfies_need 1337
-      section_slug "family"
 
       multiple_choice :do_you_like_chocolate? do
         option :yes => :you_have_a_sweet_tooth
diff --git a/test/unit/flow_test.rb b/test/unit/flow_test.rb
@@ -125,14 +125,6 @@ class FlowTest < ActiveSupport::TestCase
     assert s.draft?
   end
 
-  test "should have a section slug" do
-    s = SmartAnswer::Flow.new do
-      section_slug "family"
-    end
-
-    assert_equal "family", s.section_slug
-  end
-
   test "should have a status" do
     s = SmartAnswer::Flow.new do
       status :published

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`status :draft`
`2`		`-section_slug "money-and-tax"`
`3`	`2`	`satisfies_need "2013"`
`4`	`3`
`5`	`4`	`# Q1`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`status :draft`
`2`		`-section_slug "work"`
`3`	`2`
`4`	`3`	`calculator = AgriculturalHolidayEntitlementCalculator.new()`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`satisfies_need "9999"`
`2`	`2`	`status :draft`
`3`		`-section_slug "money-and-tax"`
`4`		`-subsection_slug "tax"`
`5`	`3`
`6`	`4`	`# Questions`
`7`	`5`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`satisfies_need 9999`
`2`		`-section_slug "driving"`
`3`	`2`	`status :draft`
`4`	`3`
`5`	`4`	`multiple_choice :are_you_resident_in_gb? do`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`satisfies_need "B193"`
`2`		`-section_slug "work"`
`3`	`2`	`status :draft`
`4`	`3`
`5`	`4`	`# Q1`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`status :draft`
`2`		`-section_slug "travel"`
`3`	`2`
`4`	`3`	`multiple_choice :has_your_passport_been_lost_or_stolen? do`
`5`	`4`	`option :lost`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`satisfies_need 1625`
`2`		`-section_slug ""`
`3`	`2`	`status :draft`
`4`	`3`
`5`	`4`	`## Q1`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-section_slug "sample"`
`2`	`1`	`satisfies_need 4242`
`3`	`2`
`4`	`3`	`multiple_choice :hotter_or_colder? do`