aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/services_controller_spec.rb
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2015-01-13 17:23:02 +0000
committerGareth Rees <gareth@mysociety.org>2015-01-13 17:23:02 +0000
commitaf18834097e2f49ba9c0e18b9dac42cbc6eb1ebd (patch)
tree9d6301576c5b0733d1a988860f9a08e979442484 /spec/controllers/services_controller_spec.rb
parent74f325825c3a5b94794253009a10f002dac3fa39 (diff)
parent1488f24e3f03fe46b222fa2fca4ae273d0b46ebf (diff)
Merge branch '2051-back-to-search' into rails-3-develop
Diffstat (limited to 'spec/controllers/services_controller_spec.rb')
-rw-r--r--spec/controllers/services_controller_spec.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/controllers/services_controller_spec.rb b/spec/controllers/services_controller_spec.rb
index 248c97ad4..621dbaaac 100644
--- a/spec/controllers/services_controller_spec.rb
+++ b/spec/controllers/services_controller_spec.rb
@@ -12,6 +12,14 @@ describe ServicesController, "when returning a message for people in other count
@old_locale = FastGettext.locale()
end
+ it 'keeps the flash' do
+ # Make two get requests to simulate the flash getting swept after the
+ # first response.
+ get :other_country_message, nil, nil, :some_flash_key => 'abc'
+ get :other_country_message
+ expect(flash[:some_flash_key]).to eq('abc')
+ end
+
it "should show no alaveteli message when in the deployed country" do
config = MySociety::Config.load_default()
config['ISO_COUNTRY_CODE'] = "DE"