From 3000cdb80b86c90d8dd7d37b383be20a2a6e1667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=A0im=C3=A1nek?= Date: Sun, 7 Dec 2014 20:56:06 +0100 Subject: [PATCH] Clean locale for every test group. --- pages/spec/features/refinery/admin/pages_spec.rb | 1 - spec/spec_helper.rb | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pages/spec/features/refinery/admin/pages_spec.rb b/pages/spec/features/refinery/admin/pages_spec.rb index 5d76f12c1a..b719f2f0fb 100644 --- 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 index adfa13065b..e5d2fb5cb2 100644 --- 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,