mongoid 3.1.7 → 4.0.0.alpha1

data/spec/mongoid/errors/no_session_database_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::NoSessionDatabase do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "No database provided for session configuration: :secondary."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Each session configuration must provide a database so Mongoid"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "If configuring via a mongoid.yml, ensure that within your :secondary"
       )
     end

data/spec/mongoid/errors/no_session_hosts_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::NoSessionHosts do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "No hosts provided for session configuration: :secondary."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Each session configuration must provide hosts so Mongoid"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "If configuring via a mongoid.yml, ensure that within your :secondary"
       )
     end

data/spec/mongoid/errors/no_sessions_config_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::NoSessionsConfig do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "No sessions configuration provided."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Mongoid's configuration requires that you provide details"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Double check your mongoid.yml to make sure that you have"
       )
     end

data/spec/mongoid/errors/readonly_attribute_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::ReadonlyAttribute do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Attempted to set the readonly attribute 'title' with the value: mr."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Attributes flagged as readonly via Model.attr_readonly can only"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Don't define 'title' as readonly, or do not attempt to update"
       )
     end

data/spec/mongoid/errors/scope_overwrite_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::ScopeOverwrite do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Cannot create scope :scope, because of existing method Person.scope."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "When defining a scope that conflicts with a method that already exists"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Change the name of the scope so it does not conflict with the already"
       )
     end

data/spec/mongoid/errors/too_many_nested_attribute_records_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::TooManyNestedAttributeRecords do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Accepting nested attributes for favorites is limited to 5 records."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "More documents were sent to be processed than the allowed limit."
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "The limit is set as an option to the macro, for example:"
       )
     end

data/spec/mongoid/errors/unknown_attribute_spec.rb

@@ -9,20 +9,20 @@ describe Mongoid::Errors::UnknownAttribute do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Attempted to set a value for 'gender' which is not allowed on"
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
-        "When setting Mongoid.allow_dynamic_fields to false"
+      expect(error.message).to include(
+        "Without including Mongoid::Attributes::Dynamic in your model"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
-        "You can set Mongoid.allow_dynamic_fields to true"
+      expect(error.message).to include(
+        "You can include Mongoid::Attributes::Dynamic"
       )
     end
   end

data/spec/mongoid/errors/unsaved_document_spec.rb

@@ -17,19 +17,19 @@ describe Mongoid::Errors::UnsavedDocument do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Attempted to save Post before the parent Person."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "You cannot call create or create! through the relation"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Make sure to only use create or create!"
       )
     end

data/spec/mongoid/errors/unsupported_javascript_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::UnsupportedJavascript do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Executing Javascript $where selector on an embedded criteria is not supported"
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Mongoid only supports providing a hash of arguments to #where"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Please provide a standard hash to #where when the criteria"
       )
     end

data/spec/mongoid/errors/validations_spec.rb

@@ -5,11 +5,11 @@ describe Mongoid::Errors::Validations do
   describe "#message" do
 
     let(:errors) do
-      stub(full_messages: [ "Error 1", "Error 2" ], empty?: false)
+      double(full_messages: [ "Error 1", "Error 2" ], empty?: false)
     end
 
     let(:document) do
-      stub(errors: errors, class: Person)
+      double(errors: errors, class: Person)
     end
 
     let(:error) do
@@ -17,29 +17,29 @@ describe Mongoid::Errors::Validations do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Validation of Person failed"
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "The following errors were found: Error 1, Error 2"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Try persisting the document with valid data"
       )
     end
 
     it "sets the document in the error" do
-      error.document.should eq(document)
+      expect(error.document).to eq(document)
     end
 
     it "aliases record to document" do
-      error.record.should eq(document)
+      expect(error.record).to eq(document)
     end
   end
 end

data/spec/mongoid/extensions/array_spec.rb

@@ -7,7 +7,7 @@ describe Mongoid::Extensions::Array do
     context "when provided an array of strings" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:other) do
@@ -23,18 +23,18 @@ describe Mongoid::Extensions::Array do
       end
 
       it "converts the convertible ones to object ids" do
-        evolved.should eq([ object_id, other ])
+        expect(evolved).to eq([ object_id, other ])
       end
 
       it "returns the same instance" do
-        evolved.should equal(array)
+        expect(evolved).to equal(array)
       end
     end
 
     context "when provided an array of object ids" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:array) do
@@ -46,18 +46,18 @@ describe Mongoid::Extensions::Array do
       end
 
       it "returns the array" do
-        evolved.should eq(array)
+        expect(evolved).to eq(array)
       end
 
       it "returns the same instance" do
-        evolved.should equal(array)
+        expect(evolved).to equal(array)
       end
     end
 
     context "when some values are nil" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:array) do
@@ -69,18 +69,18 @@ describe Mongoid::Extensions::Array do
       end
 
       it "returns the array with the nils" do
