diff options
author | Yves Senn <yves.senn@gmail.com> | 2015-01-24 12:10:46 +0100 |
---|---|---|
committer | Yves Senn <yves.senn@gmail.com> | 2015-03-18 09:52:18 +0100 |
commit | 613bdd9d4c6b024cbc26186f1ad443faa6cdffb1 (patch) | |
tree | 848606bfca3bb60ec633b2669bc5a87c2cce0cc5 /railties/lib/rails | |
parent | fb2dc2adcad11cea8573536621d9a0841be7901b (diff) | |
download | rails-613bdd9d4c6b024cbc26186f1ad443faa6cdffb1.tar.gz rails-613bdd9d4c6b024cbc26186f1ad443faa6cdffb1.tar.bz2 rails-613bdd9d4c6b024cbc26186f1ad443faa6cdffb1.zip |
get rid of NAMED_PATTERNS in favor of running a whole directory
Diffstat (limited to 'railties/lib/rails')
-rw-r--r-- | railties/lib/rails/test_unit/runner.rb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/railties/lib/rails/test_unit/runner.rb b/railties/lib/rails/test_unit/runner.rb index d84f1cf9af..67c86e0dd0 100644 --- a/railties/lib/rails/test_unit/runner.rb +++ b/railties/lib/rails/test_unit/runner.rb @@ -10,7 +10,7 @@ module Rails options = { backtrace: false, name: nil } opt_parser = ::OptionParser.new do |opts| - opts.banner = "Usage: bin/rails test [options]" + opts.banner = "Usage: bin/rails test [options] [file or directory]" opts.separator "" opts.separator "Filter options:" @@ -47,8 +47,8 @@ module Rails opt_parser.order!(args) if arg = args.shift - if NAMED_PATTERNS.key?(arg) - options[:pattern] = arg + if Dir.exists?(arg) + options[:pattern] = "#{arg}/**/*_test.rb" else options[:filename], options[:line] = arg.split(':') options[:filename] = File.expand_path options[:filename] @@ -89,13 +89,10 @@ module Rails end end - NAMED_PATTERNS = { - "models" => "test/models/**/*_test.rb" - } def test_files return [@options[:filename]] if @options[:filename] if @options[:pattern] - pattern = NAMED_PATTERNS[@options[:pattern]] + pattern = @options[:pattern] else pattern = "test/**/*_test.rb" end |