mongoid 7.2.1 → 9.0.0

data/spec/mongoid/criteria/findable_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -10,11 +10,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
@@ -41,7 +41,7 @@ describe Mongoid::Criteria::Findable do
 
       context 'when criteria has additional conditions' do
         let(:band) do
-          Band.create(name: "Tool")
+          Band.create!(name: "Tool")
         end
 
         let(:found) do
@@ -51,17 +51,17 @@ 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
 
       context 'when criteria has additional conditions on id' do
         let(:band) do
-          Band.create(name: "Tool")
+          Band.create!(name: "Tool")
         end
 
         let(:other) do
-          Band.create(name: "Other")
+          Band.create!(name: "Other")
         end
 
         let(:found) do
@@ -71,7 +71,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
@@ -79,7 +79,7 @@ describe Mongoid::Criteria::Findable do
     context "when using object ids" do
 
       let!(:band) do
-        Band.create
+        Band.create!
       end
 
       context "when providing a single id" do
@@ -109,10 +109,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)
@@ -121,19 +118,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)
@@ -149,7 +139,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
@@ -181,10 +171,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)
@@ -193,19 +180,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)
@@ -221,7 +201,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
@@ -253,34 +233,136 @@ describe Mongoid::Criteria::Findable do
         context "when any id does not match" do
 
           context "when raising a not found error" do
+            config_override :raise_not_found_error, true
 
-            before do
-              Mongoid.raise_not_found_error = true
+            let(:found) do
+              Band.find([ band.id, BSON::ObjectId.new ])
             end
 
