mongoid 5.4.1 → 6.1.1

data/spec/mongoid/matchable/in_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Mongoid::Matchable::In do
 
-  describe "#matches?" do
+  describe "#_matches\?" do
 
     context 'when the attribute is not nil' do
 
@@ -13,14 +13,14 @@ describe Mongoid::Matchable::In do
       context "when the values include the attribute" do
 
         it "returns true" do
-          expect(matcher.matches?("$in" => [/\Afir.*\z/, "second"])).to be true
+          expect(matcher._matches?("$in" => [/\Afir.*\z/, "second"])).to be true
         end
       end
 
       context "when the values don't include the attribute" do
 
         it "returns false" do
-          expect(matcher.matches?("$in" => ["third"])).to be false
+          expect(matcher._matches?("$in" => ["third"])).to be false
         end
       end
     end
@@ -34,14 +34,14 @@ describe Mongoid::Matchable::In do
       context "when the values include the attribute" do
 
         it "returns true" do
-          expect(matcher.matches?("$in" => [/\Afir.*\z/, nil])).to be true
+          expect(matcher._matches?("$in" => [/\Afir.*\z/, nil])).to be true
         end
       end
 
       context "when the values don't include the attribute" do
 
         it "returns false" do
-          expect(matcher.matches?("$in" => ["third"])).to be false
+          expect(matcher._matches?("$in" => ["third"])).to be false
         end
       end
     end

data/spec/mongoid/matchable/lt_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Mongoid::Matchable::Lt do
 
-  describe "#matches?" do
+  describe "#_matches\?" do
 
     context "when the value is larger" do
 
@@ -11,7 +11,7 @@ describe Mongoid::Matchable::Lt do
       end
 
       it "returns false" do
-        expect(matcher.matches?("$lt" => 3)).to be false
+        expect(matcher._matches?("$lt" => 3)).to be false
       end
     end
 
@@ -22,7 +22,7 @@ describe Mongoid::Matchable::Lt do
       end
 
       it "returns false" do
-        expect(matcher.matches?("$lt" => 3)).to be false
+        expect(matcher._matches?("$lt" => 3)).to be false
       end
     end
 
@@ -33,7 +33,7 @@ describe Mongoid::Matchable::Lt do
       end
 
       it "returns true" do
-        expect(matcher.matches?("$lt" => 10)).to be true
+        expect(matcher._matches?("$lt" => 10)).to be true
       end
     end
 
@@ -44,7 +44,7 @@ describe Mongoid::Matchable::Lt do
       end
 
       it "returns false" do
-        expect(matcher.matches?("$lt" => 5)).to be false
+        expect(matcher._matches?("$lt" => 5)).to be false
       end
     end
 
@@ -55,7 +55,7 @@ describe Mongoid::Matchable::Lt do
         end
 
         it "returns true" do
-          expect(matcher.matches?("$lt" => 5)).to be true
+          expect(matcher._matches?("$lt" => 5)).to be true
         end
       end
 
@@ -65,10 +65,21 @@ describe Mongoid::Matchable::Lt do
         end
 
         it "returns false" do
-          expect(matcher.matches?("$lt" => 5)).to be false
+          expect(matcher._matches?("$lt" => 5)).to be false
         end
 
       end
     end
+
+    context "when the value is not numeric" do
+
+      let(:matcher) do
+        described_class.new(5)
+      end
+
+      it "returns false" do
+        expect(matcher._matches?("$lt" => '5.1')).to be false
+      end
+    end
   end
 end

data/spec/mongoid/matchable/lte_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Mongoid::Matchable::Lte do
 
-  describe "#matches?" do
+  describe "#_matches\?" do
 
     context "when the value is larger" do
 
@@ -11,7 +11,7 @@ describe Mongoid::Matchable::Lte do
       end
 
       it "returns false" do
-        expect(matcher.matches?("$lte" => 3)).to be false
+        expect(matcher._matches?("$lte" => 3)).to be false
       end
     end
 
@@ -22,7 +22,7 @@ describe Mongoid::Matchable::Lte do
       end
 
       it "returns true" do
-        expect(matcher.matches?("$lte" => 10)).to be true
+        expect(matcher._matches?("$lte" => 10)).to be true
       end
     end
 
