1 files changed, 78 insertions, 45 deletions
diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index 85b003fce9..0a51e98656 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -1,4 +1,6 @@
-require 'isolation/abstract_unit'
+# frozen_string_literal: true
+
+require "isolation/abstract_unit"
 
 module ApplicationTests
   class TestTest < ActiveSupport::TestCase
@@ -6,15 +8,14 @@ module ApplicationTests
 
     def setup
       build_app
-      boot_rails
     end
 
     def teardown
       teardown_app
     end
 
-    test "truth" do
-      app_file 'test/unit/foo_test.rb', <<-RUBY
+    test "simple successful test" do
+      app_file "test/unit/foo_test.rb", <<-RUBY
         require 'test_helper'
 
         class FooTest < ActiveSupport::TestCase
@@ -24,20 +25,52 @@ module ApplicationTests
         end
       RUBY
 
-      assert_successful_test_run 'unit/foo_test.rb'
+      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", "Failure:\nFooTest#test_truth"
     end
 
     test "integration test" do
-      controller 'posts', <<-RUBY
+      controller "posts", <<-RUBY
         class PostsController < ActionController::Base
         end
       RUBY
 
-      app_file 'app/views/posts/index.html.erb', <<-HTML
+      app_file "app/views/posts/index.html.erb", <<-HTML
         Posts#index
       HTML
 
-      app_file 'test/integration/posts_test.rb', <<-RUBY
+      app_file "test/integration/posts_test.rb", <<-RUBY
         require 'test_helper'
 
         class PostsTest < ActionDispatch::IntegrationTest
@@ -49,11 +82,11 @@ module ApplicationTests
         end
       RUBY
 
-      assert_successful_test_run 'integration/posts_test.rb'
+      assert_successful_test_run "integration/posts_test.rb"
     end
 
     test "enable full backtraces on test failures" do
-      app_file 'test/unit/failing_test.rb', <<-RUBY
+      app_file "test/unit/failing_test.rb", <<-RUBY
         require 'test_helper'
 
         class FailingTest < ActiveSupport::TestCase
@@ -63,16 +96,16 @@ module ApplicationTests
         end
       RUBY
 
-      output = run_test_file('unit/failing_test.rb', env: { "BACKTRACE" => "1" })
+      output = run_test_file("unit/failing_test.rb", env: { "BACKTRACE" => "1" })
       assert_match %r{test/unit/failing_test\.rb}, output
       assert_match %r{test/unit/failing_test\.rb:4}, output
     end
 
     test "ruby schema migrations" do
-      output  = script('generate model user name:string')
+      output  = rails("generate", "model", "user", "name:string")
       version = output.match(/(\d+)_create_users\.rb/)[1]
 
-      app_file 'test/models/user_test.rb', <<-RUBY
+      app_file "test/models/user_test.rb", <<-RUBY
         require 'test_helper'
 
         class UserTest < ActiveSupport::TestCase
@@ -81,11 +114,11 @@ module ApplicationTests
           end
         end
       RUBY
-      app_file 'db/schema.rb', ''
+      app_file "db/schema.rb", ""
 
       assert_unsuccessful_run "models/user_test.rb", "Migrations are pending"
 
-      app_file 'db/schema.rb', <<-RUBY
+      app_file "db/schema.rb", <<-RUBY
         ActiveRecord::Schema.define(version: #{version}) do
           create_table :users do |t|
             t.string :name
@@ -93,7 +126,7 @@ module ApplicationTests
         end
       RUBY
 
-      app_file 'config/initializers/disable_maintain_test_schema.rb', <<-RUBY
+      app_file "config/initializers/disable_maintain_test_schema.rb", <<-RUBY
         Rails.application.config.active_record.maintain_test_schema = false
       RUBY
 
@@ -101,15 +134,15 @@ module ApplicationTests
 
       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)")
+      result = assert_successful_test_run("models/user_test.rb")
+      assert_not_includes result, "create_table(:users)"
     end
 
     test "sql structure migrations" do
-      output  = script('generate model user name:string')
+      output  = rails("generate", "model", "user", "name:string")
       version = output.match(/(\d+)_create_users\.rb/)[1]
 
-      app_file 'test/models/user_test.rb', <<-RUBY
+      app_file "test/models/user_test.rb", <<-RUBY
         require 'test_helper'
 
         class UserTest < ActiveSupport::TestCase
@@ -119,21 +152,21 @@ module ApplicationTests
         end
       RUBY
 
-      app_file 'db/structure.sql', ''
-      app_file 'config/initializers/enable_sql_schema_format.rb', <<-RUBY
+      app_file "db/structure.sql", ""
+      app_file "config/initializers/enable_sql_schema_format.rb", <<-RUBY
         Rails.application.config.active_record.schema_format = :sql
       RUBY
 
       assert_unsuccessful_run "models/user_test.rb", "Migrations are pending"
 
-      app_file 'db/structure.sql', <<-SQL
+      app_file "db/structure.sql", <<-SQL
         CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL);
         CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version");
         CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255));
         INSERT INTO schema_migrations (version) VALUES ('#{version}');
       SQL
 
-      app_file 'config/initializers/disable_maintain_test_schema.rb', <<-RUBY
+      app_file "config/initializers/disable_maintain_test_schema.rb", <<-RUBY
         Rails.application.config.active_record.maintain_test_schema = false
       RUBY
 
@@ -141,14 +174,14 @@ module ApplicationTests
 
       File.delete "#{app_path}/config/initializers/disable_maintain_test_schema.rb"
 
-      assert_successful_test_run('models/user_test.rb')
+      assert_successful_test_run("models/user_test.rb")
     end
 
     test "sql structure migrations when adding column to existing table" do
