mongoid 3.1.6 → 4.0.2

data/spec/mongoid/equality_spec.rb

@@ -20,7 +20,7 @@ describe Mongoid::Equality do
       end
 
       it "returns false" do
-        person.should_not eq(other)
+        expect(person).to_not eq(other)
       end
     end
 
@@ -39,7 +39,7 @@ describe Mongoid::Equality do
           end
 
           it "returns false" do
-            person.should_not eq(other)
+            expect(person).to_not eq(other)
           end
         end
 
@@ -54,7 +54,7 @@ describe Mongoid::Equality do
           end
 
           it "returns true" do
-            person.should eq(other)
+            expect(person).to eq(other)
           end
         end
       end
@@ -68,14 +68,14 @@ describe Mongoid::Equality do
         context "when the instances are the same" do
 
           it "returns true" do
-            person.should eq(person)
+            expect(person).to eq(person)
           end
         end
 
         context "when the instances are different" do
 
           it "returns false" do
-            person.should_not eq(other)
+            expect(person).to_not eq(other)
           end
         end
       end
@@ -87,7 +87,7 @@ describe Mongoid::Equality do
     context "when comparable is an instance of this document" do
 
       it "returns true" do
-        (klass === person).should be_true
+        expect(klass === person).to be true
       end
     end
 
@@ -98,28 +98,28 @@ describe Mongoid::Equality do
       end
 
       it "returns true" do
-        (klass === relation).should be_true
+        expect(klass === relation).to be true
       end
     end
 
     context "when comparable is the same class" do
 
       it "returns true" do
-        (klass === Person).should be_true
+        expect(klass === Person).to be true
       end
     end
 
     context "when the comparable is a subclass" do
 
       it "returns false" do
-        (Person === Doctor).should be_false
+        expect(Person === Doctor).to be false
       end
     end
 
     context "when the comparable is an instance of a subclass" do
 
       it "returns true" do
-        (Person === Doctor.new).should be_true
+        expect(Person === Doctor.new).to be true
       end
     end
   end
@@ -131,14 +131,14 @@ describe Mongoid::Equality do
       context "when the instance is different" do
 
         it "returns false" do
-          (person === Person.new).should be_false
+          expect(person === Person.new).to be false
         end
       end
 
       context "when the instance is the same" do
 
         it "returns true" do
-          (person === person).should be_true
+          expect(person === person).to be true
         end
       end
     end
@@ -146,7 +146,7 @@ describe Mongoid::Equality do
     context "when the comparable is a subclass" do
 
       it "returns false" do
-        (person === Doctor.new).should be_false
+        expect(person === Doctor.new).to be false
       end
     end
 
@@ -155,21 +155,21 @@ describe Mongoid::Equality do
       context "when the class is the same" do
 
         it "returns true" do
-          (person === Person).should be_true
+          expect(person === Person).to be true
         end
       end
 
       context "when the class is a subclass" do
 
         it "returns false" do
-          (person === Doctor).should be_false
+          expect(person === Doctor).to be false
         end
       end
 
       context "when the class is a superclass" do
 
         it "returns true" do
-          (Doctor.new === Person).should be_true
+          expect(Doctor.new === Person).to be true
         end
       end
     end
@@ -186,7 +186,7 @@ describe Mongoid::Equality do
     end
 
     it "compares based on the document id" do
-      (first <=> second ).should eq(-1)
+      expect(first <=> second).to eq(-1)
     end
   end
 
@@ -199,7 +199,7 @@ describe Mongoid::Equality do
       end
 
       it "returns false" do
-        person.should_not be_eql(other)
+        expect(person).to_not be_eql(other)
       end
     end
 
@@ -216,7 +216,7 @@ describe Mongoid::Equality do
         end
 
         it "returns true" do
-          person.should be_eql(other)
+          expect(person).to be_eql(other)
         end
       end
 
@@ -225,17 +225,17 @@ describe Mongoid::Equality do
         context "when the instances are the same" do
 
           it "returns true" do
-            person.should be_eql(person)
+            expect(person).to be_eql(person)
           end
         end
 
         context "when the instances are different" do
 
           it "returns false" do
-            person.should_not be_eql(other)
+            expect(person).to_not be_eql(other)
           end
         end
       end
     end
   end
-end
+end

data/spec/mongoid/errors/ambiguous_relationship_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::AmbiguousRelationship do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Ambiguous relations :drugs, :evil_drugs defined on Person."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "When Mongoid attempts to set an inverse document of a relation in memory"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "On the :person relation on Drug you must add an :inverse_of option"
       )
     end

data/spec/mongoid/errors/callback_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::Callback do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Calling create! on Post resulted in a false return from a callback."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "If a before callback returns false when using Document.create!"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Double check all before callbacks to make sure they are not"
       )
     end

