aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/test_unit/test_requirer.rb
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2017-03-05 08:54:28 -0500
committerGitHub <noreply@github.com>2017-03-05 08:54:28 -0500
commit797ed5e61fc906eaa639c14cc063aacdd7f7c68c (patch)
treebea04e746a20c950514082bdfc19cd88cb86333d /railties/lib/rails/test_unit/test_requirer.rb
parent12038f6505cdbcdbea861c7ae5f272e918100e13 (diff)
parent4a77213eead0e33a8158e47525bad3d5e1996300 (diff)
downloadrails-797ed5e61fc906eaa639c14cc063aacdd7f7c68c.tar.gz
rails-797ed5e61fc906eaa639c14cc063aacdd7f7c68c.tar.bz2
rails-797ed5e61fc906eaa639c14cc063aacdd7f7c68c.zip
Merge pull request #28286 from robin850/skip-system-tests-by-default
Avoid running system tests by default
Diffstat (limited to 'railties/lib/rails/test_unit/test_requirer.rb')
-rw-r--r--railties/lib/rails/test_unit/test_requirer.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/railties/lib/rails/test_unit/test_requirer.rb b/railties/lib/rails/test_unit/test_requirer.rb
index fe35934abc..92e5fcf0bc 100644
--- a/railties/lib/rails/test_unit/test_requirer.rb
+++ b/railties/lib/rails/test_unit/test_requirer.rb
@@ -4,10 +4,13 @@ require "rake/file_list"
module Rails
class TestRequirer # :nodoc:
class << self
- def require_files(patterns)
+ def require_files(patterns, exclude_patterns = [])
patterns = expand_patterns(patterns)
- Rake::FileList[patterns.compact.presence || "test/**/*_test.rb"].to_a.each do |file|
+ file_list = Rake::FileList[patterns.compact.presence || "test/**/*_test.rb"]
+ file_list.exclude(exclude_patterns)
+
+ file_list.to_a.each do |file|
require File.expand_path(file)
end
end