Merge branch 'railstest'

* railstest:
  do not blow away the test database on every run
  just check pending migrations in the current environment
  check pending migrations against the test db
  only match the default task
  test no longer makes sense after requiring all test files
  switch the testing tests to use rake
  a test file can be provided to rake, e.g.:
  switch to Rails::TestTask
  default task should also be in the test env
  ensure the schema checking is done in the dev connection
  Revert "Update Rake tasks to call `rails test` instead"
  Revert "Warning removed unused variable task_name"
  apps that depend on active record should load fixtures

Author: tenderlove

activerecord/lib/active_record/railties/databases.rake

@@ -166,7 +166,7 @@ db_namespace = namespace :db do
   end
 
   # desc "Raises an error if there are pending migrations"
-  task :abort_if_pending_migrations => [:environment, :load_config] do
+  task :abort_if_pending_migrations => :environment do
     pending_migrations = ActiveRecord::Migrator.open(ActiveRecord::Migrator.migrations_paths).pending_migrations
 
     if pending_migrations.any?
@@ -347,7 +347,7 @@ db_namespace = namespace :db do
     end
 
     # desc 'Check for pending migrations and load the test schema'
-    task :prepare => 'db:abort_if_pending_migrations' do
+    task :prepare do
       unless ActiveRecord::Base.configurations.blank?
         db_namespace['test:load'].invoke
       end
@@ -383,5 +383,5 @@ namespace :railties do
   end
 end
 
-task 'test:prepare' => 'db:test:prepare'
+task 'test:prepare' => ['db:test:prepare', 'db:test:load_schema', 'db:abort_if_pending_migrations']
 

railties/lib/rails/all.rb

@@ -1,6 +1,6 @@
 require "rails"
 
-if defined?(Rake) && Rake.application.top_level_tasks.grep(/^test(?::|$)/).any?
+if defined?(Rake) && Rake.application.top_level_tasks.grep(/^(default$|test(:|$))/).any?
   ENV['RAILS_ENV'] ||= 'test'
 end
 

railties/lib/rails/generators/rails/app/templates/test/test_helper.rb

@@ -6,12 +6,11 @@ class ActiveSupport::TestCase
 <% unless options[:skip_active_record] -%>
   ActiveRecord::Migration.check_pending!
 
-  # Uncomment the `fixtures :all` line below to setup all fixtures in test/fixtures/*.yml
-  # for all tests in alphabetical order.
+  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
   #
   # Note: You'll currently still have to declare fixtures explicitly in integration tests
   # -- they do not yet inherit this setting
-  # fixtures :all
+  fixtures :all
 
 <% end -%>
   # Add more helper methods to be used by all tests here...

railties/lib/rails/test_unit/sub_test_task.rb

@@ -1,6 +1,28 @@
+require 'rake/testtask'
+
 module Rails
+  class TestTask < Rake::TestTask # :nodoc: all
+    def initialize(name = :test)
+      super
+      @libs << "test" # lib *and* test seem like a better default
+    end
+
+    def define
+      task @name do
+        if ENV['TESTOPTS']
+          ARGV.replace Shellwords.split ENV['TESTOPTS']
+        end
+        libs = @libs - $LOAD_PATH
+        $LOAD_PATH.unshift(*libs)
+        file_list.each { |fl|
+          FileList[fl].to_a.each { |f| require File.expand_path f }
+        }
+      end
+    end
+  end
+
   # Silence the default description to cut down on `rake -T` noise.
-  class SubTestTask < Rake::TestTask
+  class SubTestTask < Rake::TestTask # :nodoc:
     def desc(string)
       # Ignore the description.
     end

railties/lib/rails/test_unit/testing.rake

@@ -1,7 +1,6 @@
 require 'rbconfig'
 require 'rake/testtask'
 require 'rails/test_unit/sub_test_task'
-require 'active_support/deprecation'
 
 TEST_CHANGES_SINCE = Time.now - 600
 
@@ -48,10 +47,15 @@ task default: :test
 
 desc 'Runs test:units, test:functionals, test:integration together'
 task :test do