-      output_1  = script('generate model user name:string')
+      output_1  = rails("generate", "model", "user", "name:string")
       version_1 = output_1.match(/(\d+)_create_users\.rb/)[1]
 
-      app_file 'test/models/user_test.rb', <<-RUBY
+      app_file "test/models/user_test.rb", <<-RUBY
         require 'test_helper'
         class UserTest < ActiveSupport::TestCase
           test "user" do
@@ -157,23 +190,23 @@ module ApplicationTests
         end
       RUBY
 
-      app_file 'config/initializers/enable_sql_schema_format.rb', <<-RUBY
+      app_file "config/initializers/enable_sql_schema_format.rb", <<-RUBY
         Rails.application.config.active_record.schema_format = :sql
       RUBY
 
-      app_file 'db/structure.sql', <<-SQL
+      app_file "db/structure.sql", <<-SQL
         CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL);
         CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version");
         CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255));
         INSERT INTO schema_migrations (version) VALUES ('#{version_1}');
       SQL
 
-      assert_successful_test_run('models/user_test.rb')
+      assert_successful_test_run("models/user_test.rb")
 
-      output_2  = script('generate migration add_email_to_users')
+      output_2  = rails("generate", "migration", "add_email_to_users")
       version_2 = output_2.match(/(\d+)_add_email_to_users\.rb/)[1]
 
-      app_file 'test/models/user_test.rb', <<-RUBY
+      app_file "test/models/user_test.rb", <<-RUBY
         require 'test_helper'
 
         class UserTest < ActiveSupport::TestCase
@@ -183,7 +216,7 @@ module ApplicationTests
         end
       RUBY
 
-      app_file 'db/structure.sql', <<-SQL
+      app_file "db/structure.sql", <<-SQL
         CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL);
         CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version");
         CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "email" varchar(255));
@@ -191,17 +224,17 @@ module ApplicationTests
         INSERT INTO schema_migrations (version) VALUES ('#{version_2}');
       SQL
 
-      assert_successful_test_run('models/user_test.rb')
+      assert_successful_test_run("models/user_test.rb")
     end
 
     # TODO: would be nice if we could detect the schema change automatically.
     # For now, the user has to synchronize the schema manually.
     # This test-case serves as a reminder for this use-case.
     test "manually synchronize test schema after rollback" do
-      output  = script('generate model user name:string')
+      output  = rails("generate", "model", "user", "name:string")
       version = output.match(/(\d+)_create_users\.rb/)[1]
 
-      app_file 'test/models/user_test.rb', <<-RUBY
+      app_file "test/models/user_test.rb", <<-RUBY
         require 'test_helper'
 
         class UserTest < ActiveSupport::TestCase
@@ -210,7 +243,7 @@ module ApplicationTests
           end
         end
       RUBY
-      app_file 'db/schema.rb', <<-RUBY
+      app_file "db/schema.rb", <<-RUBY
         ActiveRecord::Schema.define(version: #{version}) do
           create_table :users do |t|
             t.string :name
@@ -221,7 +254,7 @@ module ApplicationTests
       assert_successful_test_run "models/user_test.rb"
 
       # Simulate `db:rollback` + edit of the migration file + `db:migrate`
-      app_file 'db/schema.rb', <<-RUBY
+      app_file "db/schema.rb", <<-RUBY
         ActiveRecord::Schema.define(version: #{version}) do
           create_table :users do |t|
             t.string :name
@@ -232,7 +265,7 @@ module ApplicationTests
 
       assert_successful_test_run "models/user_test.rb"
 
-      Dir.chdir(app_path) { `bin/rails db:test:prepare` }
+      rails "db:test:prepare"
 
       assert_unsuccessful_run "models/user_test.rb", <<-ASSERTION
 Expected: ["id", "name"]
@@ -241,10 +274,10 @@ Expected: ["id", "name"]
     end
 
     test "hooks for plugins" do
-      output  = script('generate model user name:string')
+      output  = rails("generate", "model", "user", "name:string")
       version = output.match(/(\d+)_create_users\.rb/)[1]
 
-      app_file 'lib/tasks/hooks.rake', <<-RUBY
+      app_file "lib/tasks/hooks.rake", <<-RUBY
         task :before_hook do
           has_user_table = ActiveRecord::Base.connection.table_exists?('users')
           puts "before: " + has_user_table.to_s
@@ -259,7 +292,7 @@ Expected: ["id", "name"]
           Rake::Task[:after_hook].invoke
         end
       RUBY
-      app_file 'test/models/user_test.rb', <<-RUBY
+      app_file "test/models/user_test.rb", <<-RUBY
         require 'test_helper'
         class UserTest < ActiveSupport::TestCase
           test "user" do
@@ -269,7 +302,7 @@ Expected: ["id", "name"]
       RUBY
 
       # Simulate `db:migrate`
-      app_file 'db/schema.rb', <<-RUBY
+      app_file "db/schema.rb", <<-RUBY
         ActiveRecord::Schema.define(version: #{version}) do
           create_table :users do |t|
             t.string :name
@@ -290,7 +323,7 @@ Expected: ["id", "name"]
       def assert_unsuccessful_run(name, message)
         result = run_test_file(name)
         assert_not_equal 0, $?.to_i
-        assert result.include?(message)
+        assert_includes result, message
         result
       end
 
@@ -301,7 +334,7 @@ Expected: ["id", "name"]
       end
 
       def run_test_file(name, options = {})
-        Dir.chdir(app_path) { `bin/rails test "#{app_path}/test/#{name}" 2>&1` }
+        rails "test", "#{app_path}/test/#{name}", allow_failure: true
       end
   end
 end