diff options
| author | Siva Gollapalli <siva@joshsoftware.com> | 2015-12-29 22:57:27 +0530 |
|---|---|---|
| committer | Siva Gollapalli <siva@joshsoftware.com> | 2016-01-10 22:37:01 +0530 |
| commit | 78b5a01252bccdb326f94e6fd293f1454596c1f8 (patch) | |
| tree | 6c6457323756e5749b2bdffbe10c87b1d2486379 /railties/lib/rails/test_unit | |
| parent | 78edeb33346e13ab33a62d2a6b553aabf5b3186a (diff) | |
| download | rails-78b5a01252bccdb326f94e6fd293f1454596c1f8.tar.gz rails-78b5a01252bccdb326f94e6fd293f1454596c1f8.tar.bz2 rails-78b5a01252bccdb326f94e6fd293f1454596c1f8.zip | |
Added multiple line filters support for test runner
Diffstat (limited to 'railties/lib/rails/test_unit')
| -rw-r--r-- | railties/lib/rails/test_unit/line_filtering.rb | 11 | ||||
| -rw-r--r-- | railties/lib/rails/test_unit/test_requirer.rb | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/railties/lib/rails/test_unit/line_filtering.rb b/railties/lib/rails/test_unit/line_filtering.rb index fb5ff231e4..dab4d3631d 100644 --- a/railties/lib/rails/test_unit/line_filtering.rb +++ b/railties/lib/rails/test_unit/line_filtering.rb @@ -30,9 +30,14 @@ module Rails end def derive_line_filters(patterns) - patterns.map do |file_and_line| - file, line = file_and_line.split(':') - Filter.new(@runnable, file, line) if file + patterns.flat_map do |file_and_line| + file, *lines = file_and_line.split(':') + + if lines.empty? + Filter.new(@runnable, file, nil) if file + else + lines.map { |line| Filter.new(@runnable, file, line) } + end end end end diff --git a/railties/lib/rails/test_unit/test_requirer.rb b/railties/lib/rails/test_unit/test_requirer.rb index 83d2c55ffd..8b9933bed4 100644 --- a/railties/lib/rails/test_unit/test_requirer.rb +++ b/railties/lib/rails/test_unit/test_requirer.rb @@ -15,7 +15,7 @@ module Rails private def expand_patterns(patterns) patterns.map do |arg| - arg = arg.gsub(/:(\d+)?$/, '') + arg = arg.gsub(/(:\d*)+?$/, '') if Dir.exist?(arg) "#{arg}/**/*_test.rb" else |