3 files changed, 10 insertions, 45 deletions
diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb
index f94d08673a..1304e73378 100644
--- a/railties/test/application/rake/dbs_test.rb
+++ b/railties/test/application/rake/dbs_test.rb
@@ -61,7 +61,7 @@ module ApplicationTests
       test 'db:create failure because database exists' do
         with_database_existing do
           output = `bin/rake db:create 2>&1`
-          assert_match /already exists/, output
+          assert_match(/already exists/, output)
           assert_equal 0, $?.exitstatus
         end
       end
@@ -78,15 +78,15 @@ module ApplicationTests
       test 'db:create failure because bad permissions' do
         with_bad_permissions do
           output = `bin/rake db:create 2>&1`
-          assert_match /Couldn't create database/, output
+          assert_match(/Couldn't create database/, output)
           assert_equal 1, $?.exitstatus
         end
       end
 
       test 'db:drop failure because database does not exist' do
         Dir.chdir(app_path) do
-          output = `bin/rake db:drop 2>&1`
-          assert_match /does not exist/, output
+          output = `bin/rake db:drop:_unsafe --trace 2>&1`
+          assert_match(/does not exist/, output)
           assert_equal 0, $?.exitstatus
         end
       end
@@ -95,7 +95,7 @@ module ApplicationTests
         with_database_existing do
           with_bad_permissions do
             output = `bin/rake db:drop 2>&1`
-            assert_match /Couldn't drop/, output
+            assert_match(/Couldn't drop/, output)
             assert_equal 1, $?.exitstatus
           end
         end
@@ -222,14 +222,14 @@ module ApplicationTests
 
           assert_equal '["posts"]', list_tables[]
           `bin/rake db:schema:load`
-          assert_equal '["posts", "comments", "schema_migrations"]', list_tables[]
+          assert_equal '["posts", "comments", "schema_migrations", "active_record_internal_metadatas"]', list_tables[]
 
           app_file 'db/structure.sql', <<-SQL
             CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255));
           SQL
 
           `bin/rake db:structure:load`
-          assert_equal '["posts", "comments", "schema_migrations", "users"]', list_tables[]
+          assert_equal '["posts", "comments", "schema_migrations", "active_record_internal_metadatas", "users"]', list_tables[]
         end
       end
 
diff --git a/railties/test/application/rake/dev_test.rb b/railties/test/application/rake/dev_test.rb
deleted file mode 100644
index 28d8b22a37..0000000000
--- a/railties/test/application/rake/dev_test.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'isolation/abstract_unit'
-
-module ApplicationTests
-  module RakeTests
-    class RakeDevTest < ActiveSupport::TestCase
-      include ActiveSupport::Testing::Isolation
-
-      def setup
-        build_app
-        boot_rails
-      end
-
-      def teardown
-        teardown_app
-      end
-
-      test 'dev:cache creates file and outputs message' do
-        Dir.chdir(app_path) do
-          output = `rake dev:cache`
-          assert File.exist?('tmp/caching-dev.txt')
-          assert_match(/Development mode is now being cached/, output)
-        end
-      end
-
-      test 'dev:cache deletes file and outputs message' do
-        Dir.chdir(app_path) do
-          output = `rake dev:cache`        
-          output = `rake dev:cache`
-          assert_not File.exist?('tmp/caching-dev.txt')
-          assert_match(/Development mode is no longer being cached/, output)
-        end
-      end
-    end
-  end
-end
diff --git a/railties/test/application/rake/migrations_test.rb b/railties/test/application/rake/migrations_test.rb
index 6b74707959..580ed269cb 100644
--- a/railties/test/application/rake/migrations_test.rb
+++ b/railties/test/application/rake/migrations_test.rb
@@ -18,7 +18,7 @@ module ApplicationTests
           `bin/rails generate model user username:string password:string`
 
           app_file "db/migrate/01_a_migration.bukkits.rb", <<-MIGRATION
-            class AMigration < ActiveRecord::Migration
+            class AMigration < ActiveRecord::Migration::Current
             end
           MIGRATION
 
@@ -158,12 +158,12 @@ module ApplicationTests
         Dir.chdir(app_path) do
 
           app_file "db/migrate/1_one_migration.rb", <<-MIGRATION
-            class OneMigration < ActiveRecord::Migration
+            class OneMigration < ActiveRecord::Migration::Current
             end
           MIGRATION
 
           app_file "db/migrate/02_two_migration.rb", <<-MIGRATION
-            class TwoMigration < ActiveRecord::Migration
+            class TwoMigration < ActiveRecord::Migration::Current
             end
           MIGRATION