Introduce config setting to ignore browser language settings

1 files changed, 15 insertions, 1 deletions

diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb
index 63ad6873c..bc744a9cd 100644
--- a/spec/controllers/general_controller_spec.rb
+++ b/spec/controllers/general_controller_spec.rb
@@ -30,7 +30,21 @@ describe GeneralController, "when searching" do
         I18n.default_locale = old_default_locale
     end
 
-    it "should render the front page with browser-selected language" do
+    it "should render the front page with default language and ignore the browser setting" do
+        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
+        old_default_locale = I18n.default_locale
+        I18n.default_locale = "es"
+        get :frontpage
+        response.should have_tag('html[lang="es"]')
+        I18n.default_locale = old_default_locale
+    end
+
+    it "should render the front page with browser-selected language when there's no default set" do
+        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
         get :frontpage