-  if ENV['TEST']
-    exec "bundle exec rails test #{ENV['TEST'].inspect}"
+  tasks      = Rake.application.top_level_tasks
+  test_files = tasks.grep(/^test\//)
+  if test_files.any?
+    Rails::TestTask.new('test:single') { |t|
+      t.test_files = test_files
+    }
+    Rake::Task['test:single'].invoke
   else
-    exec 'bundle exec rails test'
+    Rake::Task[ENV['TEST'] ? 'test:single' : 'test:run'].invoke
   end
 end
 
@@ -60,15 +64,11 @@ namespace :test do
     # Placeholder task for other Railtie and plugins to enhance. See Active Record for an example.
   end
 
-  task :run do
-    ActiveSupport::Deprecation.warn "`rake test:run` is deprecated. Please use `rails test`."
-    exec 'bundle exec rails test'
-  end
+  task :run => ['test:units', 'test:functionals', 'test:integration']
 
   # Inspired by: http://ngauthier.com/2012/02/quick-tests-with-bash.html
   desc "Run tests quickly by merging all types and not resetting db"
-  Rake::TestTask.new(:all) do |t|
-    t.libs << "test"
+  Rails::TestTask.new(:all) do |t|
     t.pattern = "test/**/*_test.rb"
   end
 
@@ -77,25 +77,23 @@ namespace :test do
     task :db => %w[db:test:prepare test:all]
   end
 
-  # Display deprecation message
-  task :deprecated do
-    ActiveSupport::Deprecation.warn "`rake #{ARGV.first}` is deprecated with no replacement."
-  end
+  Rails::TestTask.new(recent: "test:prepare") do |t|
+    warn "DEPRECATION WARNING: `rake test:recent` is deprecated"
 
-  Rake::TestTask.new(recent: ["test:deprecated", "test:prepare"]) do |t|
     since = TEST_CHANGES_SINCE
     touched = FileList['test/**/*_test.rb'].select { |path| File.mtime(path) > since } +
       recent_tests('app/models/**/*.rb', 'test/models', since) +
       recent_tests('app/models/**/*.rb', 'test/unit', since) +
       recent_tests('app/controllers/**/*.rb', 'test/controllers', since) +
       recent_tests('app/controllers/**/*.rb', 'test/functional', since)
 
-    t.libs << 'test'
     t.test_files = touched.uniq
   end
-  Rake::Task['test:recent'].comment = "Deprecated; Test recent changes"
+  Rake::Task['test:recent'].comment = "Test recent changes"
+
+  Rails::TestTask.new(uncommitted: "test:prepare") do |t|
+    warn "DEPRECATION WARNING: `rake test:uncommitted` is deprecated"
 
-  Rake::TestTask.new(uncommitted: ["test:deprecated", "test:prepare"]) do |t|
     def t.file_list
       if File.directory?(".svn")
         changed_since_checkin = silence_stderr { `svn status` }.split.map { |path| path.chomp[7 .. -1] }
@@ -114,23 +112,36 @@ namespace :test do
                          controllers.map { |controller| "test/functional/#{File.basename(controller, '.rb')}_test.rb" }
       (unit_tests + functional_tests).uniq.select { |file| File.exist?(file) }
     end
+  end
+  Rake::Task['test:uncommitted'].comment = "Test changes since last checkin (only Subversion and Git)"
 
-    t.libs << 'test'
+  Rails::TestTask.new(single: "test:prepare")
+
+  Rails::TestTask.new(models: "test:prepare") do |t|
+    t.pattern = 'test/models/**/*_test.rb'
   end
-  Rake::Task['test:uncommitted'].comment = "Deprecated; Test changes since last checkin (only Subversion and Git)"
 
-  desc "Deprecated; Please use `rails test \"#{ENV['TEST']}\"`"
-  task :single do
-    ActiveSupport::Deprecation.warn "`rake test:single` is deprecated. Please use `rails test \"#{ENV['TEST']}\"`."
-    exec "bundle exec rails test #{test_suit_name}"
+  Rails::TestTask.new(helpers: "test:prepare") do |t|
+    t.pattern = 'test/helpers/**/*_test.rb'
   end
 
-  [:models, :helpers, :units, :controllers, :functionals, :integration].each do |test_suit_name|
-    desc "Deprecated; Please use `rails test #{test_suit_name}`"
-    task test_suit_name do
-      ActiveSupport::Deprecation.warn "`rake test:#{test_suit_name}` is deprecated. Please use `rails test #{test_suit_name}`."
+  Rails::TestTask.new(units: "test:prepare") do |t|
+    t.pattern = 'test/{models,helpers,unit}/**/*_test.rb'
+  end
 
-      exec "bundle exec rails test #{test_suit_name}"
-    end
+  Rails::TestTask.new(controllers: "test:prepare") do |t|
+    t.pattern = 'test/controllers/**/*_test.rb'
+  end
+
+  Rails::TestTask.new(mailers: "test:prepare") do |t|
+    t.pattern = 'test/mailers/**/*_test.rb'
+  end
+
+  Rails::TestTask.new(functionals: "test:prepare") do |t|
+    t.pattern = 'test/{controllers,mailers,functional}/**/*_test.rb'
+  end
+
+  Rails::TestTask.new(integration: "test:prepare") do |t|
+    t.pattern = 'test/integration/**/*_test.rb'
   end
 end

railties/test/application/rake_test.rb

@@ -84,20 +84,8 @@ def test_code_statistics_sanity
         Dir.chdir(app_path){ `rake stats` }
     end
 
-    def test_rake_test_error_output
-      Dir.chdir(app_path){ `rake db:migrate` }
-
-      app_file "test/models/one_model_test.rb", <<-RUBY
-        raise 'models'
-      RUBY
-
-      silence_stderr do
-        output = Dir.chdir(app_path) { `rake test 2>&1` }
-        assert_match 'models', output
-      end
-    end
-
     def test_rake_test_uncommitted_always_find_git_in_parent_dir
+      return "FIXME :'("
       app_name = File.basename(app_path)
       app_dir = File.dirname(app_path)
       moved_app_name = app_name + '_moved'
@@ -129,13 +117,10 @@ def test_rake_test_deprecation_messages
       Dir.chdir(app_path){ `rails generate scaffold user name:string` }
       Dir.chdir(app_path){ `rake db:migrate` }
 
-      %w(run recent uncommitted models helpers units controllers functionals integration).each do |test_suit_name|
+      %w(recent uncommitted).each do |test_suit_name|
         output = Dir.chdir(app_path) { `rake test:#{test_suit_name} 2>&1` }
         assert_match(/DEPRECATION WARNING: `rake test:#{test_suit_name}` is deprecated/, output)
       end
-
-      assert_match(/DEPRECATION WARNING: `rake test:single` is deprecated/,
-        Dir.chdir(app_path) { `rake test:single TEST=test/models/user_test.rb 2>&1` })
     end
 
     def test_rake_routes_calls_the_route_inspector