1 files changed, 49 insertions, 3 deletions
diff --git a/railties/test/application/rake/migrations_test.rb b/railties/test/application/rake/migrations_test.rb
index 0a47fd014c..a3819b93b2 100644
--- a/railties/test/application/rake/migrations_test.rb
+++ b/railties/test/application/rake/migrations_test.rb
@@ -50,15 +50,15 @@ module ApplicationTests
            assert_match(/AddEmailToUsers: migrated/, output)
 
            output = `rake db:rollback STEP=2`
-           assert_match(/drop_table\("users"\)/, output)
+           assert_match(/drop_table\(:users\)/, output)
            assert_match(/CreateUsers: reverted/, output)
-           assert_match(/remove_column\("users", :email\)/, output)
+           assert_match(/remove_column\(:users, :email, :string\)/, output)
            assert_match(/AddEmailToUsers: reverted/, output)
         end
       end
 
       test 'migration status when schema migrations table is not present' do
-        output = Dir.chdir(app_path){ `rake db:migrate:status` }
+        output = Dir.chdir(app_path){ `rake db:migrate:status 2>&1` }
         assert_equal "Schema migrations table does not exist yet.\n", output
       end
 
@@ -153,6 +153,52 @@ module ApplicationTests
            assert_match(/up\s+\d{3,}\s+Add email to users/, output)
         end
       end
+
+      test 'schema generation when dump_schema_after_migration is set' do
+        add_to_config('config.active_record.dump_schema_after_migration = false')
+
+        Dir.chdir(app_path) do
+          `rails generate model book title:string;
+           bundle exec rake db:migrate`
+
+          assert !File.exist?("db/schema.rb")
+        end
+
+        add_to_config('config.active_record.dump_schema_after_migration = true')
+
+        Dir.chdir(app_path) do
+          `rails generate model author name:string;
+           bundle exec rake db:migrate`
+
+          structure_dump = File.read("db/schema.rb")
+          assert_match(/create_table "authors"/, structure_dump)
+        end
+      end
+
+      test 'default schema generation after migration' do
+        Dir.chdir(app_path) do
+          `rails generate model book title:string;
+           bundle exec rake db:migrate`
+
+          structure_dump = File.read("db/schema.rb")
+          assert_match(/create_table "books"/, structure_dump)
+        end
+      end
+
+      test 'test migration status migrated file is deleted' do
+        Dir.chdir(app_path) do
+          `rails generate model user username:string password:string;
+           rails generate migration add_email_to_users email:string;
+           rake db:migrate
+           rm db/migrate/*email*.rb`
+
+          output = `rake db:migrate:status`
+          File.write('test.txt', output)
+
+          assert_match(/up\s+\d{14}\s+Create users/, output)
+          assert_match(/up\s+\d{14}\s+\** NO FILE \**/, output)
+        end
+      end
     end
   end
 end