aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/commands.rb
diff options
context:
space:
mode:
authorPrem Sichanugrist <s@sikac.hu>2013-03-09 16:03:09 -0500
committerPrem Sichanugrist <s@sikac.hu>2013-03-09 17:38:39 -0500
commit3ed41e579e45464aa6e6342783b77f9ec29e339c (patch)
tree77d2b30e6f0f7b9ec2790b30c0cb116e2dc5329c /railties/lib/rails/commands.rb
parentb51673fbd9563bd3ffa22e22255ca1cef80cfb6d (diff)
downloadrails-3ed41e579e45464aa6e6342783b77f9ec29e339c.tar.gz
rails-3ed41e579e45464aa6e6342783b77f9ec29e339c.tar.bz2
rails-3ed41e579e45464aa6e6342783b77f9ec29e339c.zip
Make sure that `rails test` load test in test env
Diffstat (limited to 'railties/lib/rails/commands.rb')
-rw-r--r--railties/lib/rails/commands.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb
index 2984999a3c..41d3722c18 100644
--- a/railties/lib/rails/commands.rb
+++ b/railties/lib/rails/commands.rb
@@ -84,10 +84,9 @@ when 'test'
$LOAD_PATH.unshift("./test")
require 'rails/commands/test_runner'
options = Rails::TestRunner.parse_arguments(ARGV)
+ ENV['RAILS_ENV'] ||= options[:environment] || 'test'
require APP_PATH
- Rails.application.require_environment!
- Rails.application.load_tasks
Rails::TestRunner.start(ARGV, options)
when 'dbconsole'