fix bad rebase
This commit is contained in:
parent
df010d79a5
commit
95c877c5b9
|
@ -21,7 +21,7 @@ Gem::Specification.new do |s|
|
|||
s.summary = "Capybara aims to simplify the process of integration testing Rack applications, such as Rails, Sinatra or Merb"
|
||||
|
||||
s.add_runtime_dependency("nokogiri", [">= 1.6.8"])
|
||||
s.add_runtime_dependency("mime-types", [">= 2.0"])
|
||||
s.add_runtime_dependency("mini_mime", [">= 0.1.3"])
|
||||
s.add_runtime_dependency("rack", [">= 1.6.0"])
|
||||
s.add_runtime_dependency("rack-test", [">= 0.6.3"])
|
||||
s.add_runtime_dependency("xpath", [">= 2.1", "< 4.0"])
|
||||
|
|
|
@ -185,11 +185,11 @@ module Capybara
|
|||
# @option options :skip_if Value of the filter that will cause it to be skipped
|
||||
#
|
||||
def filter(name, *types_and_options, &block)
|
||||
add_filter(name, Filter, *types_and_options, &block)
|
||||
add_filter(name, Filters::NodeFilter, *types_and_options, &block)
|
||||
end
|
||||
|
||||
def expression_filter(name, *types_and_options, &block)
|
||||
add_filter(name, ExpressionFilter, *types_and_options, &block)
|
||||
add_filter(name, Filters::ExpressionFilter, *types_and_options, &block)
|
||||
end
|
||||
|
||||
def filter_set(name, filters_to_use = nil)
|
||||
|
|
Loading…
Reference in New Issue