1 files changed, 14 insertions, 1 deletions
diff --git a/railties/lib/rails/test_unit/minitest_plugin.rb b/railties/lib/rails/test_unit/minitest_plugin.rb
index dacab08ec3..3a0a58df88 100644
--- a/railties/lib/rails/test_unit/minitest_plugin.rb
+++ b/railties/lib/rails/test_unit/minitest_plugin.rb
@@ -14,6 +14,8 @@ module Minitest
     opts.separator ""
     opts.separator "    bin/rails test test/controllers test/integration/login_test.rb"
     opts.separator ""
+    opts.separator "By default test failures and errors are reported inline during a run."
+    opts.separator ""
 
     opts.separator "Rails options:"
     opts.on("-e", "--environment ENV",
@@ -26,6 +28,16 @@ module Minitest
       options[:full_backtrace] = true
     end
 
+    opts.on("-d", "--defer-output",
+            "Output test failures and errors after the test run") do
+      options[:output_inline] = false
+    end
+
+    opts.on("-f", "--fail-fast",
+            "Abort test run on first failure") do
+      options[:fail_fast] = true
+    end
+
     options[:patterns] = opts.order!
   end
 
@@ -42,7 +54,8 @@ module Minitest
     ENV["RAILS_ENV"] = options[:environment] || "test"
 
     unless run_with_autorun
-      ::Rails::TestRequirer.require_files @rake_patterns || options[:patterns]
+      patterns = defined?(@rake_patterns) ? @rake_patterns : options[:patterns]
+      ::Rails::TestRequirer.require_files(patterns)
     end
 
     unless options[:full_backtrace] || ENV["BACKTRACE"]