@@ -33,7 +33,7 @@ describe Mongoid::Matchable::Lte do
       end
 
       it "returns true" do
-        expect(matcher.matches?("$lte" => 5)).to be true
+        expect(matcher._matches?("$lte" => 5)).to be true
       end
     end
 
@@ -44,18 +44,19 @@ describe Mongoid::Matchable::Lte do
       end
 
       it "returns false" do
-        expect(matcher.matches?("$lte" => 5)).to be false
+        expect(matcher._matches?("$lte" => 5)).to be false
       end
     end
 
     context "when the value is an array" do
+
       context "there are value valid" do
         let(:matcher) do
           described_class.new([3, 4])
         end
 
         it "returns true" do
-          expect(matcher.matches?("$lte" => 5)).to be true
+          expect(matcher._matches?("$lte" => 5)).to be true
         end
       end
 
@@ -65,9 +66,19 @@ describe Mongoid::Matchable::Lte do
         end
 
         it "returns false" do
-          expect(matcher.matches?("$lte" => 5)).to be false
+          expect(matcher._matches?("$lte" => 5)).to be false
         end
+      end
+    end
 
+    context "when the value is not numeric" do
+
+      let(:matcher) do
+        described_class.new(5)
+      end
+
+      it "returns false" do
+        expect(matcher._matches?("$lte" => '5.1')).to be false
       end
     end
   end

data/spec/mongoid/matchable/ne_spec.rb

@@ -6,19 +6,19 @@ describe Mongoid::Matchable::Ne do
     described_class.new("first")
   end
 
-  describe "#matches?" do
+  describe "#_matches?" do
 
     context "when the values are not equal" do
 
       it "returns true" do
-        expect(matcher.matches?("$ne" => "second")).to be true
+        expect(matcher._matches?("$ne" => "second")).to be true
       end
     end
 
     context "when the values are equal" do
 
       it "returns false" do
-        expect(matcher.matches?("$ne" => "first")).to be false
+        expect(matcher._matches?("$ne" => "first")).to be false
       end
     end
 
@@ -31,14 +31,14 @@ describe Mongoid::Matchable::Ne do
       context "when the value is in the array" do
 
         it "returns false" do
-          expect(array_matcher.matches?("$ne" => "first")).to be false
+          expect(array_matcher._matches?("$ne" => "first")).to be false
         end
       end
 
       context "when the value is not in the array" do
 
         it "returns true" do
-          expect(array_matcher.matches?("$ne" => "second")).to be true
+          expect(array_matcher._matches?("$ne" => "second")).to be true
         end
       end
     end

data/spec/mongoid/matchable/nin_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Mongoid::Matchable::Nin do
 
-  describe "#matches?" do
+  describe "#_matches?" do
 
     context 'when the attribute is not nil' do
 
@@ -13,14 +13,14 @@ describe Mongoid::Matchable::Nin do
       context "when the values do not contain the attribute" do
 
         it "returns true" do
-          expect(matcher.matches?("$nin" => ["second", "third"])).to be true
+          expect(matcher._matches?("$nin" => ["second", "third"])).to be true
         end
       end
 
       context "when the values contain the attribute" do
 
         it "returns false" do
-          expect(matcher.matches?("$nin" => ["first"])).to be false
+          expect(matcher._matches?("$nin" => ["first"])).to be false
         end
       end
     end
@@ -33,14 +33,14 @@ describe Mongoid::Matchable::Nin do
       context "when the values do not contain the attribute" do
 
         it "returns true" do
-          expect(matcher.matches?("$nin" => ["third"])).to be true
+          expect(matcher._matches?("$nin" => ["third"])).to be true
         end
       end
 
       context "when the values contain the attribute" do
 
         it "returns false" do
-          expect(matcher.matches?("$nin" => [/\Afir.*\z/, nil])).to be false
+          expect(matcher._matches?("$nin" => [/\Afir.*\z/, nil])).to be false
         end
       end
     end

data/spec/mongoid/matchable/or_spec.rb

@@ -10,14 +10,14 @@ describe Mongoid::Matchable::Or do
     described_class.new("value", person)
   end
 
-  describe "#matches?" do
+  describe "#_matches?" do
 
     context "when provided a simple expression" do
 
       context "when any of the values are equal" do
 
         let(:matches) do
