mongoid 3.1.7 → 4.0.0.alpha1

data/spec/mongoid/errors/invalid_find_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::InvalidFind do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Calling Document.find with nil is invalid"
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Document.find expects the parameters to be 1 or more ids"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Most likely this is caused by passing parameters directly"
       )
     end

data/spec/mongoid/errors/invalid_includes_spec.rb

@@ -19,19 +19,19 @@ describe Mongoid::Errors::InvalidIncludes do
       end
 
       it "contains the problem in the message" do
-        error.message.should include(
+        expect(error.message).to include(
           "Invalid includes directive: Band.includes(:members)"
         )
       end
 
       it "contains the summary in the message" do
-        error.message.should include(
+        expect(error.message).to include(
           "Eager loading in Mongoid only supports providing arguments to Band.includes"
         )
       end
 
       it "contains the resolution in the message" do
-        error.message.should include(
+        expect(error.message).to include(
           "Ensure that each parameter passed to Band.includes is a valid name"
         )
       end

data/spec/mongoid/errors/invalid_index_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::InvalidIndex do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Invalid index specification on Band:"
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Indexes in Mongoid are defined as a hash of field name and direction"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Ensure that the index conforms to the correct syntax"
       )
     end

data/spec/mongoid/errors/invalid_options_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::InvalidOptions do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Invalid option :invalid provided to relation :name."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Mongoid checks the options that are passed to the relation macros"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Valid options are: valid, make sure these are the ones you are using."
       )
     end

data/spec/mongoid/errors/invalid_path_spec.rb

@@ -9,15 +9,15 @@ describe Mongoid::Errors::InvalidPath do
     end
 
     it "contains the problem in the message" do
-      error.message.should include("Having a root path assigned for Address")
+      expect(error.message).to include("Having a root path assigned for Address")
     end
 
     it "contains the summary in the message" do
-      error.message.should include("Mongoid has two different path objects")
+      expect(error.message).to include("Mongoid has two different path objects")
     end
 
     it "contains the resolution in the message" do
-      error.message.should include("Most likely your embedded model, Address")
+      expect(error.message).to include("Most likely your embedded model, Address")
     end
   end
 end

data/spec/mongoid/errors/invalid_scope_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::InvalidScope do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Defining a scope of value {} on Band is not allowed."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Scopes in Mongoid must be either criteria objects or procs that wrap"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Change the scope to be a criteria or proc wrapped critera."
       )
     end

data/spec/mongoid/errors/invalid_set_polymorphic_relation_spec.rb

@@ -5,12 +5,12 @@ describe Mongoid::Errors::InvalidSetPolymorphicRelation do
   describe "#message" do
 
     let(:error) do
-      described_class.new(:eyeable, Eye, Face)
+      described_class.new(:postable, Post, Person)
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
-        "The eyeable attribute can't be set to an instance of Face"
+      expect(error.message).to include(
+        "The postable attribute can't be set to an instance of Person"
       )
     end
   end

data/spec/mongoid/errors/invalid_storage_options_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::InvalidStorageOptions do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Invalid options passed to Band.store_in: bad_option."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "The :store_in macro takes only a hash of parameters with the"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Change the options passed to store_in to match the documented API"
       )
     end

data/spec/mongoid/errors/invalid_time_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::InvalidTime do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "'this is not a date' is not a valid Time."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Mongoid tries to serialize the values for Date, DateTime, and Time"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Make sure to pass parsable values to the field setter for Date"
       )
     end

data/spec/mongoid/errors/inverse_not_found_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::InverseNotFound do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "When adding a(n) Person to Town#citizens, Mongoid could not"
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "hen adding a document to a relation, Mongoid attempts to link"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "If an inverse is not required, like a belongs_to or"
       )
     end

data/spec/mongoid/errors/mixed_relations_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::MixedRelations do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Referencing a(n) Address document from the Post document"
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "In order to properly access a(n) Address from Post the reference"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Consider not embedding Address, or do the key storage"
       )
     end

