diff options
| author | Chris Kottom <chris@chriskottom.com> | 2015-11-30 19:13:14 +0100 |
|---|---|---|
| committer | Chris Kottom <chris@chriskottom.com> | 2015-11-30 19:13:14 +0100 |
| commit | 9ebda29135acde842e180169c69ce07076bbdd6b (patch) | |
| tree | 6655b4567fa1455624782646826700daa3f5da43 /railties | |
| parent | f746534ca4654112453a7e4904acaed148314764 (diff) | |
| download | rails-9ebda29135acde842e180169c69ce07076bbdd6b.tar.gz rails-9ebda29135acde842e180169c69ce07076bbdd6b.tar.bz2 rails-9ebda29135acde842e180169c69ce07076bbdd6b.zip | |
allow use of minitest-rails gem with test runner
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG.md | 6 | ||||
| -rw-r--r-- | railties/lib/rails/test_unit/minitest_plugin.rb | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 15cf087ddf..d20ec75b61 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,9 @@ +* Allow use of minitest-rails gem with Rails test runner. + + Fixes #22455. + + *Chris Kottom* + * Add `bin/test` script to rails plugin. `bin/test` can use the same API as `bin/rails test`. diff --git a/railties/lib/rails/test_unit/minitest_plugin.rb b/railties/lib/rails/test_unit/minitest_plugin.rb index 959c83b27c..4e1fb13009 100644 --- a/railties/lib/rails/test_unit/minitest_plugin.rb +++ b/railties/lib/rails/test_unit/minitest_plugin.rb @@ -14,7 +14,7 @@ module Minitest SummaryReporter.prepend AggregatedResultSuppresion def self.plugin_rails_options(opts, options) - executable = Rails::TestUnitReporter.executable + executable = ::Rails::TestUnitReporter.executable opts.separator "" opts.separator "Usage: #{executable} [options] [files or directories]" opts.separator "You can run a single test by appending a line number to a filename:" |