diff options
author | Louise Crow <louise.crow@gmail.com> | 2015-05-22 17:49:59 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2015-05-22 17:49:59 +0100 |
commit | 15418b4f0aebb31643300e75c9c68e0e71a90560 (patch) | |
tree | a1d061fac0994b39e99df570e14b29c8f088331b /spec/controllers/general_controller_spec.rb | |
parent | 5116263e02fce228f9d1006945cb311829a7b586 (diff) | |
parent | 7b2757e7be4ae2ddf0fa7cb694faf5799340f003 (diff) |
Merge remote-tracking branch 'jpmckinney_github/parentheses' into rails-3-develop
Diffstat (limited to 'spec/controllers/general_controller_spec.rb')
-rw-r--r-- | spec/controllers/general_controller_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb index d466625b7..495624403 100644 --- a/spec/controllers/general_controller_spec.rb +++ b/spec/controllers/general_controller_spec.rb @@ -112,7 +112,7 @@ describe GeneralController, "when showing the frontpage" do it "should render the front page with default language and ignore the browser setting" do - config = MySociety::Config.load_default() + config = MySociety::Config.load_default config['USE_DEFAULT_BROWSER_LANGUAGE'] = false accept_language = "en-GB,en-US;q=0.8,en;q=0.6" request.env['HTTP_ACCEPT_LANGUAGE'] = accept_language @@ -123,7 +123,7 @@ describe GeneralController, "when showing the frontpage" do end it "should render the front page with browser-selected language when there's no default set" do - config = MySociety::Config.load_default() + config = MySociety::Config.load_default config['USE_DEFAULT_BROWSER_LANGUAGE'] = true accept_language = "es-ES,en-GB,en-US;q=0.8,en;q=0.6" request.env['HTTP_ACCEPT_LANGUAGE'] = accept_language |