mongoid 7.3.2 → 7.4.0

data/spec/mongoid/document_fields_spec.rb

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

data/spec/mongoid/document_persistence_context_spec.rb

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

data/spec/mongoid/document_query_spec.rb

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

data/spec/mongoid/document_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -431,27 +430,6 @@ describe Mongoid::Document do
       Person.new(title: "Sir")
     end
 
-    describe 'id' do
-      context 'rails < 6' do
-        max_rails_version '5.2'
-
-        it 'is a BSON::ObjectId' do
-          id = person.as_json['_id']
-          expect(id).to be_a(BSON::ObjectId)
-        end
-      end
-
-      context 'rails >= 6' do
-        min_rails_version '6.0'
-
-        it 'is a hash with $oid' do
-          id = person.as_json['_id']
-          expect(id).to be_a(Hash)
-          expect(id['$oid']).to be_a(String)
-        end
-      end
-    end
-
     context "when no options are provided" do
 
       it "does not apply any options" do
@@ -501,7 +479,7 @@ describe Mongoid::Document do
       end
     end
 
-    context ':compact option' do
+    context 'deprecated :compact option' do
       # Since rails 6 differs in how it treats id fields,
       # run this test on one version of rails. Currently rails 6 is in beta,
       # when it is released this version should be changed to 6.
@@ -513,6 +491,26 @@ describe Mongoid::Document do
         expect(church.as_json.keys.sort).to eq(%w(_id location name))
       end
 
+      context 'deprecation' do
+        let(:church) do
+          Church.create!(name: 'St. Basil')
+        end
+
+        let(:message) do
+          '#as_json :compact option is deprecated. Please call #compact on the returned Hash object instead.'
+        end
+
+        it 'logs a deprecation warning when :compact is given' do
+          expect_any_instance_of(Logger).to receive(:warn).with(message)
+          church.as_json(compact: true)
+        end
+
+        it 'does not log a deprecation warning when :compact is not given' do
+          expect_any_instance_of(Logger).to_not receive(:warn).with(message)
+          church.as_json
+        end
+      end
+
       context 'there is a nil valued attribute' do
         let(:church) do
           Church.create!(name: 'St. Basil')
@@ -624,7 +622,7 @@ describe Mongoid::Document do
     context "when removing an embedded document" do
 
       before do
-        person.save
+        person.save!
         person.addresses.delete(address)
       end
 
@@ -637,9 +635,9 @@ describe Mongoid::Document do
 
       before do
         # Save the doc, then set an embeds_one relation to nil
-        person.save
+        person.save!
         person.name = nil
-        person.save
+        person.save!
       end
 
       it "does not include the document in the hash" do
@@ -857,7 +855,7 @@ describe Mongoid::Document do
     end
 
     before do
-      person.save
+      person.save!
     end
 
     it "persists the correct type" do
@@ -1024,11 +1022,11 @@ describe Mongoid::Document do
           context "when embedded doc is persisted" do
 
             let(:manager) do
-              Manager.create(title: "Sir")
+              Manager.create!(title: "Sir")
             end
 
             let!(:address) do
-              manager.addresses.create(street: "hobrecht")
+              manager.addresses.create!(street: "hobrecht")
             end
 
             let(:person) do
@@ -1079,7 +1077,7 @@ describe Mongoid::Document do
       context "when the document is persisted" do
 
         before do
-          manager.save
+          manager.save!
         end
 
         let(:person) do
@@ -1109,7 +1107,7 @@ describe Mongoid::Document do
       context "when the document is dirty" do
 
         before do
-          manager.save
+          manager.save!
           manager.ssn = "123-22-1234"
         end
 
@@ -1207,7 +1205,7 @@ describe Mongoid::Document do
       context "when the document is persisted" do
 
         before do
-          person.save
+          person.save!
         end
 
         let(:manager) do
@@ -1221,7 +1219,7 @@ describe Mongoid::Document do
         context "when downcasted document is saved" do
 
           before do
-            manager.save
+            manager.save!
           end
 
           it "keeps the type" do
@@ -1260,7 +1258,7 @@ describe Mongoid::Document do
       context "when the document is dirty" do
 
         before do
-          person.save
+          person.save!
           person.ssn = "123-22-1234"
         end
 

data/spec/mongoid/equality_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -86,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 set" do
+      config_override :legacy_triple_equals, true
 
-      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 not set" do
+      config_override :legacy_triple_equals, false
 
-      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 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
 
-    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 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

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"
 

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"
 

data/spec/mongoid/errors/eager_load_spec.rb

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

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/invalid_config_file_spec.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Mongoid::Errors::InvalidConfigFile do
+
+  describe "#message" do
+
+    let(:error) do
+      described_class.new('/my/path')
+    end
+
+    it "contains the problem in the message" do
+      expect(error.message).to include(
+        "Invalid configuration file: /my/path."
+      )
+    end
+
+    it "contains the summary in the message" do
+      expect(error.message).to include(
+        "Your mongoid.yml configuration file does not contain the"
+      )
+    end
+
+    it "contains the resolution in the message" do
+      expect(error.message).to include(
+        "Ensure your configuration file contains the correct contents."
+      )
+    end
+  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"
 

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'
 

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"
 

data/spec/mongoid/errors/no_client_config_spec.rb

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

data/spec/mongoid/errors/no_client_database_spec.rb

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

data/spec/mongoid/errors/no_client_hosts_spec.rb

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

data/spec/mongoid/errors/no_clients_config_spec.rb

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

data/spec/mongoid/errors/no_environment_spec.rb

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

data/spec/mongoid/errors/no_map_reduce_output_spec.rb

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