+            it "raises an error" do
+              expect {
+                found
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
+            end
+          end
+
+          context "when raising no error" do
+            config_override :raise_not_found_error, false
+
             let(:found) do
               Band.find([ band.id, BSON::ObjectId.new ])
             end
 
+            it "returns only the matching documents" do
+              expect(found).to eq([ band ])
+            end
+          end
+        end
+      end
+
+      context "when providing nested arrays of ids" do
+
+        let!(:band_two) do
+          Band.create!(name: "Tool")
+        end
+
+        context "when all ids match" do
+
+          let(:found) do
+            Band.find([ [ band.id ], [ [ band_two.id ] ] ])
+          end
+
+          it "contains the first match" do
+            expect(found).to include(band)
+          end
+
+          it "contains the second match" do
+            expect(found).to include(band_two)
+          end
+
+          context "when ids are duplicates" do
+
+            let(:found) do
+              Band.find([ [ band.id ], [ [ band.id ] ] ])
+            end
+
+            it "contains only the first match" do
+              expect(found).to eq([band])
+            end
+          end
+        end
+
+        context "when any id does not match" do
+
+          context "when raising a not found error" do
+            config_override :raise_not_found_error, true
+
+            let(:found) do
+              Band.find([ [ band.id ], [ [ BSON::ObjectId.new ] ] ])
+            end
+
             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
+            config_override :raise_not_found_error, false
 
-            before do
-              Mongoid.raise_not_found_error = false
+            let(:found) do
+              Band.find([ [ band.id ], [ [ BSON::ObjectId.new ] ] ])
             end
 
-            after do
-              Mongoid.raise_not_found_error = true
+            it "returns only the matching documents" do
+              expect(found).to eq([ band ])
             end
+          end
+        end
+      end
+
+      context "when providing a Set of ids" do
+
+        let!(:band_two) do
+          Band.create!(name: "Tool")
+        end
+
+        context "when all ids match" do
+          let(:found) do
+            Band.find(Set[ band.id, band_two.id ])
+          end
+
+          it "contains the first match" do
+            expect(found).to include(band)
+          end
+
+          it "contains the second match" do
+            expect(found).to include(band_two)
+          end
+        end
+
+        context "when any id does not match" do
+
+          context "when raising a not found error" do
+            config_override :raise_not_found_error, true
 
             let(:found) do
-              Band.find([ band.id, BSON::ObjectId.new ])
+              Band.find(Set[ band.id, BSON::ObjectId.new ])
+            end
+
+            it "raises an error" do
+              expect {
+                found
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
+            end
+          end
+
+          context "when raising no error" do
+            config_override :raise_not_found_error, false
+
+            let(:found) do
+              Band.find(Set[ band.id, BSON::ObjectId.new ])
             end
 
             it "returns only the matching documents" do
@@ -290,6 +372,84 @@ describe Mongoid::Criteria::Findable do
         end
       end
 
+      context "when providing a Range of ids" do
+
+        let!(:band_two) do
+          Band.create!(name: "Tool")
+        end
+
+        context "when all ids match" do
+          let(:found) do
+            Band.find(band.id.to_s..band_two.id.to_s)
+          end
+
+          it "contains the first match" do
+            expect(found).to include(band)
+          end
+
+          it "contains the second match" do
+            expect(found).to include(band_two)
+          end
+
+
+          context "when any id does not match" do
+
+            context "when raising a not found error" do
+              config_override :raise_not_found_error, true
+
+              let(:found) do
+                Band.find(band_two.id.to_s..BSON::ObjectId.new)
+              end
+
+              it "does not raise error and returns only the matching documents" do
+                expect(found).to eq([ band_two ])
+              end
+            end
+
+            context "when raising no error" do
+              config_override :raise_not_found_error, false
+
+              let(:found) do
+                Band.find(band_two.id.to_s..BSON::ObjectId.new)
+              end
+
+              it "returns only the matching documents" do
+                expect(found).to eq([ band_two ])
+              end
+            end
+          end
+        end
+
+        context "when all ids do not match" do
+
+          context "when raising a not found error" do
+            config_override :raise_not_found_error, true
+
+            let(:found) do
+              Band.find(BSON::ObjectId.new..BSON::ObjectId.new)
+            end
+
+            it "raises an error" do
+              expect {
+                found
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
+            end
+          end
+
+          context "when raising no error" do
+            config_override :raise_not_found_error, false
+
+            let(:found) do
+              Band.find(BSON::ObjectId.new..BSON::ObjectId.new)
+            end
+
+            it "returns only the matching documents" do
+              expect(found).to eq([])
+            end
+          end
+        end
+      end
+
       context "when providing a single id as extended json" do
 
         context "when the id matches" do
@@ -306,10 +466,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)
@@ -318,19 +475,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)
@@ -346,7 +496,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
@@ -378,10 +528,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)
@@ -390,19 +537,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)
@@ -418,7 +558,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
@@ -450,10 +590,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 ])
@@ -462,19 +599,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 ])
@@ -499,7 +629,7 @@ describe Mongoid::Criteria::Findable do
       end
 
       let!(:band) do
-        Band.create do |band|
+        Band.create! do |band|
           band.id = "tool"
         end
       end
@@ -520,10 +650,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")
@@ -532,19 +659,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")
@@ -560,7 +680,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
@@ -583,10 +703,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")
@@ -595,19 +712,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")
@@ -623,7 +733,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
@@ -646,10 +756,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" ])
@@ -658,19 +765,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" ])
@@ -695,7 +795,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
@@ -716,10 +816,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})
@@ -728,19 +825,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})
@@ -756,7 +846,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
@@ -779,10 +869,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})
@@ -791,19 +878,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})
@@ -819,7 +899,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
@@ -842,10 +922,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} ])
@@ -854,19 +931,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} ])
@@ -891,7 +961,7 @@ describe Mongoid::Criteria::Findable do
       end
 
       let!(:band) do
-        Band.create do |band|
+        Band.create! do |band|
           band.id = 1
         end
       end
@@ -912,10 +982,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)
@@ -924,19 +991,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)
@@ -952,7 +1012,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
@@ -975,10 +1035,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)
@@ -987,19 +1044,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)
@@ -1015,7 +1065,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
@@ -1038,10 +1088,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 ])
@@ -1050,19 +1097,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 ])
@@ -1078,7 +1118,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
@@ -1101,10 +1141,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)
@@ -1113,19 +1150,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)
@@ -1150,7 +1180,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
@@ -1167,6 +1197,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
@@ -1190,11 +1256,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