aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenare Degan <henare.degan@gmail.com>2013-02-07 14:10:06 +1100
committerHenare Degan <henare.degan@gmail.com>2013-02-07 14:10:06 +1100
commita80a9bd62b6f7fc6f4dec99f7f101b7cecfb9285 (patch)
tree81a7b7fa6a811c8f510c6f21b38ac130e870db88
parent8d57b8c476b1459e1fa5bd9d1af9390f053911bb (diff)
Bring over test-specific translations config from Rails 2 test helper
-rw-r--r--spec/spec_helper.rb4
-rw-r--r--spec/spec_helper.rb.rails23
2 files changed, 4 insertions, 3 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e79b8d777..777948c6b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -8,6 +8,10 @@ require 'rspec/autorun'
# in spec/support/ and its subdirectories.
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+# Use test-specific translations
+FastGettext.add_text_domain 'app', :path => File.join(File.dirname(__FILE__), 'fixtures', 'locale'), :type => :po
+FastGettext.default_text_domain = 'app'
+
RSpec.configure do |config|
# ## Mock Framework
#
diff --git a/spec/spec_helper.rb.rails2 b/spec/spec_helper.rb.rails2
index 4f1d125b3..aee3ce122 100644
--- a/spec/spec_helper.rb.rails2
+++ b/spec/spec_helper.rb.rails2
@@ -20,9 +20,6 @@ FakeWeb.register_uri(:purge, %r|varnish.localdomain|, :body => "OK")
# Uncomment the next line to use webrat's matchers
#require 'webrat/integrations/rspec-rails'
-# Use test-specific translations
-FastGettext.add_text_domain 'app', :path => File.join(File.dirname(__FILE__), 'fixtures', 'locale'), :type => :po
-FastGettext.default_text_domain = 'app'
Spec::Runner.configure do |config|
# If you're not using ActiveRecord you should remove these
# lines, delete config/database.yml and disable :active_record