-        evolved.should eq([ object_id, nil ])
+        expect(evolved).to eq([ object_id, nil ])
       end
 
       it "returns the same instance" do
-        evolved.should equal(array)
+        expect(evolved).to equal(array)
       end
     end
 
     context "when some values are empty strings" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:array) do
@@ -92,11 +92,11 @@ describe Mongoid::Extensions::Array do
       end
 
       it "returns the array with the empty strings" do
-        evolved.should eq([ object_id, "" ])
+        expect(evolved).to eq([ object_id, "" ])
       end
 
       it "returns the same instance" do
-        evolved.should equal(array)
+        expect(evolved).to equal(array)
       end
     end
   end
@@ -106,7 +106,7 @@ describe Mongoid::Extensions::Array do
     context "when provided an array of strings" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:other) do
@@ -122,18 +122,18 @@ describe Mongoid::Extensions::Array do
       end
 
       it "converts the convertible ones to object ids" do
-        mongoized.should eq([ object_id, other ])
+        expect(mongoized).to eq([ object_id, other ])
       end
 
       it "returns the same instance" do
-        mongoized.should equal(array)
+        expect(mongoized).to equal(array)
       end
     end
 
     context "when provided an array of object ids" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:array) do
@@ -145,18 +145,18 @@ describe Mongoid::Extensions::Array do
       end
 
       it "returns the array" do
-        mongoized.should eq(array)
+        expect(mongoized).to eq(array)
       end
 
       it "returns the same instance" do
-        mongoized.should equal(array)
+        expect(mongoized).to equal(array)
       end
     end
 
     context "when some values are nil" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:array) do
@@ -168,18 +168,18 @@ describe Mongoid::Extensions::Array do
       end
 
       it "returns the array without the nils" do
-        mongoized.should eq([ object_id ])
+        expect(mongoized).to eq([ object_id ])
       end
 
       it "returns the same instance" do
-        mongoized.should equal(array)
+        expect(mongoized).to equal(array)
       end
     end
 
     context "when some values are empty strings" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:array) do
@@ -191,11 +191,11 @@ describe Mongoid::Extensions::Array do
       end
 
       it "returns the array without the empty strings" do
-        mongoized.should eq([ object_id ])
+        expect(mongoized).to eq([ object_id ])
       end
 
       it "returns the same instance" do
-        mongoized.should equal(array)
+        expect(mongoized).to equal(array)
       end
     end
   end
@@ -215,7 +215,7 @@ describe Mongoid::Extensions::Array do
       context "when provided an object id" do
 
         let(:object_id) do
-          Moped::BSON::ObjectId.new
+          BSON::ObjectId.new
         end
 
         let(:fk) do
@@ -223,14 +223,14 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns the object id as an array" do
-          fk.should eq([ object_id ])
+          expect(fk).to eq([ object_id ])
         end
       end
 
       context "when provided a object ids" do
 
         let(:object_id) do
-          Moped::BSON::ObjectId.new
+          BSON::ObjectId.new
         end
 
         let(:fk) do
@@ -238,7 +238,7 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns the object ids" do
-          fk.should eq([ object_id ])
+          expect(fk).to eq([ object_id ])
         end
       end
 
@@ -247,7 +247,7 @@ describe Mongoid::Extensions::Array do
         context "when the string is a legal object id" do
 
           let(:object_id) do
-            Moped::BSON::ObjectId.new
+            BSON::ObjectId.new
           end
 
           let(:fk) do
@@ -255,7 +255,7 @@ describe Mongoid::Extensions::Array do
           end
 
           it "returns the object id in an array" do
-            fk.should eq([ object_id ])
+            expect(fk).to eq([ object_id ])
           end
         end
 
@@ -270,7 +270,7 @@ describe Mongoid::Extensions::Array do
           end
 
           it "returns the string in an array" do
-            fk.should eq([ string ])
+            expect(fk).to eq([ string ])
           end
         end
 
@@ -281,7 +281,7 @@ describe Mongoid::Extensions::Array do
           end
 
           it "returns an empty array" do
-            fk.should be_empty
+            expect(fk).to be_empty
           end
         end
       end
@@ -293,7 +293,7 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns an empty array" do
-          fk.should be_empty
+          expect(fk).to be_empty
         end
       end
 
@@ -302,7 +302,7 @@ describe Mongoid::Extensions::Array do
         context "when the strings are legal object ids" do
 
           let(:object_id) do
-            Moped::BSON::ObjectId.new
+            BSON::ObjectId.new
           end
 
           let(:fk) do
@@ -310,7 +310,7 @@ describe Mongoid::Extensions::Array do
           end
 
           it "returns the object id in an array" do
-            fk.should eq([ object_id ])
+            expect(fk).to eq([ object_id ])
           end
         end
 