data/spec/mongoid/errors/delete_restriction_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::DeleteRestriction do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Cannot delete Person because of dependent 'drugs'."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "When defining 'drugs' with a :dependent => :restrict,"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Don't attempt to delete the parent Person when it has children"
       )
     end

data/spec/mongoid/errors/document_not_destroyed_spec.rb

@@ -0,0 +1,33 @@
+require "spec_helper"
+
+describe Mongoid::Errors::DocumentNotDestroyed do
+
+  describe "#message" do
+
+    let(:post) do
+      Post.new
+    end
+
+    let(:error) do
+      described_class.new(post.id, Post)
+    end
+
+    it "contains the problem in the message" do
+      expect(error.message).to include(
+        "Post with id #{post.id.inspect} was not destroyed"
+      )
+    end
+
+    it "contains the summary in the message" do
+      expect(error.message).to include(
+        "When calling Post#destroy! and a callback halts the destroy callback"
+      )
+    end
+
+    it "contains the resolution in the message" do
+      expect(error.message).to include(
+        "Check the before/after destroy callbacks to ensure"
+      )
+    end
+  end
+end

data/spec/mongoid/errors/document_not_found_spec.rb

@@ -11,19 +11,19 @@ describe Mongoid::Errors::DocumentNotFound do
       end
 
       it "contains the problem in the message" do
-        error.message.should include(
+        expect(error.message).to include(
           "Document(s) not found for class Person with id(s) 1."
         )
       end
 
       it "contains the summary in the message" do
-        error.message.should include(
+        expect(error.message).to include(
           "When calling Person.find with an id or array of ids"
         )
       end
 
       it "contains the resolution in the message" do
-        error.message.should include(
+        expect(error.message).to include(
           "Search for an id that is in the database or set the"
         )
       end
@@ -36,19 +36,19 @@ describe Mongoid::Errors::DocumentNotFound do
       end
 
       it "contains the problem in the message" do
-        error.message.should include(
+        expect(error.message).to include(
           "Document(s) not found for class Person with id(s) 1."
         )
       end
 
       it "contains the summary in the message" do
-        error.message.should include(
+        expect(error.message).to include(
           "When calling Person.find with an id or array of ids"
         )
       end
 
       it "contains the resolution in the message" do
-        error.message.should include(
+        expect(error.message).to include(
           "Search for an id that is in the database or set the"
         )
       end
@@ -61,19 +61,19 @@ describe Mongoid::Errors::DocumentNotFound do
       end
 
       it "contains the problem in the message" do
-        error.message.should include(
+        expect(error.message).to include(
           "Document not found for class Person with attributes {:name=>\"syd\"}."
         )
       end
 
       it "contains the summary in the message" do
-        error.message.should include(
+        expect(error.message).to include(
           "When calling Person.find_by with a hash of attributes"
         )
       end
 
       it "contains the resolution in the message" do
-        error.message.should include(
+        expect(error.message).to include(
           "Search for attributes that are in the database or set"
         )
       end
@@ -87,7 +87,7 @@ describe Mongoid::Errors::DocumentNotFound do
     end
 
     it "returns the parameters passed to the find" do
-      error.params.should eq(1)
+      expect(error.params).to eq(1)
     end
   end
 
@@ -98,7 +98,7 @@ describe Mongoid::Errors::DocumentNotFound do
     end
 
     it "returns the model class" do
-      error.klass.should eq(Person)
+      expect(error.klass).to eq(Person)
     end
   end
 end

data/spec/mongoid/errors/eager_load_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::EagerLoad do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Eager loading :ratable is not supported since it is a polymorphic"
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Mongoid cannot currently determine the classes it needs to eager"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Don't attempt to perform this action and have patience"
       )
     end

data/spec/mongoid/errors/invalid_collection_spec.rb

@@ -15,19 +15,19 @@ describe Mongoid::Errors::InvalidCollection do
       end
 
       it "contains the problem in the message" do
-        error.message.should include(
+        expect(error.message).to include(
           "Access to the collection for Address is not allowed."
         )
       end
 
       it "contains the summary in the message" do
-        error.message.should include(
+        expect(error.message).to include(
           "Address.collection was called, and Address is an embedded document"
         )
       end
 
       it "contains the resolution in the message" do
-        error.message.should include(
+        expect(error.message).to include(
           "For access to the collection that the embedded document is in"
         )
       end

data/spec/mongoid/errors/invalid_config_option_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::InvalidConfigOption do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Invalid configuration option: bad_option."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "A invalid configuration option was provided in your mongoid.yml,"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Remove the invalid option or fix the typo."
       )
     end

data/spec/mongoid/errors/invalid_field_option_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::InvalidFieldOption do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Invalid option :localized provided for field :testing."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Mongoid requires that you only provide valid options"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "When defining the field :testing on 'Person', please"
       )
     end