mongoid 7.0.2 → 8.1.1

data/spec/mongoid/errors/delete_restriction_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::DeleteRestriction do
@@ -10,13 +12,13 @@ describe Mongoid::Errors::DeleteRestriction do
 
     it "contains the problem in the message" do
       expect(error.message).to include(
-        "Cannot delete Person because of dependent 'drugs'."
+        "Cannot destroy Person because of dependent 'drugs'."
       )
     end
 
     it "contains the summary in the message" do
       expect(error.message).to include(
-        "When defining 'drugs' with a :dependent => :restrict,"
+        "When defining 'drugs' with a :dependent => :restrict_with_error,"
       )
     end
 

data/spec/mongoid/errors/document_not_destroyed_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::DocumentNotDestroyed do

data/spec/mongoid/errors/document_not_found_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::DocumentNotFound do
@@ -78,6 +80,82 @@ describe Mongoid::Errors::DocumentNotFound do
         )
       end
     end
+
+    context "when providing an _id and a shard key" do
+
+      let(:id) { BSON::ObjectId.new }
+      let(:doc) { { _id: id, a: "syd" } }
+      let(:error) do
+        described_class.new(Person, id, doc)
+      end
+
+      it "contains the problem in the message" do
+        expect(error.message).to include(
+          "Document not found for class Person with id #{id.to_s} and shard key a: syd."
+        )
+      end
+
+      it "contains the summary in the message" do
+        expect(error.message).to include(
+          "When calling Person.find with an id and a shard key"
+        )
+      end
+
+      it "contains the resolution in the message" do
+        expect(error.message).to include(
+          "Search for an id/shard key that is in the database or set"
+        )
+      end
+    end
+
+    context "when providing an id in a hash without a shard key" do
+
+      let(:error) do
+        described_class.new(Person, 1, { _id: 1 })
+      end
+
+      it "contains the problem in the message" do
+        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
+        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
+        expect(error.message).to include(
+          "Search for an id that is in the database or set the"
+        )
+      end
+    end
+
+    context "when not providing params or unmatched" do
+      let(:error) do
+        described_class.new(Person, nil, nil)
+      end
+
+      it "contains the problem in the message" do
+        expect(error.message).to include(
+          "Could not find a document of class Person."
+        )
+      end
+
+      it "contains the summary in the message" do
+        expect(error.message).to include(
+          "Mongoid attempted to find a document of the class Person but none exist."
+        )
+      end
+
+      it "contains the resolution in the message" do
+        expect(error.message).to include(
+          "Create a document of class Person or use a finder method that does not raise an exception when no documents are found."
+        )
+      end
+    end
   end
 
   describe "#params" do

data/spec/mongoid/errors/invalid_collection_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::InvalidCollection do

data/spec/mongoid/errors/{eager_load_spec.rb → invalid_config_file_spec.rb}

@@ -1,28 +1,30 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
-describe Mongoid::Errors::EagerLoad do
+describe Mongoid::Errors::InvalidConfigFile do
 
   describe "#message" do
 
     let(:error) do
-      described_class.new(:ratable)
+      described_class.new('/my/path')
     end
 
     it "contains the problem in the message" do
       expect(error.message).to include(
-        "Eager loading :ratable is not supported since it is a polymorphic"
+        "Invalid configuration file: /my/path."
       )
     end
 
     it "contains the summary in the message" do
       expect(error.message).to include(
-        "Mongoid cannot currently determine the classes it needs to eager"
+        "Your mongoid.yml configuration file does not contain the"
       )
     end
 
     it "contains the resolution in the message" do
       expect(error.message).to include(
-        "Don't attempt to perform this action and have patience"
+        "Ensure your configuration file contains the correct contents."
       )
     end
   end

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

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

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,7 +15,7 @@ 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

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

data/spec/mongoid/errors/invalid_includes_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::InvalidIncludes do

data/spec/mongoid/errors/invalid_index_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::InvalidIndex do

data/spec/mongoid/errors/invalid_options_spec.rb

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

data/spec/mongoid/errors/invalid_relation_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::InvalidRelation do
@@ -18,13 +20,13 @@ describe Mongoid::Errors::InvalidRelation do
 
     it "contains the problem in the message" do
       expect(error.message).to include(
-                                   "Defining a relation named 'crazy_method' is not allowed."
+                                   "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 relation would override the method 'crazy_method'"
+                                   "Defining this association would override the method 'crazy_method'"
                                )
     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