@@ -325,7 +325,7 @@ describe Mongoid::Extensions::Array do
           end
 
           it "returns the string in an array" do
-            fk.should eq([ string ])
+            expect(fk).to eq([ string ])
           end
         end
 
@@ -336,7 +336,7 @@ describe Mongoid::Extensions::Array do
           end
 
           it "returns an empty array" do
-            fk.should be_empty
+            expect(fk).to be_empty
           end
         end
       end
@@ -348,7 +348,7 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns an empty array" do
-          fk.should be_empty
+          expect(fk).to be_empty
         end
       end
     end
@@ -376,11 +376,11 @@ describe Mongoid::Extensions::Array do
       end
 
       it "converts to a time" do
-        time.should eq(::Time.zone.local(*array))
+        expect(time).to eq(::Time.zone.local(*array))
       end
 
       it "converts to the as time zone" do
-        time.zone.should eq("JST")
+        expect(time.zone).to eq("JST")
       end
     end
 
@@ -404,7 +404,7 @@ describe Mongoid::Extensions::Array do
       end
 
       it "converts to a time" do
-        time.should eq(Time.local(*array))
+        expect(time).to eq(Time.local(*array))
       end
     end
   end
@@ -420,7 +420,7 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns true" do
-          array.should be_blank_criteria
+          expect(array).to be_blank_criteria
         end
       end
 
@@ -431,7 +431,7 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns true" do
-          array.should be_blank_criteria
+          expect(array).to be_blank_criteria
         end
       end
     end
@@ -450,7 +450,7 @@ describe Mongoid::Extensions::Array do
       end
 
       it "returns nil" do
-        deleted.should be_nil
+        expect(deleted).to be_nil
       end
     end
 
@@ -465,11 +465,11 @@ describe Mongoid::Extensions::Array do
       end
 
       it "deletes the object" do
-        array.should eq([ "2" ])
+        expect(array).to eq([ "2" ])
       end
 
       it "returns the object" do
-        deleted.should eq("1")
+        expect(deleted).to eq("1")
       end
     end
 
@@ -484,11 +484,11 @@ describe Mongoid::Extensions::Array do
       end
 
       it "deletes the first object" do
-        array.should eq([ "2", "1" ])
+        expect(array).to eq([ "2", "1" ])
       end
 
       it "returns the object" do
-        deleted.should eq("1")
+        expect(deleted).to eq("1")
       end
     end
   end
@@ -500,7 +500,7 @@ describe Mongoid::Extensions::Array do
     end
 
     it "returns the array" do
-      Array.demongoize(array).should eq(array)
+      expect(Array.demongoize(array)).to eq(array)
     end
   end
 
@@ -519,11 +519,11 @@ describe Mongoid::Extensions::Array do
     end
 
     it "mongoizes each element in the array" do
-      mongoized.first.should be_a(Time)
+      expect(mongoized.first).to be_a(Time)
     end
 
     it "converts the elements properly" do
-      mongoized.first.should eq(date)
+      expect(mongoized.first).to eq(Time.utc(2012, 1, 1, 0, 0, 0))
     end
   end
 
@@ -542,11 +542,11 @@ describe Mongoid::Extensions::Array do
     end
 
     it "mongoizes each element in the array" do
-      mongoized.first.should be_a(Time)
+      expect(mongoized.first).to be_a(Time)
     end
 
     it "converts the elements properly" do
-      mongoized.first.should eq(date)
+      expect(mongoized.first).to eq(Time.utc(2012, 1, 1, 0, 0, 0))
     end
   end
 
@@ -559,7 +559,7 @@ describe Mongoid::Extensions::Array do
       end
 
       it "returns true" do
-        array.should be_multi_arged
+        expect(array).to be_multi_arged
       end
     end
 
@@ -572,7 +572,7 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns false" do
-          array.should_not be_multi_arged
+          expect(array).to_not be_multi_arged
         end
       end
 
@@ -583,7 +583,7 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns false" do
-          array.should_not be_multi_arged
+          expect(array).to_not be_multi_arged
         end
       end
 
@@ -594,7 +594,7 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns true" do
-          array.should be_multi_arged
+          expect(array).to be_multi_arged
         end
       end
 
@@ -605,7 +605,7 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns true" do
-          array.should be_multi_arged
+          expect(array).to be_multi_arged
         end
       end
 
@@ -616,7 +616,7 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns true" do
-          array.should be_multi_arged
+          expect(array).to be_multi_arged
         end
       end
     end
@@ -625,14 +625,14 @@ describe Mongoid::Extensions::Array do
   describe ".resizable?" do
 
     it "returns true" do
-      Array.should be_resizable
+      expect(Array).to be_resizable
     end
   end
 
   describe "#resiable?" do
 
     it "returns true" do
-      [].should be_resizable
+      expect([]).to be_resizable
     end
   end
 end