3 files changed, 41 insertions, 9 deletions
diff --git a/railties/test/application/rake/restart_test.rb b/railties/test/application/rake/restart_test.rb
index 28da8164a7..6ebd2d5461 100644
--- a/railties/test/application/rake/restart_test.rb
+++ b/railties/test/application/rake/restart_test.rb
@@ -13,32 +13,32 @@ module ApplicationTests
         teardown_app
       end
 
-      test "rake restart touches tmp/restart.txt" do
+      test "rails restart touches tmp/restart.txt" do
         Dir.chdir(app_path) do
-          `rake restart`
+          `bin/rails restart`
           assert File.exist?("tmp/restart.txt")
 
           prev_mtime = File.mtime("tmp/restart.txt")
           sleep(1)
-          `rake restart`
+          `bin/rails restart`
           curr_mtime = File.mtime("tmp/restart.txt")
           assert_not_equal prev_mtime, curr_mtime
         end
       end
 
-      test "rake restart should work even if tmp folder does not exist" do
+      test "rails restart should work even if tmp folder does not exist" do
         Dir.chdir(app_path) do
           FileUtils.remove_dir("tmp")
-          `rake restart`
+          `bin/rails restart`
           assert File.exist?("tmp/restart.txt")
         end
       end
 
-      test "rake restart removes server.pid also" do
+      test "rails restart removes server.pid also" do
         Dir.chdir(app_path) do
           FileUtils.mkdir_p("tmp/pids")
           FileUtils.touch("tmp/pids/server.pid")
-          `rake restart`
+          `bin/rails restart`
           assert_not File.exist?("tmp/pids/server.pid")
         end
       end
diff --git a/railties/test/application/runner_test.rb b/railties/test/application/runner_test.rb
index 4dc766dfda..77e7a2cca5 100644
--- a/railties/test/application/runner_test.rb
+++ b/railties/test/application/runner_test.rb
@@ -82,7 +82,7 @@ module ApplicationTests
     def test_runner_detects_bad_script_name
       output = Dir.chdir(app_path) { `bin/rails runner "iuiqwiourowe" 2>&1` }
       assert_not $?.success?
-      assert_match "undefined local variable or method `iuiqwiourowe' for main:Object", output
+      assert_match "undefined local variable or method `iuiqwiourowe' for", output
     end
 
     def test_environment_with_rails_env
diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index 838adbbda9..32d2a6857c 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -12,7 +12,7 @@ module ApplicationTests
       teardown_app
     end
 
-    test "truth" do
+    test "simple successful test" do
       app_file "test/unit/foo_test.rb", <<-RUBY
         require 'test_helper'
 
@@ -26,6 +26,38 @@ module ApplicationTests
       assert_successful_test_run "unit/foo_test.rb"
     end
 
+    test "after_run" do
+      app_file "test/unit/foo_test.rb", <<-RUBY
+        require 'test_helper'
+
+        Minitest.after_run { puts "WORLD" }
+        Minitest.after_run { puts "HELLO" }
+
+        class FooTest < ActiveSupport::TestCase
+          def test_truth
+            assert true
+          end
+        end
+      RUBY
+
+      result = assert_successful_test_run "unit/foo_test.rb"
+      assert_equal ["HELLO", "WORLD"], result.scan(/HELLO|WORLD/) # only once and in correct order
+    end
+
+    test "simple failed test" do
+      app_file "test/unit/foo_test.rb", <<-RUBY
+        require 'test_helper'
+
+        class FooTest < ActiveSupport::TestCase
+          def test_truth
+            assert false
+          end
+        end
+      RUBY
+
+      assert_unsuccessful_run "unit/foo_test.rb", "Failed assertion"
+    end
+
     test "integration test" do
       controller "posts", <<-RUBY
         class PostsController < ActionController::Base