2 files changed, 0 insertions, 64 deletions
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb
index ae6f00b861..d9a668c0ea 100644
--- a/activesupport/lib/active_support/test_case.rb
+++ b/activesupport/lib/active_support/test_case.rb
@@ -9,7 +9,6 @@ require 'active_support/testing/isolation'
 require 'active_support/testing/constant_lookup'
 require 'active_support/testing/time_helpers'
 require 'active_support/testing/file_fixtures'
-require 'active_support/testing/composite_filter'
 require 'active_support/core_ext/kernel/reporting'
 
 module ActiveSupport
@@ -39,15 +38,6 @@ module ActiveSupport
       def test_order
         ActiveSupport.test_order ||= :random
       end
-
-      def run(reporter, options = {})
-        if options[:patterns] && options[:patterns].any? { |p| p =~ /:\d+/ }
-          options[:filter] = \
-            Testing::CompositeFilter.new(self, options[:filter], options[:patterns])
-        end
-
-        super
-      end
     end
 
     alias_method :method_name, :name
diff --git a/activesupport/lib/active_support/testing/composite_filter.rb b/activesupport/lib/active_support/testing/composite_filter.rb
deleted file mode 100644
index bde723e30b..0000000000
--- a/activesupport/lib/active_support/testing/composite_filter.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-require 'method_source'
-
-module ActiveSupport
-  module Testing
-    class CompositeFilter # :nodoc:
-      def initialize(runnable, filter, patterns)
-        @runnable = runnable
-        @filters = [ derive_regexp(filter), *derive_line_filters(patterns) ].compact
-      end
-
-      def ===(method)
-        @filters.any? { |filter| filter === method }
-      end
-
-      private
-        def derive_regexp(filter)
-          filter =~ %r%/(.*)/% ? Regexp.new($1) : filter
-        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
-          end
-        end
-
-        class Filter # :nodoc:
-          def initialize(runnable, file, line)
-            @runnable, @file = runnable, File.expand_path(file)
-            @line = line.to_i if line
-          end
-
-          def ===(method)
-            return unless @runnable.method_defined?(method)
-
-            if @line
-              test_file, test_range = definition_for(@runnable.instance_method(method))
-              test_file == @file && test_range.include?(@line)
-            else
-              @runnable.instance_method(method).source_location.first == @file
-            end
-          end
-
-          private
-            def definition_for(method)
-              file, start_line = method.source_location
-              end_line = method.source.count("\n") + start_line - 1
-
-              return file, start_line..end_line
-            end
-        end
-    end
-  end
-end