Fix ui tests

Author: jamiefalcus

features/questionnaire.feature

@@ -76,13 +76,6 @@ Feature: Questionnaire
     When I check "Cigarettes"
     And I submit the form
 
-    Then I am on "/cigarettes-smoking-current"
-    When I check "Yes" and submit
-
-    Then I am on "/cigarettes-smoked-total-years"
-    When I fill in "Roughly how many years have you smoked cigarettes?" with "10"
-    And I submit the form
-
     Then I am on "/cigarettes-smoking-frequency"
     When I check "Daily" and submit
 
@@ -113,7 +106,7 @@ Feature: Questionnaire
     And I see "18" as a response to "Age you started smoking" under "Smoking history"
     And I see "Yes (10 years)" as a response to "Have you ever stopped smoking for periods of 1 year or longer?" under "Smoking history"
 
-    And I see "10" as a response to "Total number of years you smoked cigarettes" under "Smoking history"
+    And I see "37" as a response to "Total number of years you smoked cigarettes" under "Smoking history"
     And I see "15 cigarettes a day" as a response to "Current cigarette smoking" under "Smoking history"
 
     When I click "Submit"

features/smoked_total_years.feature

@@ -14,7 +14,7 @@ Feature: Smoked total years page
     Given I am logged in
     And I have answered questions showing I am eligible
     And I have answered questions showing I have smoked for "10" years
-    And I have answered questions showing I have smoked "Cigarettes"
+    And I have answered questions showing I have smoked "Cigarettes, Pipe"
     And I have answered questions showing I currently smoke "Cigarettes"
     When I go to "/cigarettes-smoked-total-years"
     And I click "Continue"

features/smoking_current.feature

@@ -11,7 +11,7 @@ Feature: Smoking current page
   Scenario: Form errors
     Given I am logged in
     And I have answered questions showing I am eligible
-    And I have answered questions showing I have smoked "Cigarettes"
+    And I have answered questions showing I have smoked "Cigarettes, Pipe"
     When I go to "/cigarettes-smoking-current"
     And I click "Continue"
     Then I am on "/cigarettes-smoking-current"

features/smoking_frequency.feature

@@ -25,9 +25,8 @@ Feature: Smoking frequency page
     And I have answered questions showing I am eligible
     And I have answered questions showing I have smoked for "10" years
     And I have answered questions showing I currently smoke "Cigarettes"
-    And I have answered questions showing I have smoked "Cigarettes"
     When I go to "/cigarettes-smoking-frequency"
-    Then I see a back link to "/cigarettes-smoked-total-years"
+    Then I see a back link to "/types-tobacco-smoking"
     When I check "Daily" and submit
     Then I am on "/cigarettes-smoked-amount"
 

features/smoking_history.feature

@@ -6,15 +6,6 @@ Feature: Smoking history pages
     And I have answered questions showing I have smoked for "30" years
     When I go to "/types-tobacco-smoking"
     And I check "Cigarettes"
-    And I check "Cigarettes"
-    And I submit the form
-
-    Then I am on "/cigarettes-smoking-current"
-    When I check "Yes"
-    And I submit the form
-
-    Then I am on "/cigarettes-smoked-total-years"
-    When I fill in "Roughly how many years have you smoked cigarettes?" with "15"
     And I submit the form
 
     Then I am on "/cigarettes-smoking-frequency"
@@ -55,7 +46,7 @@ Feature: Smoking history pages
     And I submit the form
 
     Then I am on "/check-your-answers"
-    Then I see "15 years" as a response to "Total number of years you smoked cigarettes" under "Cigarette smoking history"
+    Then I see "30 years" as a response to "Total number of years you smoked cigarettes" under "Cigarette smoking history"
     And I see "10 cigarettes a day" as a response to "Current cigarette smoking" under "Cigarette smoking history"
     And I see "200 cigarettes a week for 5 years" as a response to "When you smoked more than 10 cigarettes a day" under "Cigarette smoking history"
     And I see "1 cigarettes a month for 2 years" as a response to "When you smoked fewer than 10 cigarettes a day" under "Cigarette smoking history"

features/types_tobacco_smoking.feature

@@ -26,7 +26,7 @@ Feature: Types tobacco smoking page
     Then I see a back link to "/periods-when-you-stopped-smoking"
     When I check "Cigarettes"
     And I submit the form
-    Then I am on "/cigarettes-smoking-current"
+    Then I am on "/cigarettes-smoking-frequency"
 
   Scenario: Checking responses and changing them
     Given I am logged in