mongoid 3.1.5 → 8.0.2

data/spec/mongoid/errors/invalid_config_option_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::InvalidConfigOption do
@@ -9,19 +11,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::InvalidFieldOption do
@@ -9,19 +11,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

data/spec/mongoid/errors/invalid_field_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::InvalidField do
@@ -13,23 +15,23 @@ describe Mongoid::Errors::InvalidField do
     end
 
     let(:error) do
-      described_class.new(Person, :crazy_method)
+      described_class.new(Person, :crazy_method, :crazy_method)
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Defining a field named 'crazy_method' is not allowed."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Defining this field would override the method 'crazy_method'"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
+      expect(error.message).to include(
         "Use Mongoid.destructive_fields to see what names are not allowed"
       )
     end

data/spec/mongoid/errors/invalid_field_type_spec.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Mongoid::Errors::InvalidFieldType do
+
+  describe "#message" do
+
+    let(:error) do
+      described_class.new(Person, :first_name, :stringgy)
+    end
+
+    context 'when type is a symbol' do
+      let(:error) do
+        described_class.new(Person, :first_name, :stringgy)
+      end
+
+      it "contains the problem in the message" do
+        expect(error.message).to include(
+          "Invalid field type :stringgy for field 'first_name' on model 'Person'."
+        )
+      end
+
+      it "contains the summary in the message" do
+        expect(error.message).to include(
+          "Model 'Person' defines a field 'first_name' with an unknown type value :stringgy."
+        )
+      end
+    end
+
+    context 'when type is a string' do
+      let(:error) do
+        described_class.new(Person, :first_name, 'stringgy')
+      end
+
+      it "contains the problem in the message" do
+        expect(error.message).to include(
+          %q,Invalid field type "stringgy" for field 'first_name' on model 'Person'.,
+        )
+      end
+
+      it "contains the summary in the message" do
+        expect(error.message).to include(
+          %q,Model 'Person' defines a field 'first_name' with an unknown type value "stringgy".,
+        )
+      end
+    end
+
+    it "contains the resolution in the message" do
+      expect(error.message).to include(
+        'Please provide a valid type value for the field.'
+      )
+    end
+  end
+end

data/spec/mongoid/errors/invalid_find_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::InvalidFind do
@@ -9,19 +11,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::InvalidIncludes do
@@ -19,19 +21,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::InvalidIndex do
@@ -9,19 +11,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::InvalidOptions do
@@ -9,19 +11,19 @@ describe Mongoid::Errors::InvalidOptions do
     end
 
     it "contains the problem in the message" do
