diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-09-28 09:21:39 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-09-28 09:21:39 +0200 |
| commit | 805bd7a81a376198b8ae8a90539e6487f3f14ca7 (patch) | |
| tree | c52b5062dd0956106aac73c583569d61989de58f /railties | |
| parent | 20fd3c5255b03f5441bed44b189c0cfa4425d747 (diff) | |
| parent | cc7867da4a670600892b3d0f3d903aa7d556d3d3 (diff) | |
| download | rails-805bd7a81a376198b8ae8a90539e6487f3f14ca7.tar.gz rails-805bd7a81a376198b8ae8a90539e6487f3f14ca7.tar.bz2 rails-805bd7a81a376198b8ae8a90539e6487f3f14ca7.zip | |
Merge pull request #21789 from y-yagi/fix_warning_in_minitest_plugin
check if @rake_patterns is defined
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/test_unit/minitest_plugin.rb | 3 |
1 files changed, 2 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..1923433c4a 100644 --- a/railties/lib/rails/test_unit/minitest_plugin.rb +++ b/railties/lib/rails/test_unit/minitest_plugin.rb @@ -42,7 +42,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"] |