Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 ruby '2.3.0'
 
-gem 'rails', '4.2.5.2'
+gem 'rails', '4.2.6'
 
 gem 'airbrake', '4.1.0'
 gem 'ast'

Gemfile.lock

@@ -2,36 +2,36 @@ GEM
   remote: https://rubygems.org/
   specs:
     PriorityQueue (0.1.2)
-    actionmailer (4.2.5.2)
-      actionpack (= 4.2.5.2)
-      actionview (= 4.2.5.2)
-      activejob (= 4.2.5.2)
+    actionmailer (4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5.2)
-      actionview (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    actionpack (4.2.6)
+      actionview (= 4.2.6)
+      activesupport (= 4.2.6)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    actionview (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activejob (4.2.6)
+      activesupport (= 4.2.6)
       globalid (>= 0.3.0)
-    activemodel (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
-    activerecord (4.2.5.2)
-      activemodel (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
       arel (~> 6.0)
-    activesupport (4.2.5.2)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -143,16 +143,16 @@ GEM
     rack-test (0.6.3)
       rack (>= 1.0)
     rack_strip_client_ip (0.0.1)
-    rails (4.2.5.2)
-      actionmailer (= 4.2.5.2)
-      actionpack (= 4.2.5.2)
-      actionview (= 4.2.5.2)
-      activejob (= 4.2.5.2)
-      activemodel (= 4.2.5.2)
-      activerecord (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    rails (4.2.6)
+      actionmailer (= 4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      activemodel (= 4.2.6)
+      activerecord (= 4.2.6)
+      activesupport (= 4.2.6)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5.2)
+      railties (= 4.2.6)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -165,9 +165,9 @@ GEM
     rails-i18n (4.0.4)
       i18n (~> 0.6)
       railties (~> 4.0)
-    railties (4.2.5.2)
-      actionpack (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    railties (4.2.6)
+      actionpack (= 4.2.6)
+      activesupport (= 4.2.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)
@@ -223,7 +223,7 @@ GEM
     sprockets (3.5.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.3)
+    sprockets-rails (3.0.4)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -282,7 +282,7 @@ DEPENDENCIES
   poltergeist (= 1.6.0)
   pry
   rack_strip_client_ip (= 0.0.1)
-  rails (= 4.2.5.2)
+  rails (= 4.2.6)
   rails-i18n
   sass-rails (~> 5.0.0)
   shoulda (~> 3.5.0)

lib/smart_answer_flows/check-uk-visa.rb

@@ -163,7 +163,6 @@ def define
           :outcome_transit_taiwan,
           :outcome_transit_taiwan_through_border_control,
           :outcome_transit_venezuela,
-          :outcome_visit_waiver
         ]
         next_node(permitted: permitted_next_nodes) do |response|
           calculator.passing_through_uk_border_control_answer = response

lib/smart_answer_flows/overseas-passports/outcomes/_making_your_application.govspeak.erb

@@ -1,3 +1,4 @@
+<% book_appointment_online_countries = %w(kyrgyzstan tajikistan turkmenistan uzbekistan) %>
 <% uk_visa_application_centre_countries = %w(afghanistan algeria azerbaijan bangladesh belarus burundi burma cambodia china gaza georgia india indonesia kazakhstan kyrgyzstan laos lebanon mauritania morocco nepal pakistan russia tajikistan thailand turkmenistan ukraine uzbekistan western-sahara vietnam venezuela) %>
 <% uk_visa_application_with_colour_pictures = %w(afghanistan azerbaijan algeria bangladesh belarus burma cambodia china georgia india indonesia kazakhstan laos lebanon mauritania morocco nepal pakistan tajikistan thailand turkmenistan ukraine uzbekistan russia vietnam venezuela western-sahara) %>
 <% non_uk_visa_application_with_colour_pictures = %w(burma cuba sudan tajikistan turkmenistan uzbekistan) %>
@@ -52,27 +53,46 @@
         <%= render partial: 'making_your_application/apply_in_person_or_via_proxy.govspeak.erb' %>
         <%= render partial: 'making_your_application/bring_originals_and_colour_copy.govspeak.erb' %>
         <%= render partial: 'making_your_application/bring_passport_and_full_photocopy.govspeak.erb' %>
-        <%= render partial: 'making_your_application/book_appointment_by_email_with_3_dates.govspeak.erb' %>
+        <% unless book_appointment_online_countries.include?(current_location) %>
+          <%= render partial: 'making_your_application/book_appointment_by_email_with_3_dates.govspeak.erb' %>
+        <% end %>
       <% else %>
         ## Making your application
 
         <%= render partial: 'making_your_application/apply_in_person.govspeak.erb' %>
         <%= render partial: 'making_your_application/bring_originals_and_copy.govspeak.erb' %>
         <%= render partial: 'making_your_application/bring_passport_and_full_photocopy.govspeak.erb' %>
-        <%= render partial: 'making_your_application/book_appointment_by_email_with_3_dates.govspeak.erb' %>
+        <% unless book_appointment_online_countries.include?(current_location) %>
+          <%= render partial: 'making_your_application/book_appointment_by_email_with_3_dates.govspeak.erb' %>
+        <% end %>
+      <% end %>
+      <% unless book_appointment_online_countries.include?(current_location) %>
+        <%= render partial: 'making_your_application/send_application_address.govspeak.erb', locals: { current_location: current_location } %>
+      <% else %>
+        <%= render partial: 'making_your_application/book_appointment_online.govspeak.erb', locals: { current_location: current_location } %>
       <% end %>
-      <%= render partial: 'making_your_application/send_application_address.govspeak.erb', locals: { current_location: current_location } %>
     <% else %>
       <% if %w(burundi gaza kyrgyzstan).include?(current_location) %>
-        <%= render partial: 'making_your_application/send_application_non_uk_visa_renew_new_colour.govspeak.erb' %>
+        ## Making your application
+
+        <%= render partial: 'making_your_application/apply_in_person_or_via_proxy.govspeak.erb' %>
+        <%= render partial: 'making_your_application/bring_originals_and_colour_copy.govspeak.erb' %>
+        <%= render partial: 'making_your_application/bring_passport_and_full_photocopy.govspeak.erb' %>
+        <% unless book_appointment_online_countries.include?(current_location) %>
+          <%= render partial: 'making_your_application/book_appointment_by_email_with_3_dates.govspeak.erb' %>
+        <% end %>
       <% else %>
         ## Making your application
 
         <%= render partial: 'making_your_application/apply_in_person.govspeak.erb' %>
         <%= render partial: 'making_your_application/bring_originals_and_copy.govspeak.erb' %>
         <%= render partial: 'making_your_application/bring_passport_and_full_photocopy.govspeak.erb' %>
       <% end %>
-      <%= render partial: 'shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %>
+      <% unless book_appointment_online_countries.include?(current_location) %>
+        <%= render partial: 'shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %>
+      <% else %>
+        <%= render partial: 'making_your_application/book_appointment_online.govspeak.erb', locals: { current_location: current_location } %>
+      <% end %>
     <% end %>
   <% else %>
     <% if passport_data['application_office'] %>
@@ -87,30 +107,43 @@
 
         <%= render partial: 'making_your_application/apply_in_person_or_via_proxy.govspeak.erb' %>
         <%= render partial: 'making_your_application/bring_originals_and_colour_copy.govspeak.erb' %>
-        <%= render partial: 'making_your_application/book_appointment_by_email_with_3_dates.govspeak.erb' %>
+        <% unless book_appointment_online_countries.include?(current_location) %>
+          <%= render partial: 'making_your_application/book_appointment_by_email_with_3_dates.govspeak.erb' %>
+        <% end %>
       <% else %>
         ## Making your application
 
         <%= render partial: 'making_your_application/apply_in_person.govspeak.erb' %>
         <%= render partial: 'making_your_application/bring_originals_and_copy.govspeak.erb' %>
-        <%= render partial: 'making_your_application/book_appointment_by_email_with_3_dates.govspeak.erb' %>
+        <% unless book_appointment_online_countries.include?(current_location) %>
+          <%= render partial: 'making_your_application/book_appointment_by_email_with_3_dates.govspeak.erb' %>
+        <% end %>
+      <% end %>
+      <% unless book_appointment_online_countries.include?(current_location) %>
+        <%= render partial: 'making_your_application/send_application_address.govspeak.erb', locals: { current_location: current_location } %>
+      <% else %>
+        <%= render partial: 'making_your_application/book_appointment_online.govspeak.erb', locals: { current_location: current_location } %>
       <% end %>
-      <%= render partial: 'making_your_application/send_application_address.govspeak.erb', locals: { current_location: current_location } %>
     <% else %>
       <% if %w(burundi gaza kyrgyzstan).include?(current_location) %>
         ## Making your application
 
         <%= render partial: 'making_your_application/apply_in_person_or_via_proxy.govspeak.erb' %>
         <%= render partial: 'making_your_application/bring_originals_and_colour_copy.govspeak.erb' %>
-
-        <%= render partial: 'making_your_application/book_appointment_by_email_with_3_dates.govspeak.erb' %>
+        <% unless book_appointment_online_countries.include?(current_location) %>
+          <%= render partial: 'making_your_application/book_appointment_by_email_with_3_dates.govspeak.erb' %>
+        <% end %>
       <% else %>
         ## Making your application
 
         <%= render partial: 'making_your_application/apply_in_person.govspeak.erb' %>
         <%= render partial: 'making_your_application/bring_originals_and_copy.govspeak.erb' %>
       <% end %>
-      <%= render partial: 'shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %>
+      <% unless book_appointment_online_countries.include?(current_location) %>
+        <%= render partial: 'shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %>
+      <% else %>
+        <%= render partial: 'making_your_application/book_appointment_online.govspeak.erb', locals: { current_location: current_location } %>
+      <% end %>
     <% end %>
   <% end %>
 <% elsif %w(timor-leste).include?(current_location) %>
@@ -123,29 +156,54 @@
 
   You need to book an appointment - contact the embassy to arrange one.
 
-  <%= render partial: 'making_your_application/send_application_address.govspeak.erb', locals: { current_location: current_location } %>
+  <% unless book_appointment_online_countries.include?(current_location) %>
+    <%= render partial: 'making_your_application/send_application_address.govspeak.erb', locals: { current_location: current_location } %>
+  <% else %>
+    <%= render partial: 'making_your_application/book_appointment_online.govspeak.erb', locals: { current_location: current_location } %>
+  <% end %>
 <% elsif general_action == 'renewing' and data_query.renewing_countries?(current_location) %>
   <% if passport_data['application_office'] %>
-    <%= render partial: 'making_your_application/send_application_address.govspeak.erb', locals: { current_location: current_location } %>
+    <% unless book_appointment_online_countries.include?(current_location) %>
+      <%= render partial: 'making_your_application/send_application_address.govspeak.erb', locals: { current_location: current_location } %>
+    <% else %>
+      <%= render partial: 'making_your_application/book_appointment_online.govspeak.erb', locals: { current_location: current_location } %>
+    <% end %>
   <% else %>
     <% if non_uk_visa_application_with_colour_pictures.include?(current_location) %>
-      <%= render partial: 'making_your_application/send_application_non_uk_visa_renew_new_colour.govspeak.erb' %>
+      ## Making your application
+
+      <%= render partial: 'making_your_application/apply_in_person_or_via_proxy.govspeak.erb' %>
+      <%= render partial: 'making_your_application/bring_originals_and_colour_copy.govspeak.erb' %>
+      <%= render partial: 'making_your_application/bring_passport_and_full_photocopy.govspeak.erb' %>
+      <% unless book_appointment_online_countries.include?(current_location) %>
+        <%= render partial: 'making_your_application/book_appointment_by_email_with_3_dates.govspeak.erb' %>
+      <% end %>
     <% else %>
       <%= render partial: 'making_your_application/send_application_ips.govspeak.erb', locals: { ips_number: ips_number } %>
       <%= render partial: 'making_your_application/renewing_new_renewing_old.govspeak.erb' %>
     <% end %>
-    <%= render partial: 'shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %>
+    <% unless book_appointment_online_countries.include?(current_location) %>
+      <%= render partial: 'shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %>
+    <% else %>
+      <%= render partial: 'making_your_application/book_appointment_online.govspeak.erb', locals: { current_location: current_location } %>
+    <% end %>
   <% end %>
 <% else %>
   <% if passport_data['application_office'] %>
-    <%= render partial: 'making_your_application/send_application_address.govspeak.erb', locals: { current_location: current_location } %>
+    <% unless book_appointment_online_countries.include?(current_location) %>
+      <%= render partial: 'making_your_application/send_application_address.govspeak.erb', locals: { current_location: current_location } %>
+    <% else %>
+      <%= render partial: 'making_your_application/book_appointment_online.govspeak.erb', locals: { current_location: current_location } %>
+    <% end %>
   <% else %>
     <% if non_uk_visa_application_with_colour_pictures.include?(current_location) %>
       ## Making your application
 
       <%= render partial: 'making_your_application/apply_in_person_or_via_proxy.govspeak.erb' %>
       <%= render partial: 'making_your_application/bring_originals_and_colour_copy.govspeak.erb' %>
-      <%= render partial: 'making_your_application/book_appointment_by_email_with_3_dates.govspeak.erb' %>
+      <% unless book_appointment_online_countries.include?(current_location) %>
+        <%= render partial: 'making_your_application/book_appointment_by_email_with_3_dates.govspeak.erb' %>
+      <% end %>
     <% else %>
       <%= render partial: 'making_your_application/send_application_ips.govspeak.erb', locals: { ips_number: ips_number } %>
     <% end %>
@@ -156,7 +214,11 @@
       <%= render partial: 'making_your_application/send_application_address_st_helena_ascension_and_tristan_da_cunha.govspeak.erb' %>
     <% else %>
       <% if ips_number.to_i > 1 %>
-        <%= render partial: 'shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %>
+        <% unless book_appointment_online_countries.include?(current_location) %>
+          <%= render partial: 'shared/overseas_passports_embassies.govspeak.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %>
+        <% else %>
+          <%= render partial: 'making_your_application/book_appointment_online.govspeak.erb', locals: { current_location: current_location } %>
+        <% end %>
       <% end %>
     <% end %>
   <% end %>

lib/smart_answer_flows/overseas-passports/outcomes/making_your_application/_book_appointment_online.govspeak.erb

@@ -0,0 +1,10 @@
+<% case current_location %>
+<% when 'kyrgyzstan' %>
+  You must [book an appointment online](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-bishkek/renew-or-apply-for-british-passport/slot_picker) to apply in person.
+<% when 'tajikistan' %>
+  You must [book an appointment online](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dushanbe/renew-or-apply-for-british-passport/slot_picker) to apply in person.
+<% when 'turkmenistan' %>
+  You must [book an appointment online](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-ashgabat/renew-or-apply-for-british-passport/slot_picker) to apply in person.
+<% when 'uzbekistan' %>
+  You must [book an appointment online](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-tashkent/renew-or-apply-for-british-passport/slot_picker) to apply in person.
+<% end %>

lib/smart_answer_flows/student-finance-forms/outcomes/outcome_parent_partner_1617.govspeak.erb

@@ -4,14 +4,14 @@
 
 <% content_for :body do %>
 
-  Some student finance (eg a Maintenance Grant) is based on income.
+  Some student finance is based on income.
 
   You must send your income details for the 2014 to 2015 tax year. Do this online as part of the [student’s application](/apply-online-for-student-finance). If you can’t do it online, use form PFF2.
 
   If you think your income has dropped by 15% or more since the 2014 to 2015 tax year you’ll need to do both of the following:
 
   + submit your 2014 to 2015 income details using form PFF2
-  + complete a CYI form (to ask for the student finance to be based on your expected 2015 to 2016 tax year income)
+  + complete a CYI form (to ask for the student finance to be based on your expected 2016 to 2017 tax year income)
 
   The CYI form will be available when the new tax year starts in April.
 

test/artefacts/overseas-passports/tajikistan/applying/adult/afghanistan.txt

@@ -48,18 +48,7 @@ You must bring photo ID with you.
 
 Bring original supporting documents and a colour photocopy of each one. The original documents will be returned to you.
 
-You’ll need to book an appointment by email. Include your first name and last name and 3 alternative dates and times. You will receive an email confirming your appointment.
-
-$A
-British Embassy Dushanbe
-65 Mirzo Tursunzoda Street
-Dushanbe
-734002
-Tajikistan
-$A
-$C
-Email: <dushanbe.reception@fco.gov.uk>
-$C
+You must [book an appointment online](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dushanbe/renew-or-apply-for-british-passport/slot_picker) to apply in person.
 
 ## Getting your passport
 

test/artefacts/overseas-passports/tajikistan/applying/adult/south-africa.txt

@@ -50,18 +50,7 @@ You must bring photo ID with you.
 
 Bring original supporting documents and a colour photocopy of each one. The original documents will be returned to you.
 
-You’ll need to book an appointment by email. Include your first name and last name and 3 alternative dates and times. You will receive an email confirming your appointment.
-
-$A
-British Embassy Dushanbe
-65 Mirzo Tursunzoda Street
-Dushanbe
-734002
-Tajikistan
-$A
-$C
-Email: <dushanbe.reception@fco.gov.uk>
-$C
+You must [book an appointment online](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-dushanbe/renew-or-apply-for-british-passport/slot_picker) to apply in person.
 
 ## Getting your passport