1 files changed, 46 insertions, 1 deletions
diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index 6f2f328588..a223180169 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -67,10 +67,55 @@ module ApplicationTests
       assert_match %r{/app/test/unit/failing_test\.rb}, output
     end
 
+    test "migrations" do
+      output  = script('generate model user name:string')
+      version = output.match(/(\d+)_create_users\.rb/)[1]
+
+      app_file 'test/models/user_test.rb', <<-RUBY
+        require 'test_helper'
+
+        class UserTest < ActiveSupport::TestCase
+          test "user" do
+            User.create! name: "Jon"
+          end
+        end
+      RUBY
+      app_file 'db/schema.rb', ''
+
+      assert_unsuccessful_run "models/user_test.rb", "Migrations are pending"
+
+      app_file 'db/schema.rb', <<-RUBY
+        ActiveRecord::Schema.define(version: #{version}) do
+          create_table :users do |t|
+            t.string :name
+          end
+        end
+      RUBY
+
+      app_file 'config/initializers/disable_maintain_test_schema.rb', <<-RUBY
+        Rails.application.config.active_record.maintain_test_schema = false
+      RUBY
+
+      assert_unsuccessful_run "models/user_test.rb", "Could not find table 'users'"
+
+      File.delete "#{app_path}/config/initializers/disable_maintain_test_schema.rb"
+
+      result = assert_successful_test_run('models/user_test.rb')
+      assert !result.include?("create_table(:users)")
+    end
+
     private
+      def assert_unsuccessful_run(name, message)
+        result = run_test_file(name)
+        assert_not_equal 0, $?.to_i
+        assert result.include?(message)
+        result
+      end
+
       def assert_successful_test_run(name)
         result = run_test_file(name)
         assert_equal 0, $?.to_i, result
+        result
       end
 
       def run_test_file(name, options = {})
@@ -83,7 +128,7 @@ module ApplicationTests
         env["RUBYLIB"] = $:.join(':')
 
         Dir.chdir(app_path) do
-          `#{env_string(env)} #{Gem.ruby} #{args.join(' ')}`
+          `#{env_string(env)} #{Gem.ruby} #{args.join(' ')} 2>&1`
         end
       end