@@ -22,7 +24,7 @@ describe Mongoid::Errors::InvalidScope do
 
     it "contains the resolution in the message" do
       expect(error.message).to include(
-        "Change the scope to be a proc wrapped critera."
+        "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

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

data/spec/mongoid/errors/invalid_time_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::InvalidTime do

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
@@ -16,7 +18,7 @@ describe Mongoid::Errors::InverseNotFound do
 
     it "contains the summary in the message" do
       expect(error.message).to include(
-        "hen adding a document to a relation, Mongoid attempts to link"
+        "hen adding a document to an association, Mongoid attempts to link"
       )
     end
 

data/spec/mongoid/errors/mixed_client_configuration_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::MixedClientConfiguration do

data/spec/mongoid/errors/mixed_relations_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::MixedRelations do

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,14 +9,28 @@ describe Mongoid::Errors::MongoidError do
   let(:options) { {} }
 
   before do
-    {"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)
+    # 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)

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

data/spec/mongoid/errors/no_client_config_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::NoClientConfig do
@@ -5,12 +7,12 @@ describe Mongoid::Errors::NoClientConfig do
   describe "#message" do
 
     let(:error) do
-      described_class.new(:secondary)
+      described_class.new(:analytics)
     end
 
     it "contains the problem in the message" do
       expect(error.message).to include(
-        "No configuration could be found for a client named 'secondary'."
+        "No configuration could be found for a client named 'analytics'."
       )
     end
 

data/spec/mongoid/errors/no_client_database_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::NoClientDatabase do
@@ -5,12 +7,12 @@ describe Mongoid::Errors::NoClientDatabase do
   describe "#message" do
 
     let(:error) do
-      described_class.new(:secondary, { hosts: [ "127.0.0.1:27017" ] })
+      described_class.new(:analytics, { hosts: [ "127.0.0.1:27017" ] })
     end
 
     it "contains the problem in the message" do
       expect(error.message).to include(
-        "No database provided for client configuration: :secondary."
+        "No database provided for client configuration: :analytics."
       )
     end
 
@@ -22,7 +24,7 @@ describe Mongoid::Errors::NoClientDatabase do
 
     it "contains the resolution in the message" do
       expect(error.message).to include(
-        "If configuring via a mongoid.yml, ensure that within your :secondary"
+        "If configuring via a mongoid.yml, ensure that within your :analytics"
       )
     end
   end

data/spec/mongoid/errors/no_client_hosts_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::NoClientHosts do
@@ -5,12 +7,12 @@ describe Mongoid::Errors::NoClientHosts do
   describe "#message" do
 
     let(:error) do
-      described_class.new(:secondary, { database: "mongoid_test" })
+      described_class.new(:analytics, { database: "mongoid_test" })
     end
 
     it "contains the problem in the message" do
       expect(error.message).to include(
-        "No hosts provided for client configuration: :secondary."
+        "No hosts provided for client configuration: :analytics."
       )
     end
 
@@ -22,7 +24,7 @@ describe Mongoid::Errors::NoClientHosts do
 
     it "contains the resolution in the message" do
       expect(error.message).to include(
-        "If configuring via a mongoid.yml, ensure that within your :secondary"
+        "If configuring via a mongoid.yml, ensure that within your :analytics"
       )
     end
   end

data/spec/mongoid/errors/no_clients_config_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::NoClientsConfig do

data/spec/mongoid/errors/no_environment_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::NoEnvironment do
@@ -10,19 +12,19 @@ describe Mongoid::Errors::NoEnvironment do
 
     it "contains the problem in the message" do
       expect(error.message).to include(
-        "Could not load the configuration since no environment was defined."
+        "Mongoid could not determine the environment"
       )
     end
 
     it "contains the summary in the message" do
       expect(error.message).to include(
-        "Mongoid attempted to find the appropriate environment but no Rails.env"
+        "it was not specified in any of the following locations"
       )
     end
 
     it "contains the resolution in the message" do
       expect(error.message).to include(
-        "Make sure some environment is set from the mentioned options"
+        "Please ensure an environment is set"
       )
     end
   end

data/spec/mongoid/errors/no_map_reduce_output_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::NoMapReduceOutput do

data/spec/mongoid/errors/no_metadata_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Mongoid::Errors::NoMetadata do
@@ -13,11 +15,11 @@ describe Mongoid::Errors::NoMetadata do
     end
 
     it "contains the summary in the message" do
-      expect(error.message).to include("Mongoid sets the metadata of a relation on the")
+      expect(error.message).to include("Mongoid sets the metadata of an association on the")
     end
 
     it "contains the resolution in the message" do
-      expect(error.message).to include("Ensure that your relations on the Address model")
+      expect(error.message).to include("Ensure that your associations on the Address model")
     end
   end
 end

data/spec/mongoid/errors/no_parent_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::NoParent do
@@ -22,7 +24,7 @@ describe Mongoid::Errors::NoParent do
 
     it "contains the resolution in the message" do
       expect(error.message).to include(
-        "Ensure that you've set the parent relation if instantiating"
+        "Ensure that you've set the parent association if instantiating"
       )
     end
   end

data/spec/mongoid/errors/readonly_attribute_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::ReadonlyAttribute do

data/spec/mongoid/errors/readonly_document_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::ReadonlyDocument do
@@ -10,13 +12,13 @@ describe Mongoid::Errors::ReadonlyDocument do
 
     it "contains the problem in the message" do
       expect(error.message).to include(
-        "Attempted to persist the readonly document 'Band'."
+        "Attempted to persist a readonly document of class 'Band'."
       )
     end
 
     it "contains the summary in the message" do
       expect(error.message).to include(
-        "Documents loaded from the database using #only"
+        "Documents that are marked readonly cannot be persisted"
       )
     end
 

data/spec/mongoid/errors/scope_overwrite_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Errors::ScopeOverwrite do