mongoid 7.5.3 → 8.0.1

data/spec/mongoid/criteria/findable_spec.rb

@@ -50,7 +50,7 @@ describe Mongoid::Criteria::Findable do
         it 'respects conditions' do
           expect do
             found
-          end.to raise_error(Mongoid::Errors::DocumentNotFound)
+          end.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
         end
       end
 
@@ -70,7 +70,7 @@ describe Mongoid::Criteria::Findable do
         it 'respects both conditions' do
           expect do
             found
-          end.to raise_error(Mongoid::Errors::DocumentNotFound)
+          end.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
         end
       end
     end
@@ -108,10 +108,7 @@ describe Mongoid::Criteria::Findable do
         context "when the id does not match" do
 
           context "when raising a not found error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             let(:found) do
               Band.find(BSON::ObjectId.new)
@@ -120,19 +117,12 @@ describe Mongoid::Criteria::Findable do
             it "raises an error" do
               expect {
                 found
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
             end
           end
 
           context "when raising no error" do
-
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, false
 
             let(:found) do
               Band.find(BSON::ObjectId.new)
@@ -180,10 +170,7 @@ describe Mongoid::Criteria::Findable do
         context "when any id does not match" do
 
           context "when raising a not found error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             let(:found) do
               Band.find(band.id, BSON::ObjectId.new)
@@ -192,19 +179,12 @@ describe Mongoid::Criteria::Findable do
             it "raises an error" do
               expect {
                 found
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
             end
           end
 
           context "when raising no error" do
-
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, false
 
             let(:found) do
               Band.find(band.id, BSON::ObjectId.new)
@@ -252,10 +232,7 @@ describe Mongoid::Criteria::Findable do
         context "when any id does not match" do
 
           context "when raising a not found error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             let(:found) do
               Band.find([ band.id, BSON::ObjectId.new ])
@@ -264,19 +241,12 @@ describe Mongoid::Criteria::Findable do
             it "raises an error" do
               expect {
                 found
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
             end
           end
 
           context "when raising no error" do
-
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, false
 
             let(:found) do
               Band.find([ band.id, BSON::ObjectId.new ])
@@ -305,10 +275,7 @@ describe Mongoid::Criteria::Findable do
         context "when the id does not match" do
 
           context "when raising a not found error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             let(:found) do
               Band.find(BSON::ObjectId.new.as_json)
@@ -317,19 +284,12 @@ describe Mongoid::Criteria::Findable do
             it "raises an error" do
               expect {
                 found
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
             end
           end
 
           context "when raising no error" do
-
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, false
 
             let(:found) do
               Band.find(BSON::ObjectId.new.as_json)
@@ -377,10 +337,7 @@ describe Mongoid::Criteria::Findable do
         context "when any id does not match" do
 
           context "when raising a not found error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             let(:found) do
               Band.find(band.id.as_json, BSON::ObjectId.new.as_json)
@@ -389,19 +346,12 @@ describe Mongoid::Criteria::Findable do
             it "raises an error" do
               expect {
                 found
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
             end
           end
 
           context "when raising no error" do
-
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, false
 
             let(:found) do
               Band.find(band.id.as_json, BSON::ObjectId.new.as_json)
@@ -449,10 +399,7 @@ describe Mongoid::Criteria::Findable do
         context "when any id does not match" do
 
           context "when raising a not found error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             let(:found) do
               Band.find([ band.id.as_json, BSON::ObjectId.new.as_json ])
@@ -461,19 +408,12 @@ describe Mongoid::Criteria::Findable do
             it "raises an error" do
               expect {
                 found
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
             end
           end
 
           context "when raising no error" do
-
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, false
 
             let(:found) do
               Band.find([ band.id.as_json, BSON::ObjectId.new.as_json ])
@@ -519,10 +459,7 @@ describe Mongoid::Criteria::Findable do
         context "when the id does not match" do
 
           context "when raising a not found error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             let(:found) do
               Band.find("depeche-mode")
@@ -531,19 +468,12 @@ describe Mongoid::Criteria::Findable do
             it "raises an error" do
               expect {
                 found
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
             end
           end
 
           context "when raising no error" do
-
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, false
 
             let(:found) do
               Band.find("depeche-mode")
@@ -582,10 +512,7 @@ describe Mongoid::Criteria::Findable do
         context "when any id does not match" do
 
           context "when raising a not found error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             let(:found) do
               Band.find(band.id, "new-order")
@@ -594,19 +521,12 @@ describe Mongoid::Criteria::Findable do
             it "raises an error" do
               expect {
                 found
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
             end
           end
 
           context "when raising no error" do
-
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, false
 
             let(:found) do
               Band.find(band.id, "new-order")
@@ -645,10 +565,7 @@ describe Mongoid::Criteria::Findable do
         context "when any id does not match" do
 
           context "when raising a not found error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             let(:found) do
               Band.find([ band.id, "new-order" ])
@@ -657,19 +574,12 @@ describe Mongoid::Criteria::Findable do
             it "raises an error" do
               expect {
                 found
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
             end
           end
 
           context "when raising no error" do
-
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, false
 
             let(:found) do
               Band.find([ band.id, "new-order" ])
@@ -715,10 +625,7 @@ describe Mongoid::Criteria::Findable do
         context "when the id does not match" do
 
           context "when raising a not found error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             let(:found) do
               Band.find({"new-order" => false, "Faith no More" => true})
@@ -727,19 +634,12 @@ describe Mongoid::Criteria::Findable do
             it "raises an error" do
               expect {
                 found
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
             end
           end
 
           context "when raising no error" do
-
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, false
 
             let(:found) do
               Band.find({"new-order" => false, "Faith no More" => true})
@@ -778,10 +678,7 @@ describe Mongoid::Criteria::Findable do
         context "when any id does not match" do
 
           context "when raising a not found error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             let(:found) do
               Band.find(band.id, {"Radiohead" => true, "Nirvana"=> false})
@@ -790,19 +687,12 @@ describe Mongoid::Criteria::Findable do
             it "raises an error" do
               expect {
                 found
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
             end
           end
 
           context "when raising no error" do
-
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, false
 
             let(:found) do
               Band.find(band.id, {"Radiohead" => true, "Nirvana"=> false})
@@ -841,10 +731,7 @@ describe Mongoid::Criteria::Findable do
         context "when any id does not match" do
 
           context "when raising a not found error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             let(:found) do
               Band.find([ band.id, {"Radiohead" => true, "Nirvana"=> false} ])
@@ -853,19 +740,12 @@ describe Mongoid::Criteria::Findable do
             it "raises an error" do
               expect {
                 found
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
             end
           end
 
           context "when raising no error" do
-
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, false
 
             let(:found) do
               Band.find([ band.id, {"Radiohead" => true, "Nirvana"=> false} ])
@@ -911,10 +791,7 @@ describe Mongoid::Criteria::Findable do
         context "when the id does not match" do
 
           context "when raising a not found error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             let(:found) do
               Band.find(3)
@@ -923,19 +800,12 @@ describe Mongoid::Criteria::Findable do
             it "raises an error" do
               expect {
                 found
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
             end
           end
 
           context "when raising no error" do
-
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, false
 
             let(:found) do
               Band.find(3)
@@ -974,10 +844,7 @@ describe Mongoid::Criteria::Findable do
         context "when any id does not match" do
 
           context "when raising a not found error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             let(:found) do
               Band.find(band.id, 3)
@@ -986,19 +853,12 @@ describe Mongoid::Criteria::Findable do
             it "raises an error" do
               expect {
                 found
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
             end
           end
 
           context "when raising no error" do
-
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, false
 
             let(:found) do
               Band.find(band.id, 3)
@@ -1037,10 +897,7 @@ describe Mongoid::Criteria::Findable do
         context "when any id does not match" do
 
           context "when raising a not found error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             let(:found) do
               Band.find([ band.id, 3 ])
@@ -1049,19 +906,12 @@ describe Mongoid::Criteria::Findable do
             it "raises an error" do
               expect {
                 found
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
             end
           end
 
           context "when raising no error" do
-
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, false
 
             let(:found) do
               Band.find([ band.id, 3 ])
@@ -1100,10 +950,7 @@ describe Mongoid::Criteria::Findable do
         context "when any id does not match" do
 
           context "when raising a not found error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             let(:found) do
               Band.find(1..3)
@@ -1112,19 +959,12 @@ describe Mongoid::Criteria::Findable do
             it "raises an error" do
               expect {
                 found
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
             end
           end
 
           context "when raising no error" do
-
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, false
 
             let(:found) do
               Band.find(1..3)
@@ -1166,6 +1006,42 @@ describe Mongoid::Criteria::Findable do
         end
       end
     end
+
+    context "when passing in a block" do
+
+      let!(:band1) { Band.create!(name: '1') }
+      let!(:band2) { Band.create!(name: '2') }
+      let!(:band3) { Band.create!(name: '2') }
+
+      it "yields the documents to the block" do
+        doc = Band.find { |b| b.name == '2' }
+        expect(doc).to eq(band2)
+      end
+    end
+
+    context "when passing in ids and a block" do
+
+      let!(:band1) { Band.create!(name: '1') }
+      let!(:band2) { Band.create!(name: '2') }
+      let!(:band3) { Band.create!(name: '2') }
+
+      it "acts like findable find" do
+        docs = Band.find(band1.id, band2.id) { |b| b.name == '2' }
+        expect(docs).to eq([ band1, band2 ])
+      end
+    end
+
+    context "when passing in a Proc and a block" do
+
+      let!(:band1) { Band.create!(name: '1') }
+      let!(:band2) { Band.create!(name: '2') }
+      let!(:band3) { Band.create!(name: '2') }
+
+      it "acts like findable find" do
+        docs = Band.find(-> { 'default' }) { |b| b.name == '3' }
+        expect(docs).to eq('default')
+      end
+    end
   end
 
   describe "#for_ids" do