mongoid 5.4.1 → 7.4.0

data/spec/mongoid/criteria/findable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Criteria::Findable do
@@ -7,11 +9,11 @@ describe Mongoid::Criteria::Findable do
     context "when finding by a document" do
 
       let(:band) do
-        Band.create(name: "Tool")
+        Band.create!(name: "Tool")
       end
 
       let!(:record) do
-        band.records.create(name: "Undertow")
+        band.records.create!(name: "Undertow")
       end
 
       context "when the document is the root" do
@@ -35,12 +37,48 @@ describe Mongoid::Criteria::Findable do
           expect(found).to eq(band)
         end
       end
+
+      context 'when criteria has additional conditions' do
+        let(:band) do
+          Band.create!(name: "Tool")
+        end
+
+        let(:found) do
+          Band.where(name: 'Blah').find(band.id)
+        end
+
+        it 'respects conditions' do
+          expect do
+            found
+          end.to raise_error(Mongoid::Errors::DocumentNotFound)
+        end
+      end
+
+      context 'when criteria has additional conditions on id' do
+        let(:band) do
+          Band.create!(name: "Tool")
+        end
+
+        let(:other) do
+          Band.create!(name: "Other")
+        end
+
+        let(:found) do
+          Band.where(id: other.id).find(band.id)
+        end
+
+        it 'respects both conditions' do
+          expect do
+            found
+          end.to raise_error(Mongoid::Errors::DocumentNotFound)
+        end
+      end
     end
 
     context "when using object ids" do
 
       let!(:band) do
-        Band.create
+        Band.create!
       end
 
       context "when providing a single id" do
@@ -110,7 +148,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing a splat of ids" do
 
         let!(:band_two) do
-          Band.create(name: "Tool")
+          Band.create!(name: "Tool")
         end
 
         context "when all ids match" do
@@ -182,7 +220,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing an array of ids" do
 
         let!(:band_two) do
-          Band.create(name: "Tool")
+          Band.create!(name: "Tool")
         end
 
         context "when all ids match" do
@@ -307,7 +345,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing a splat of extended json ids" do
 
         let!(:band_two) do
-          Band.create(name: "Tool")
+          Band.create!(name: "Tool")
         end
 
         context "when all ids match" do
@@ -379,7 +417,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing an array of extended json ids" do
 
         let!(:band_two) do
-          Band.create(name: "Tool")
+          Band.create!(name: "Tool")
         end
 
         context "when all ids match" do
@@ -460,7 +498,7 @@ describe Mongoid::Criteria::Findable do
       end
 
       let!(:band) do
-        Band.create do |band|
+        Band.create! do |band|
           band.id = "tool"
         end
       end
@@ -521,7 +559,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing a splat of ids" do
 
         let!(:band_two) do
-          Band.create do |band|
+          Band.create! do |band|
             band.id = "depeche-mode"
           end
         end
@@ -584,7 +622,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing an array of ids" do
 
         let!(:band_two) do
-          Band.create do |band|
+          Band.create! do |band|
             band.id = "depeche-mode"
           end
         end
@@ -656,7 +694,7 @@ describe Mongoid::Criteria::Findable do
       end
 
       let!(:band) do
-        Band.create do |band|
+        Band.create! do |band|
           band.id = {"new-order" => true, "Depeche Mode" => false}
         end
       end
@@ -717,7 +755,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing a splat of ids" do
 
         let!(:band_two) do
-          Band.create do |band|
+          Band.create! do |band|
             band.id = {"Radiohead" => false, "Nirvana"=> true}
           end
         end
@@ -780,7 +818,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing an array of ids" do
 
         let!(:band_two) do
-          Band.create do |band|
+          Band.create! do |band|
             band.id = {"Radiohead" => false, "Nirvana"=> true}
           end
         end
@@ -852,7 +890,7 @@ describe Mongoid::Criteria::Findable do
       end
 
       let!(:band) do
-        Band.create do |band|
+        Band.create! do |band|
           band.id = 1
         end
       end
@@ -913,7 +951,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing a splat of ids" do
 
         let!(:band_two) do
-          Band.create do |band|
+          Band.create! do |band|
             band.id = 2
           end
         end
@@ -976,7 +1014,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing an array of ids" do
 
         let!(:band_two) do
-          Band.create do |band|
+          Band.create! do |band|
             band.id = 2
           end
         end
@@ -1039,7 +1077,7 @@ describe Mongoid::Criteria::Findable do
       context "when providing a range" do
 
         let!(:band_two) do
-          Band.create do |band|
+          Band.create! do |band|
             band.id = 2
           end
         end
@@ -1111,7 +1149,7 @@ describe Mongoid::Criteria::Findable do
     context "when using string and object ids" do
 
       let!(:band) do
-        Band.create
+        Band.create!
       end
 
       context "when providing multiple ids" do
@@ -1151,11 +1189,11 @@ describe Mongoid::Criteria::Findable do
   describe "#multiple_from__db" do
 
     let!(:band) do
-      Band.create(name: "Depeche Mode")
+      Band.create!(name: "Depeche Mode")
     end
 
     let!(:band_two) do
-      Band.create(name: "Tool")
+      Band.create!(name: "Tool")
     end
 
     context "when providing a single id" do
@@ -1196,4 +1234,23 @@ describe Mongoid::Criteria::Findable do
       end
     end
   end
+
+  describe '#from_database_selector' do
+    let(:criteria) { Mongoid::Criteria.new(Band) }
+    let(:result) { criteria.send(:from_database_selector, [1]) }
+
+    context 'when criteria is empty' do
+      it 'adds id' do
+        expect(result.selector).to eq('_id' => 1)
+      end
+    end
+
+    context 'when criteria is restricted by id' do
+      let(:criteria) { Mongoid::Criteria.new(Band).where(id: 2) }
+
+      it 'adds id' do
+        expect(result.selector).to eq('_id' => 2, '$and' => [{'_id' => 1}])
+      end
+    end
+  end
 end

data/spec/mongoid/criteria/inspectable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Criteria::Inspectable do

data/spec/mongoid/criteria/marshalable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Criteria::Marshalable do