Move CountSugar inclusion into a base class

.codeclimate.yml

@@ -20,6 +20,7 @@ engines:
     exclude_patterns:
     - "lib/capybara/selector.rb"
     - "lib/capybara/minitest.rb"
+    - "lib/capybara/selector/definiton/"
   eslint:
     enabled: false
   fixme:

lib/capybara/rspec/matchers/base.rb

@@ -65,6 +65,10 @@ module Capybara
         end
       end
 
+      class CountableWrappedElementMatcher < WrappedElementMatcher
+        include CountSugar
+      end
+
       class NegatedMatcher
         include ::Capybara::RSpecMatchers::Matchers::Compound if defined?(::Capybara::RSpecMatchers::Matchers::Compound)
 

lib/capybara/rspec/matchers/have_ancestor.rb

@@ -6,9 +6,7 @@ require 'capybara/rspec/matchers/count_sugar'
 module Capybara
   module RSpecMatchers
     module Matchers
-      class HaveAncestor < WrappedElementMatcher
-        include CountSugar
-
+      class HaveAncestor < CountableWrappedElementMatcher
         def element_matches?(el)
           el.assert_ancestor(*@args, &@filter_block)
         end

lib/capybara/rspec/matchers/have_selector.rb

@@ -6,9 +6,7 @@ require 'capybara/rspec/matchers/count_sugar'
 module Capybara
   module RSpecMatchers
     module Matchers
-      class HaveSelector < WrappedElementMatcher
-        include CountSugar
-
+      class HaveSelector < CountableWrappedElementMatcher
         def element_matches?(el)
           el.assert_selector(*@args, &@filter_block)
         end

lib/capybara/rspec/matchers/have_sibling.rb

@@ -6,9 +6,7 @@ require 'capybara/rspec/matchers/count_sugar'
 module Capybara
   module RSpecMatchers
     module Matchers
-      class HaveSibling < WrappedElementMatcher
-        include CountSugar
-
+      class HaveSibling < CountableWrappedElementMatcher
         def element_matches?(el)
           el.assert_sibling(*@args, &@filter_block)
         end

lib/capybara/rspec/matchers/have_text.rb

@@ -6,9 +6,7 @@ require 'capybara/rspec/matchers/count_sugar'
 module Capybara
   module RSpecMatchers
     module Matchers
-      class HaveText < WrappedElementMatcher
-        include CountSugar
-
+      class HaveText < CountableWrappedElementMatcher
         def element_matches?(el)
           el.assert_text(*@args)
         end