diff --git a/lib/capybara/node/matchers.rb b/lib/capybara/node/matchers.rb index ccd8f818..099fc879 100644 --- a/lib/capybara/node/matchers.rb +++ b/lib/capybara/node/matchers.rb @@ -743,7 +743,7 @@ module Capybara end def assert_no_ancestor(*args, &optional_filter_block) - _verify_selector_result(args, optional_filter_block, Capybara::Queries::SiblingQuery) do |result, query| + _verify_selector_result(args, optional_filter_block, Capybara::Queries::AncestorQuery) do |result, query| if result.matches_count? && (!result.empty? || query.expects_none?) raise Capybara::ExpectationNotMet, result.negative_failure_message end diff --git a/lib/capybara/rspec/matchers/base.rb b/lib/capybara/rspec/matchers/base.rb index 4315e0f8..f5134d7d 100644 --- a/lib/capybara/rspec/matchers/base.rb +++ b/lib/capybara/rspec/matchers/base.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require 'capybara/rspec/matchers/compound' +require 'capybara/rspec/matchers/count_sugar' module Capybara module RSpecMatchers @@ -66,7 +67,7 @@ module Capybara end class CountableWrappedElementMatcher < WrappedElementMatcher - include CountSugar + include ::Capybara::RSpecMatchers::CountSugar end class NegatedMatcher diff --git a/lib/capybara/rspec/matchers/have_ancestor.rb b/lib/capybara/rspec/matchers/have_ancestor.rb index 92c86c81..570f3549 100644 --- a/lib/capybara/rspec/matchers/have_ancestor.rb +++ b/lib/capybara/rspec/matchers/have_ancestor.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'capybara/rspec/matchers/base' -require 'capybara/rspec/matchers/count_sugar' module Capybara module RSpecMatchers diff --git a/lib/capybara/rspec/matchers/have_selector.rb b/lib/capybara/rspec/matchers/have_selector.rb index 7dc96dd9..bd4def06 100644 --- a/lib/capybara/rspec/matchers/have_selector.rb +++ b/lib/capybara/rspec/matchers/have_selector.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'capybara/rspec/matchers/base' -require 'capybara/rspec/matchers/count_sugar' module Capybara module RSpecMatchers diff --git a/lib/capybara/rspec/matchers/have_sibling.rb b/lib/capybara/rspec/matchers/have_sibling.rb index 0cebefc2..3ab259f4 100644 --- a/lib/capybara/rspec/matchers/have_sibling.rb +++ b/lib/capybara/rspec/matchers/have_sibling.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'capybara/rspec/matchers/base' -require 'capybara/rspec/matchers/count_sugar' module Capybara module RSpecMatchers diff --git a/lib/capybara/rspec/matchers/have_text.rb b/lib/capybara/rspec/matchers/have_text.rb index afdce79b..784ef768 100644 --- a/lib/capybara/rspec/matchers/have_text.rb +++ b/lib/capybara/rspec/matchers/have_text.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'capybara/rspec/matchers/base' -require 'capybara/rspec/matchers/count_sugar' module Capybara module RSpecMatchers diff --git a/lib/capybara/spec/session/has_ancestor_spec.rb b/lib/capybara/spec/session/has_ancestor_spec.rb index 2fdd1aff..8e7fcb06 100644 --- a/lib/capybara/spec/session/has_ancestor_spec.rb +++ b/lib/capybara/spec/session/has_ancestor_spec.rb @@ -39,6 +39,8 @@ Capybara::SpecHelper.spec '#have_no_ancestor' do it 'should assert no matching ancestor' do el = @session.find(:css, '#ancestor1') expect(el).to have_no_ancestor(:css, '#child') + expect(el).to have_no_ancestor(:css, '#ancestor1_sibiling') expect(el).not_to have_ancestor(:css, '#child') + expect(el).not_to have_ancestor(:css, '#ancestor1_sibiling') end end