Permalink
Browse files

Moved the check for the rails test environment into rails/test_unit s…

…o that you

can select frameworks separately when running rake test.
  • Loading branch information...
1 parent e58f116 commit 3ff263919c67588e4348da30cb92b860fe83cba5 @wangjohn wangjohn committed Apr 17, 2013
Showing with 4 additions and 4 deletions.
  1. +0 −4 railties/lib/rails/all.rb
  2. +4 −0 railties/lib/rails/test_unit/railtie.rb
@@ -1,9 +1,5 @@
require "rails"
-if defined?(Rake) && Rake.application.top_level_tasks.grep(/^(default$|test(:|$))/).any?
- ENV['RAILS_ENV'] ||= 'test'
-end
-
%w(
active_record
action_controller
@@ -1,3 +1,7 @@
+if defined?(Rake) && Rake.application.top_level_tasks.grep(/^(default$|test(:|$))/).any?
+ ENV['RAILS_ENV'] ||= 'test'
+end
+
module Rails
class TestUnitRailtie < Rails::Railtie
config.app_generators do |c|

0 comments on commit 3ff2639

Please sign in to comment.