Update uk visa russia georgia

app/flows/check_uk_visa_flow/outcomes/_russia_or_georgia.erb

@@ -0,0 +1,10 @@
+<% if calculator.passport_country_is_russia_or_georgia? %>
+  ###If you're arriving in the UK before 6 October 2023
+
+  You do not need a visa to come to the UK if both of the following apply:
+
+  * you booked and paid for your journey to the UK before 00:01am (UK time) on 8 September 2023
+  * you're arriving in the UK before 00:01am (UK time) on 6 October 2023
+
+  You'll need evidence of your onward journey. You may be asked to show it to Border Force officers or to your airline carrier.
+<% end %>

app/flows/check_uk_visa_flow/outcomes/outcome_transit_not_leaving_airport.erb

@@ -1,15 +1,15 @@
 <% text_for :title do %>
-  You’ll need a visa to pass through the UK in transit (unless you’re exempt)
+  You’ll need a visa to pass through the UK in transit
 <% end %>
 
 <% govspeak_for :body do %>
-  You should apply for a [Direct Airside Transit visa](/transit-visa) if you arrive in the UK on a flight and leave again without passing through immigration control.
+  You normally need a [Direct Airside Transit visa](/transit-visa/direct-airside-transit-visa) if you arrive in the UK on a flight and leave again without passing through immigration control.
 
   ##Exemptions
 
-  You do not need a visa if you have one of the following:
+  You do not need a Direct Airside Transit visa if you have one of the following:
 
-  - a visa for Canada, New Zealand, Australia or the USA (this can be used for travel to any country) <%= render partial: 'b1_b2_visa_exception', locals: {calculator: calculator} %>
+  - a visa for Canada, New Zealand, Australia or the USA (this can be used for travel to any country) <%= render partial: 'b1_b2_visa_exception', locals: {calculator:} %>
   - a permanent resident visa issued by Australia or New Zealand
   - a common format residence permit issued by an European Economic Area (EEA) country or Switzerland
   - a permanent resident card issued by Canada on or after 28 June 2002
@@ -25,4 +25,6 @@
   All visas and residence permits must be valid.
 
   %E-visas or e-residence permits are not acceptable unless your airline is able to verify it with the issuing country. Contact your airline for more information.%
+
+  <%= render partial: 'russia_or_georgia', locals: {calculator:} %>
 <% end %>

lib/smart_answer/calculators/uk_visa_calculator.rb

@@ -134,6 +134,10 @@ def passport_country_is_macao?
       @passport_country == "macao"
     end
 
+    def passport_country_is_russia_or_georgia?
+      %w[russia georgia].include?(@passport_country)
+    end
+
     def passport_country_is_turkey?
       @passport_country == "turkey"
     end
@@ -399,7 +403,6 @@ def eligible_for_india_young_professionals_scheme?
       equatorial-guinea
       fiji
       gabon
-      georgia
       haiti
       indonesia
       jordan
@@ -418,7 +421,6 @@ def eligible_for_india_young_professionals_scheme?
       oman
       philippines
       qatar
-      russia
       sao-tome-and-principe
       saudi-arabia
       stateless-or-refugee
@@ -456,6 +458,7 @@ def eligible_for_india_young_professionals_scheme?
       estonia-alien-passport
       eswatini
       ethiopia
+      georgia
       ghana
       guinea
       guinea-bissau
@@ -482,6 +485,7 @@ def eligible_for_india_young_professionals_scheme?
       north-macedonia
       pakistan
       palestinian-territories
+      russia
       rwanda
       senegal
       serbia

test/flows/check_uk_visa_flow_test.rb

@@ -29,9 +29,11 @@ class CheckUkVisaFlowTest < ActiveSupport::TestCase
                                       "israel",
                                       "ireland",
                                       "estonia",
+                                      "georgia",
                                       "latvia",
                                       "hong-kong",
                                       "macao",
+                                      "russia",
                                       "taiwan",
                                       "venezuela",
                                       @electronic_travel_authorisation_country,
@@ -764,6 +766,22 @@ class CheckUkVisaFlowTest < ActiveSupport::TestCase
     end
   end
 
+  context "outcome: outcome_transit_not_leaving_airport" do
+    setup do
+      testing_node :outcome_transit_not_leaving_airport
+      add_responses purpose_of_visit?: "transit",
+                    travelling_to_cta?: "somewhere_else",
+                    passing_through_uk_border_control?: "no"
+    end
+
+    %w[russia georgia].each do |country|
+      should "render extra guidance for #{country}" do
+        add_responses what_passport_do_you_have?: country
+        assert_rendered_outcome text: /If you’re arriving in the UK before 6 October 2023/
+      end
+    end
+  end
+
   context "outcome: outcome_transit_leaving_airport_direct_airside_transit_visa" do
     setup do
       testing_node :outcome_transit_leaving_airport_direct_airside_transit_visa