Fixing I18n support specs

Stefano Verna · Stefano Verna · commit c855cf1b43e3 · 2013-05-10T16:03:31.000+02:00
diff --git a/app.rb b/app.rb
@@ -39,11 +39,11 @@ def t(*args)
   end
 
   before do
+    I18n.locale = ENV["locale"].blank? ? :en : ENV["locale"].to_sym
+
     if !is_authenticated? && needs_authentication?(request.path)
       redirect '/login'
     end
-
-    I18n.locale = ENV["locale"].to_sym unless ENV["locale"].blank? || :en
   end
 
   get "/" do
@@ -59,3 +59,4 @@ def t(*args)
 require_relative "app/controllers/first_run_controller"
 require_relative "app/controllers/sessions_controller"
 require_relative "app/controllers/feeds_controller"
+
diff --git a/spec/utils/i18n_support_spec.rb b/spec/utils/i18n_support_spec.rb
@@ -1,8 +1,14 @@
 require "spec_helper"
 
 describe "i18n" do
+  before do
+    UserRepository.stub(:setup_complete?).and_return(false)
+    ENV['locale'] = locale
+    get "/"
+  end
+
   context "when no locale was set" do
-    ENV['locale'] = nil
+    let(:locale) { nil }
 
     it "should load default locale" do
       I18n.locale.to_s.should eq "en"
@@ -11,7 +17,7 @@
   end
 
   context "when locale was set" do
-    ENV['locale'] = "en"
+    let(:locale) { 'en' }
 
     it "should load default locale" do
       I18n.locale.to_s.should eq "en"
@@ -20,10 +26,11 @@
   end
 
   context "when a missing locale was set" do
-    ENV['locale'] = "xx"
+    let(:locale) { 'xx' }
 
     it "should not find localization strings" do
       I18n.t('layout.title', locale: ENV['locale'].to_sym).should_not eq "stringer | your rss buddy"
     end
   end
 end
+
