Merge 3000cdb into 54294a3

refinery · Dec 7, 2014 · b1ce832 · b1ce832
2 parents 54294a3 + 3000cdb
commit b1ce832
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pages/spec/features/refinery/admin/pages_spec.rb b/pages/spec/features/refinery/admin/pages_spec.rb
@@ -16,7 +16,6 @@ def expect_window_without_content(content, window: windows.last)
 module Refinery
   module Admin
     describe "Pages", :type => :feature do
-      before { ::I18n.default_locale = Globalize.locale = :en }
       refinery_login_with :refinery_user
 
       context "when no pages" do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -19,8 +19,6 @@
 
 Rails.backtrace_cleaner.remove_silencers!
 
-I18n.locale = :en
-
 RSpec.configure do |config|
   config.mock_with :rspec
   config.filter_run :focus => true
@@ -35,6 +33,12 @@
     example.call
     Capybara.javascript_driver = :poltergeist
   end
+
+  config.around(:each) do |example|
+    ::I18n.default_locale = Globalize.locale = :en
+    example.run
+    ::I18n.default_locale = Globalize.locale = :en
+  end
 end
 
 # Requires supporting files with custom matchers and macros, etc,