mongoid 7.1.1 → 8.1.0

data/spec/mongoid/equality_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
-# -*- coding: utf-8 -*-
 require "spec_helper"
 
 describe Mongoid::Equality do
@@ -87,92 +85,194 @@ describe Mongoid::Equality do
 
   describe ".===" do
 
-    context "when comparable is an instance of this document" do
+    context "when legacy_triple_equals is not set" do
+      config_override :legacy_triple_equals, false
 
-      it "returns true" do
-        expect(klass === person).to be true
+      context "when comparable is an instance of this document" do
+
+        it "returns true" do
+          expect(klass === person).to be true
+        end
       end
-    end
 
-    context "when comparable is a relation of this document" do
+      context "when comparable is a relation of this document" do
+
+        let(:relation) do
+          Post.new(person: person).person
+        end
 
-      let(:relation) do
-        Post.new(person: person).person
+        it "returns true" do
+          expect(klass === relation).to be true
+        end
       end
 
-      it "returns true" do
-        expect(klass === relation).to be true
+      context "when comparable is the same class" do
+
+        it "returns false" do
+          expect(klass === Person).to be false
+        end
       end
-    end
 
-    context "when comparable is the same class" do
+      context "when the comparable is a subclass" do
 
-      it "returns true" do
-        expect(klass === Person).to be true
+        it "returns false" do
+          expect(Person === Doctor).to be false
+        end
       end
-    end
 
-    context "when the comparable is a subclass" do
+      context "when the comparable is an instance of a subclass" do
 
-      it "returns false" do
-        expect(Person === Doctor).to be false
+        it "returns true" do
+          expect(Person === Doctor.new).to be true
+        end
       end
     end
 
-    context "when the comparable is an instance of a subclass" do
+    context "when legacy_triple_equals is set" do
+      config_override :legacy_triple_equals, true
 
-      it "returns true" do
-        expect(Person === Doctor.new).to be true
+      context "when comparable is an instance of this document" do
+
+        it "returns true" do
+          expect(klass === person).to be true
+        end
       end
-    end
-  end
 
-  describe "#===" do
+      context "when comparable is a relation of this document" do
+
+        let(:relation) do
+          Post.new(person: person).person
+        end
+
+        it "returns true" do
+          expect(klass === relation).to be true
+        end
+      end
+
+      context "when comparable is the same class" do
 
-    context "when comparable is the same type" do
+        it "returns true" do
+          expect(klass === Person).to be true
+        end
+      end
 
-      context "when the instance is different" do
+      context "when the comparable is a subclass" do
 
         it "returns false" do
-          expect(person === Person.new).to be false
+          expect(Person === Doctor).to be false
         end
       end
 
-      context "when the instance is the same" do
+      context "when the comparable is an instance of a subclass" do
 
         it "returns true" do
-          expect(person === person).to be true
+          expect(Person === Doctor.new).to be true
         end
       end
     end
+  end
 
-    context "when the comparable is a subclass" do
+  describe "#===" do
 
-      it "returns false" do
-        expect(person === Doctor.new).to be false
+    context "when legacy_triple_equals is set" do
+      config_override :legacy_triple_equals, true
+
+      context "when comparable is the same type" do
+
+        context "when the instance is different" do
+
+          it "returns false" do
+            expect(person === Person.new).to be false
+          end
+        end
+
+        context "when the instance is the same" do
+
+          it "returns true" do
+            expect(person === person).to be true
+          end
+        end
+      end
+
+      context "when the comparable is a subclass" do
+
+        it "returns false" do
+          expect(person === Doctor.new).to be false
+        end
+      end
+
+      context "when comparing to a class" do
+
+        context "when the class is the same" do
+
+          it "returns true" do
+            expect(person === Person).to be true
+          end
+        end
+
+        context "when the class is a subclass" do
+
+          it "returns false" do
+            expect(person === Doctor).to be false
+          end
+        end
+
+        context "when the class is a superclass" do
+
+          it "returns true" do
+            expect(Doctor.new === Person).to be true
+          end
+        end
       end
     end
 
-    context "when comparing to a class" do
+    context "when legacy_triple_equals is not set" do
+      config_override :legacy_triple_equals, false
 
-      context "when the class is the same" do
+      context "when comparable is the same type" do
 
-        it "returns true" do
-          expect(person === Person).to be true
+        context "when the instance is different" do
+
+          it "returns false" do
+            expect(person === Person.new).to be false
+          end
+        end
+
+        context "when the instance is the same" do
+
+          it "returns true" do
+            expect(person === person).to be true
+          end
         end
       end
 
-      context "when the class is a subclass" do
+      context "when the comparable is a subclass" do
 
         it "returns false" do
-          expect(person === Doctor).to be false
+          expect(person === Doctor.new).to be false
         end
       end
 
-      context "when the class is a superclass" do
+      context "when comparing to a class" do
+        context "when the class is the same" do
 
-        it "returns true" do
-          expect(Doctor.new === Person).to be true
+          it "returns false" do
+            expect(person === Person).to be false
+          end
+        end
+
+        context "when the class is a subclass" do
+
+          it "returns false" do
+            expect(person === Doctor).to be false
+          end
+        end
+
+        context "when the class is a superclass" do
+
+          it "returns false" do
+            expect(Doctor.new === Person).to be false
+          end
         end
       end
     end

data/spec/mongoid/errors/ambiguous_relationship_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require 'spec_helper'
 

data/spec/mongoid/errors/callback_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/errors/delete_restriction_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -13,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,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/errors/document_not_found_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -81,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,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

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

@@ -1,31 +1,30 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 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,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/errors/invalid_field_option_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/errors/invalid_field_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -16,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,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/errors/invalid_includes_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/errors/invalid_index_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/errors/invalid_options_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/errors/invalid_path_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require 'spec_helper'
 

data/spec/mongoid/errors/invalid_relation_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/errors/invalid_scope_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -25,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,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/errors/invalid_storage_options_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/errors/invalid_time_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/errors/inverse_not_found_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/errors/mixed_client_configuration_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/errors/mixed_relations_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/errors/mongoid_error_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require 'spec_helper'
 
@@ -10,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,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"