-          matcher.matches?(
+          matcher._matches?(
             [ { title: "Sir" }, { title: "King" } ]
           )
         end
@@ -34,14 +34,14 @@ describe Mongoid::Matchable::Or do
       context "when none of the values are equal" do
 
         it "returns false" do
-          expect(matcher.matches?([])).to be false
+          expect(matcher._matches?([])).to be false
         end
       end
 
       context "when the expression is a $not" do
 
         let(:matches) do
-          matcher.matches?([ { title: {:$not => /Foobar/ } }])
+          matcher._matches?([ { title: {:$not => /Foobar/ } }])
         end
 
         context "when the value matches" do
@@ -69,7 +69,7 @@ describe Mongoid::Matchable::Or do
       context "when any of the values are equal" do
 
         let(:matches) do
-          matcher.matches?(
+          matcher._matches?(
             [
               { title: { "$in" => [ "Sir", "Madam" ] } },
               { title: "King" }
@@ -89,7 +89,7 @@ describe Mongoid::Matchable::Or do
       context "when none of the values are equal" do
 
         let(:matches) do
-          matcher.matches?(
+          matcher._matches?(
             [
               { title: { "$in" => [ "Prince", "Madam" ] } },
               { title: "King" }
@@ -109,7 +109,7 @@ describe Mongoid::Matchable::Or do
       context "when expression contain multiple fields" do
 
         let(:matches) do
-          matcher.matches?(
+          matcher._matches?(
             [
               { title: "Sir", age: 23 },
               { title: "King", age: 100 }

data/spec/mongoid/matchable/regexp_spec.rb

@@ -10,7 +10,7 @@ describe Mongoid::Matchable::Regexp do
     'Emily'
   end
 
-  describe '#matches?' do
+  describe '#_matches?' do
 
     context 'when a BSON::Regexp::Raw object is passed' do
 
@@ -19,7 +19,7 @@ describe Mongoid::Matchable::Regexp do
       end
 
       it 'compiles the regexp object to a native regexp for the matching' do
-        expect(matcher.matches?(regexp)).to be(true)
+        expect(matcher._matches?(regexp)).to be(true)
       end
 
       context 'when the value does not match the attribute' do
@@ -29,7 +29,7 @@ describe Mongoid::Matchable::Regexp do
         end
 
         it 'compiles the regexp object to a native regexp for the matching' do
-          expect(matcher.matches?(regexp)).to be(false)
+          expect(matcher._matches?(regexp)).to be(false)
         end
       end
     end
@@ -41,7 +41,7 @@ describe Mongoid::Matchable::Regexp do
       end
 
       it 'calls super with the native regexp' do
-        expect(matcher.matches?(regexp)).to be(true)
+        expect(matcher._matches?(regexp)).to be(true)
       end
 
       context 'when the value does not match the attribute' do
@@ -51,7 +51,7 @@ describe Mongoid::Matchable::Regexp do
         end
 
         it 'compiles the regexp object to a native regexp for the matching' do
-          expect(matcher.matches?(regexp)).to be(false)
+          expect(matcher._matches?(regexp)).to be(false)
         end
       end
     end

data/spec/mongoid/matchable/size_spec.rb

@@ -6,19 +6,19 @@ describe Mongoid::Matchable::Size do
     described_class.new(["first", "second"])
   end
 
-  describe "#matches?" do
+  describe "#_matches?" do
 
     context "when the attribute is the same size" do
 
       it "returns true" do
-        expect(matcher.matches?("$size" => 2)).to be true
+        expect(matcher._matches?("$size" => 2)).to be true
       end
     end
 
     context "when the attribute is not the same size" do
 
       it "returns false" do
-        expect(matcher.matches?("$size" => 5)).to be false
+        expect(matcher._matches?("$size" => 5)).to be false
       end
     end
   end

data/spec/mongoid/matchable_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Mongoid::Matchable do
 
-  describe "#matches?" do
+  describe "#_matches?" do
 
     context "when document is embeded" do
 
@@ -26,7 +26,7 @@ describe Mongoid::Matchable do
         end
 
         it "returns false" do
-          expect(document.locations.first.matches?(selector)).to be false
+          expect(document.locations.first._matches?(selector)).to be false
         end
 
         context "when just change the selector order" do
@@ -36,7 +36,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false " do
-            expect(document.locations.first.matches?(selector)).to be false
+            expect(document.locations.first._matches?(selector)).to be false
           end
         end
       end
@@ -50,7 +50,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.locations.first.matches?(selector)).to be true
+            expect(document.locations.first._matches?(selector)).to be true
           end
         end
 
@@ -61,7 +61,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.locations.first.matches?(selector)).to be false
+            expect(document.locations.first._matches?(selector)).to be false
           end
         end
 
@@ -72,7 +72,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.locations.first.matches?(selector)).to be false
+            expect(document.locations.first._matches?(selector)).to be false
           end
         end
       end
@@ -88,7 +88,7 @@ describe Mongoid::Matchable do
           end
           
           it "returns true" do
-            expect(document.locations.first.matches?(selector)).to be true
+            expect(document.locations.first._matches?(selector)).to be true
           end
         end
 
@@ -99,7 +99,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.locations.first.matches?(selector)).to be false
+            expect(document.locations.first._matches?(selector)).to be false
           end
         end
       end
@@ -113,7 +113,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.locations.first.matches?(selector)).to be true
+            expect(document.locations.first._matches?(selector)).to be true
           end
         end
 
@@ -124,7 +124,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.locations.first.matches?(selector)).to be false
+            expect(document.locations.first._matches?(selector)).to be false
           end
         end
 
@@ -135,11 +135,131 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.locations.first.matches?(selector)).to be false
+            expect(document.locations.first._matches?(selector)).to be false
           end
         end
       end
 
+      context "when using $elemMatch" do
+
+        context "one predicate" do
+
+          let(:selector) do
+            {
+              "occupants" => {"$elemMatch" => {"name" => "Tim"}}
+            }
+          end
+
+          context "and there is a matching sub document" do
+
+            it "returns true" do
+              expect(document.locations.first._matches?(selector)).to be true
+            end
+
+            context "using $in" do
+              let(:selector) do
+                {
+                  "occupants" => {"$elemMatch" => {"name" => {"$in" => ["Tim", "Alice"]}}}
+                }
+              end
+
+              it "returns true" do
+                expect(document.locations.first._matches?(selector)).to be true
+              end
+            end
+          end
+
+          context "and there is not a matching sub document" do
+
+            let(:selector) do
+              {
+                "occupants" => {"$elemMatch" => {"name" => "Lyle"}}
+              }
+            end
+
+            it "returns false" do
+              expect(document.locations.first._matches?(selector)).to be false
+            end
+
+            context "using $in" do
+              let(:selector) do
+                {
+                  "occupants" => {"$elemMatch" => {"name" => {"$in" => ["Lyfe", "Alice"]}}}
+                }
+              end
+
+              it "returns false" do
+                expect(document.locations.first._matches?(selector)).to be false
+              end
+            end
+          end
+        end
+
+        context "multiple predicates" do
+
+          before do
+            document.locations = [
+              Location.new(
+                name: 'No.1',
+                info: { 'door' => 'Red'},
+                occupants: [{'name' => 'Tim', 'eye_color' => 'brown'}, {'name' => 'Alice', 'eye_color' => 'blue'}]
+              )
+            ]
+          end
+
+          let(:selector) do
+            {
+              "occupants" => {"$elemMatch" => {"name" => "Tim", "eye_color" => "brown"}}
+            }
+          end
+
+          context "and there is a matching sub document" do
+
+            it "returns true" do
+              expect(document.locations.first._matches?(selector)).to be true
+            end
+
+            context "using $in and $ne in the $elemMatch to include the element" do
+
+              let(:selector) do
+                {
+                  "occupants" => {"$elemMatch" => {"name" => {"$in" => ["Tim"]}, "eye_color" => {"$ne" => "blue"}}}
+                }
+              end
+
+              it "returns true" do
+                expect(document.locations.first._matches?(selector)).to be true
+              end
+            end
+          end
+
+          context "and there is not a matching sub document" do
+
+            let(:selector) do
+              {
+                "occupants" => {"$elemMatch" => {"name" => "Tim", "eye_color" => "blue"}}
+              }
+            end
+
+            it "returns false" do
+              expect(document.locations.first._matches?(selector)).to be false
+            end
+
+            context "using $ne in the $elemMatch to exclude the element" do
+
+              let(:selector) do
+                {
+                  "occupants" => {"$elemMatch" => {"name" => {"$in" => ["Tim"]}, "eye_color" => {"$ne" => "brown"}}}
+                }
+              end
+
+              it "returns false" do
+                expect(document.locations.first._matches?(selector)).to be false
+              end
+            end
+          end
+        end
+      end
     end
 
     context "when performing simple matching" do
@@ -155,7 +275,7 @@ describe Mongoid::Matchable do
         end
 
         it "returns true" do
-          expect(document.matches?(selector)).to be true
+          expect(document._matches?(selector)).to be true
         end
       end
 
@@ -166,7 +286,7 @@ describe Mongoid::Matchable do
         end
 
         it "returns false" do
-          expect(document.matches?(selector)).to be false
+          expect(document._matches?(selector)).to be false
         end
       end
 
@@ -177,7 +297,7 @@ describe Mongoid::Matchable do
         end
 
         it "returns true" do
-          expect(document.matches?(selector)).to be true
+          expect(document._matches?(selector)).to be true
         end
       end
 
@@ -188,7 +308,7 @@ describe Mongoid::Matchable do
         end
 
         it "returns true" do
-          expect(document.matches?(selector)).to be true
+          expect(document._matches?(selector)).to be true
         end
       end
     end
@@ -213,7 +333,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -224,7 +344,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -238,7 +358,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -249,7 +369,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -263,7 +383,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -274,7 +394,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -288,7 +408,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -299,7 +419,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -313,7 +433,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -324,7 +444,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -338,7 +458,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -349,7 +469,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -367,7 +487,7 @@ describe Mongoid::Matchable do
             end
 
             it "returns true" do
-              expect(document.matches?(selector)).to be true
+              expect(document._matches?(selector)).to be true
             end
           end
 
@@ -380,7 +500,7 @@ describe Mongoid::Matchable do
             end
 
             it "returns false" do
-              expect(document.matches?(selector)).to be false
+              expect(document._matches?(selector)).to be false
             end
           end
         end
@@ -400,7 +520,7 @@ describe Mongoid::Matchable do
                 end
 
                 it "returns true" do
-                  expect(document.matches?(selector)).to be true
+                  expect(document._matches?(selector)).to be true
                 end
               end
 
@@ -413,7 +533,7 @@ describe Mongoid::Matchable do
                 end
 
                 it "returns false" do
-                  expect(document.matches?(selector)).to be false
+                  expect(document._matches?(selector)).to be false
                 end
               end
             end
@@ -429,7 +549,7 @@ describe Mongoid::Matchable do
                 end
 
                 it "returns true" do
-                  expect(document.matches?(selector)).to be true
+                  expect(document._matches?(selector)).to be true
                 end
               end
 
@@ -442,7 +562,7 @@ describe Mongoid::Matchable do
                 end
 
                 it "returns false" do
-                  expect(document.matches?(selector)).to be false
+                  expect(document._matches?(selector)).to be false
                 end
               end
             end
@@ -460,7 +580,7 @@ describe Mongoid::Matchable do
             end
 
             it "returns true" do
-              expect(document.matches?(selector)).to be true
+              expect(document._matches?(selector)).to be true
             end
           end
 
@@ -473,7 +593,7 @@ describe Mongoid::Matchable do
             end
 
             it "returns false" do
-              expect(document.matches?(selector)).to be false
+              expect(document._matches?(selector)).to be false
             end
           end
         end
@@ -488,7 +608,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -499,7 +619,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -513,7 +633,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -524,7 +644,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -538,7 +658,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -549,7 +669,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -563,7 +683,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -574,7 +694,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -588,7 +708,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -599,7 +719,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -613,7 +733,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -624,7 +744,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -638,7 +758,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -649,7 +769,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -663,7 +783,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -674,7 +794,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end
@@ -688,7 +808,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns true" do
-            expect(document.matches?(selector)).to be true
+            expect(document._matches?(selector)).to be true
           end
         end
 
@@ -699,7 +819,7 @@ describe Mongoid::Matchable do
           end
 
           it "returns false" do
-            expect(document.matches?(selector)).to be false
+            expect(document._matches?(selector)).to be false
           end
         end
       end