aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-11-25 13:53:57 +0100
committerYves Senn <yves.senn@gmail.com>2014-11-25 13:56:29 +0100
commit7836e887d70f341a47061fafedcd595b7dfa7320 (patch)
treeb11cef448aebecdd54916af9598ba3dc436482a5 /railties
parent0715d8c3681306d6cf119ad3b460bbd0890d9b49 (diff)
downloadrails-7836e887d70f341a47061fafedcd595b7dfa7320.tar.gz
rails-7836e887d70f341a47061fafedcd595b7dfa7320.tar.bz2
rails-7836e887d70f341a47061fafedcd595b7dfa7320.zip
tests, run `test_test.rb` with `RAILS_ENV=test`.
The tests to verify our testing setup used `RAILS_ENV=development` to execute the tests. Let's keep it as close to a real-world setup as possible.
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/test_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index c724c867ec..4d06056280 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -208,7 +208,7 @@ module ApplicationTests
end
def run_test_file(name, options = {})
- ruby '-Itest', "#{app_path}/test/#{name}", options
+ ruby '-Itest', "#{app_path}/test/#{name}", options.deep_merge(env: {"RAILS_ENV" => "test"})
end
def ruby(*args)