-      error.message.should include(
-        "Invalid option :invalid provided to relation :name."
+      expect(error.message).to include(
+        "Invalid option :invalid provided to association :name."
       )
     end
 
     it "contains the summary in the message" do
-      error.message.should include(
-        "Mongoid checks the options that are passed to the relation macros"
+      expect(error.message).to include(
+        "Mongoid checks the options that are passed to the association 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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Mongoid::Errors::InvalidPath do
@@ -9,15 +11,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_relation_spec.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Mongoid::Errors::InvalidRelation do
+
+  describe "#message" do
+
+    module MyModule
+      def crazy_method; self; end
+    end
+
+    before do
+      Object.send(:include, MyModule)
+    end
+
+    let(:error) do
+      described_class.new(Person, :crazy_method)
+    end
+
+    it "contains the problem in the message" do
+      expect(error.message).to include(
+                                   "Defining an association named 'crazy_method' is not allowed."
+                               )
+    end
+
+    it "contains the summary in the message" do
+      expect(error.message).to include(
+                                   "Defining this association would override the method 'crazy_method'"
+                               )
+    end
+
+    it "contains the resolution in the message" do
+      expect(error.message).to include(
+                                   "Use Mongoid.destructive_fields to see what names are not allowed"
+                               )
+    end
+  end
+end

data/spec/mongoid/errors/invalid_scope_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::InvalidScope do
@@ -9,20 +11,20 @@ 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(
-        "Scopes in Mongoid must be either criteria objects or procs that wrap"
+      expect(error.message).to include(
+        "Scopes in Mongoid must be procs that wrap"
       )
     end
 
     it "contains the resolution in the message" do
-      error.message.should include(
-        "Change the scope to be a criteria or proc wrapped critera."
+      expect(error.message).to include(
+        "Change the scope to be a proc wrapped criteria."
       )
     end
   end

data/spec/mongoid/errors/invalid_set_polymorphic_relation_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::InvalidSetPolymorphicRelation do
@@ -5,12 +7,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::InvalidStorageOptions do
@@ -9,19 +11,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::InvalidTime do
@@ -9,19 +11,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::InverseNotFound do
@@ -9,19 +11,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(
-        "hen adding a document to a relation, Mongoid attempts to link"
+      expect(error.message).to include(
+        "hen adding a document to an association, 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_client_configuration_spec.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Mongoid::Errors::MixedClientConfiguration do
+
+  describe "#message" do
+
+    let(:error) do
+      described_class.new(:testing, { uri: "blah" })
+    end
+
+    it "contains the problem in the message" do
+      expect(error.message).to include(
+        "Both uri and standard configuration options defined"
+      )
+    end
+
+    it "contains the summary in the message" do
+      expect(error.message).to include(
+        "Instead of simply giving uri or standard options a preference"
+      )
+    end
+
+    it "contains the resolution in the message" do
+      expect(error.message).to include(
+        "Provide either only a uri as configuration"
+      )
+    end
+  end
+end

data/spec/mongoid/errors/mixed_relations_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::MixedRelations do
@@ -9,19 +11,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/mongoid_error_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Mongoid::Errors::MongoidError do
@@ -7,10 +9,28 @@ describe Mongoid::Errors::MongoidError do
   let(:options) { {} }
 
   before do
-    ["message", "summary", "resolution"].each do |name|
-      ::I18n.should_receive(:translate).
-        with("mongoid.errors.messages.#{key}.#{name}", { locale: :en }).
-      and_return(name)
+    # JRuby 9.3 RUBY_VERSION is set to 2.6.8, but the behavior matches Ruby 2.7.
+    # See https://github.com/jruby/jruby/issues/7184
+    if RUBY_VERSION >= '2.7' || (BSON::Environment.jruby? && JRUBY_VERSION >= '9.3')
+      {"message_title" => "message", "summary_title" => "summary", "resolution_title" => "resolution"}.each do |key, name|
+        expect(::I18n).to receive(:translate).with("mongoid.errors.messages.#{key}", **{}).and_return(name)
+      end
+
+      ["message", "summary", "resolution"].each do |name|
+        expect(::I18n).to receive(:translate).
+          with("mongoid.errors.messages.#{key}.#{name}", **{}).
+          and_return(name)
+      end
+    else
+      {"message_title" => "message", "summary_title" => "summary", "resolution_title" => "resolution"}.each do |key, name|
+        expect(::I18n).to receive(:translate).with("mongoid.errors.messages.#{key}", {}).and_return(name)
+      end
+
+      ["message", "summary", "resolution"].each do |name|
+        expect(::I18n).to receive(:translate).
+          with("mongoid.errors.messages.#{key}.#{name}", {}).
+          and_return(name)
+      end
     end
 
     error.compose_message(key, options)
@@ -19,30 +39,45 @@ describe Mongoid::Errors::MongoidError do
   describe "#compose_message" do
 
     it "sets ivar problem" do
-      error.instance_variable_get(:@problem).should be
+      expect(error.problem).to be
     end
 
     it "sets ivar summary" do
-      error.instance_variable_get(:@summary).should be
+      expect(error.summary).to be
     end
 
     it "sets ivar resolution" do
-      error.instance_variable_get(:@resolution).should be
+      expect(error.resolution).to be
+    end
+
+    it "sets ivar problem_title" do
+      expect(error.instance_variable_get(:@problem_title)).to be
+    end
+
+    it "sets ivar summary_title" do
+      expect(error.instance_variable_get(:@summary_title)).to be
+    end
+
+    it "sets ivar resolution_title" do
+      expect(error.instance_variable_get(:@resolution_title)).to be
     end
   end
 
   describe "#to_json" do
 
     it "has problem" do
-      error.to_json.should include('"problem":"message"')
+      # @todo: uncomment if https://github.com/rails/rails/pull/24628 is merged
+      #expect(error.to_json).to include('"problem":"message"')
     end
 
     it "has summary" do
-      error.to_json.should include('"summary":"summary"')
+      # @todo: uncomment if https://github.com/rails/rails/pull/24628 is merged
+      #expect(error.to_json).to include('"summary":"summary"')
     end
 
     it "has resolution" do
-      error.to_json.should include('"resolution":"resolution"')
+      # @todo: uncomment if https://github.com/rails/rails/pull/24628 is merged
+      #expect(error.to_json).to include('"resolution":"resolution"')
     end
   end
 end

data/spec/mongoid/errors/nested_attributes_metadata_not_found_spec.rb

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