data/spec/mongoid/errors/mixed_session_configuration_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::MixedSessionConfiguration do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Both uri and standard configuration options defined"
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Instead of simply giving uri or standard options a preference"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Provide either only a uri as configuration"
       )
     end

data/spec/mongoid/errors/mongoid_error_spec.rb

@@ -9,7 +9,7 @@ describe Mongoid::Errors::MongoidError do
   before do
     ["message", "summary", "resolution"].each do |name|
       ::I18n.should_receive(:translate).
-        with("mongoid.errors.messages.#{key}.#{name}", { locale: :en }).
+        with("mongoid.errors.messages.#{key}.#{name}", {}).
       and_return(name)
     end
 
@@ -19,30 +19,30 @@ describe Mongoid::Errors::MongoidError do
   describe "#compose_message" do
 
     it "sets ivar problem" do
-      error.instance_variable_get(:@problem).should be
+      expect(error.instance_variable_get(:@problem)).to be
     end
 
     it "sets ivar summary" do
-      error.instance_variable_get(:@summary).should be
+      expect(error.instance_variable_get(:@summary)).to be
     end
 
     it "sets ivar resolution" do
-      error.instance_variable_get(:@resolution).should be
+      expect(error.instance_variable_get(:@resolution)).to be
     end
   end
 
   describe "#to_json" do
 
     it "has problem" do
-      error.to_json.should include('"problem":"message"')
+      expect(error.to_json).to include('"problem":"message"')
     end
 
     it "has summary" do
-      error.to_json.should include('"summary":"summary"')
+      expect(error.to_json).to include('"summary":"summary"')
     end
 
     it "has resolution" do
-      error.to_json.should include('"resolution":"resolution"')
+      expect(error.to_json).to include('"resolution":"resolution"')
     end
   end
 end

data/spec/mongoid/errors/nested_attributes_metadata_not_found_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::NestedAttributesMetadataNotFound do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Could not find metadata for relation 'posts' on model: Person."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "When defining nested attributes for a relation, Mongoid needs"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Make sure that there is a relation defined named 'posts' on Person"
       )
     end

data/spec/mongoid/errors/no_environment_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::NoEnvironment do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Could not load the configuration since no environment was defined."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Mongoid attempted to find the appropriate environment but no Rails.env"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Make sure some environment is set from the mentioned options"
       )
     end

data/spec/mongoid/errors/no_map_reduce_output_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::NoMapReduceOutput do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "No output location was specified for the map/reduce operation."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "When executing a map/reduce, you must provide the output location"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Provide the location that the output of the operation"
       )
     end

data/spec/mongoid/errors/no_metadata_spec.rb

@@ -9,15 +9,15 @@ describe Mongoid::Errors::NoMetadata do
     end
 
     it "contains the problem in the message" do
-      error.message.should include("Metadata not found for document of type Address.")
+      expect(error.message).to include("Metadata not found for document of type Address.")
     end
 
     it "contains the summary in the message" do
-      error.message.should include("Mongoid sets the metadata of a relation on the")
+      expect(error.message).to include("Mongoid sets the metadata of a relation on the")
     end
 
     it "contains the resolution in the message" do
-      error.message.should include("Ensure that your relations on the Address model")
+      expect(error.message).to include("Ensure that your relations on the Address model")
     end
   end
 end

data/spec/mongoid/errors/no_parent_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::NoParent do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Cannot persist embedded document Address without a parent document."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "If the document is embedded, in order to be persisted it must"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Ensure that you've set the parent relation if instantiating"
       )
     end

data/spec/mongoid/errors/no_session_config_spec.rb

@@ -9,19 +9,19 @@ describe Mongoid::Errors::NoSessionConfig do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "No configuration could be found for a session named 'secondary'."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "When attempting to create the new session, Mongoid could not find a session"
       )
     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 under the sessions"
       )
     end