mongoid 8.1.13 → 9.0.0

data/spec/mongoid/attributes_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 require_relative './attributes/nested_spec_models'
@@ -166,7 +167,7 @@ describe Mongoid::Attributes do
         it "raises an error" do
           expect {
             from_db.title
-          }.to raise_error(ActiveModel::MissingAttributeError)
+          }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'title' on Person which was not loaded/)
         end
 
         context "accessing via []" do
@@ -174,7 +175,7 @@ describe Mongoid::Attributes do
           it "raises an error" do
             expect {
               from_db["title"]
-            }.to raise_error(ActiveModel::MissingAttributeError)
+            }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'title' on Person which was not loaded/)
           end
         end
       end
@@ -188,7 +189,7 @@ describe Mongoid::Attributes do
         it "raises an error" do
           expect {
             from_db.title
-          }.to raise_error(ActiveModel::MissingAttributeError)
+          }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'title' on Person which was not loaded/)
         end
       end
     end
@@ -270,7 +271,7 @@ describe Mongoid::Attributes do
           it "raises an error" do
             expect {
               from_db[:title]
-            }.to raise_error(ActiveModel::MissingAttributeError)
+            }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'title' on Person which was not loaded/)
           end
         end
 
@@ -283,27 +284,11 @@ describe Mongoid::Attributes do
           it "raises an error" do
             expect {
               from_db[:title]
-            }.to raise_error(ActiveModel::MissingAttributeError)
+            }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'title' on Person which was not loaded/)
           end
         end
       end
 
-      context "when given nil" do
-
-        it "returns nil" do
-         expect(person[nil]).to be nil
-        end
-
-      end
-
-      context "when given an empty string" do
-
-        it "returns nil" do
-         expect(person[""]).to be nil
-        end
-
-      end
-
       context "when the field was not explicitly defined" do
 
         context "when excluding with only and the field was not excluded" do
@@ -315,7 +300,7 @@ describe Mongoid::Attributes do
           it "raises an error" do
             expect {
               from_db[:undefined_field]
-            }.to raise_error(ActiveModel::MissingAttributeError)
+            }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'undefined_field' on Person which was not loaded/)
           end
         end
 
@@ -328,7 +313,7 @@ describe Mongoid::Attributes do
           it "raises an error" do
             expect {
               from_db[:title]
-            }.to raise_error(ActiveModel::MissingAttributeError)
+            }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'title' on Person which was not loaded/)
           end
         end
 
@@ -380,10 +365,10 @@ describe Mongoid::Attributes do
           end
 
           context 'when retrieving a non-projected field' do
-            it 'raises MissingAttributeError' do
+            it 'raises AttributeNotLoaded' do
               expect do
                 from_db['name.first_name']
-              end.to raise_error(ActiveModel::MissingAttributeError)
+              end.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'name.first_name' on Person which was not loaded/)
             end
           end
         end
@@ -503,7 +488,7 @@ describe Mongoid::Attributes do
           it "raises an error" do
             expect {
               from_db[:undefined_field] = 'x'
-            }.to raise_error(ActiveModel::MissingAttributeError)
+            }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'undefined_field' on Person which was not loaded/)
           end
         end
 
@@ -516,7 +501,7 @@ describe Mongoid::Attributes do
           it "raises an error" do
             expect {
               from_db[:title] = 'x'
-            }.to raise_error(ActiveModel::MissingAttributeError)
+            }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'title' on Person which was not loaded/)
           end
         end
 
@@ -1112,7 +1097,7 @@ describe Mongoid::Attributes do
         it "raises an error" do
           expect {
             from_db.read_attribute(:undefined_field)
-          }.to raise_error(ActiveModel::MissingAttributeError)
+          }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'undefined_field' on Person which was not loaded/)
         end
       end
 
@@ -1125,7 +1110,7 @@ describe Mongoid::Attributes do
         it "raises an error" do
           expect {
             from_db.read_attribute(:title)
-          }.to raise_error(ActiveModel::MissingAttributeError)
+          }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'title' on Person which was not loaded/)
         end
       end
 
@@ -1606,8 +1591,8 @@ describe Mongoid::Attributes do
         expect(person.map).to be_nil
       end
 
-      it "can set a Hash value" do
-        expect(person.map).to eq( { somekey: "somevalue" } )
+      it "can set a Hash value with stringified keys" do
+        expect(person.map).to eq( { "somekey" => "somevalue" } )
       end
     end
 
@@ -1657,7 +1642,7 @@ describe Mongoid::Attributes do
         it "raises an error" do
           expect {
             from_db.write_attribute(:undefined_field, 'x')
-          }.to raise_error(ActiveModel::MissingAttributeError)
+          }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'undefined_field' on Person which was not loaded/)
         end
       end
 
@@ -1670,7 +1655,7 @@ describe Mongoid::Attributes do
         it "raises an error" do
           expect {
             from_db.write_attribute(:title, 'x')
-          }.to raise_error(ActiveModel::MissingAttributeError)
+          }.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'title' on Person which was not loaded/)
         end
       end
 
@@ -1688,8 +1673,6 @@ describe Mongoid::Attributes do
     end
 
     context "when comparing the object_ids of the written value" do
-      config_override :legacy_attributes, false
-
       before do
         Person.create!
       end

data/spec/mongoid/cacheable_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 

data/spec/mongoid/changeable_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -207,13 +208,13 @@ describe Mongoid::Changeable do
 
         it "returns an array of the original value and new value" do
           expect(person.send(:attribute_change, "map")).to eq(
-            [{ location: "Home" }, { location: "Work" }]
+            [{ "location" => "Home" }, { "location" => "Work" }]
           )
         end
 
         it "allows access via (attribute)_change" do
           expect(person.map_change).to eq(
-            [{ location: "Home" }, { location: "Work" }]
+            [{ "location" => "Home" }, { "location" => "Work" }]
           )
         end
 
@@ -225,7 +226,7 @@ describe Mongoid::Changeable do
 
           it "returns an array of the original value and new value" do
             expect(person.send(:attribute_change, "map")).to eq(
-              [{ location: "Home" }, { location: "Work", lat: 20.0 }]
+              [{ "location" => "Home" }, { "location" => "Work", "lat" => 20.0 }]
             )
           end
         end

data/spec/mongoid/clients/factory_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -29,32 +30,6 @@ describe Mongoid::Clients::Factory do
     end
   end
 
-  shared_examples_for 'includes rails wrapping library' do
-    context 'when Rails is available' do
-      around do |example|
-        original_rails_constant = defined?(::Rails) ? ::Rails : nil
-        Object.send(:remove_const, :Rails) if original_rails_constant
-
-        module ::Rails
-          def self.version
-            '6.1.0'
-          end
-        end
-
-        example.run
-
-        Object.send(:remove_const, :Rails) if defined?(::Rails)
-        Object.const_set(:Rails, original_rails_constant)
-      end
-
-      it 'adds Rails as another wrapping library' do
-        expect(client.options[:wrapping_libraries]).to include(
-          {'name' => 'Rails', 'version' => '6.1.0'},
-        )
-      end
-    end
-  end
-
   describe ".create" do
 
     context "when provided a name" do
@@ -114,8 +89,6 @@ describe Mongoid::Clients::Factory do
               Mongoid::Clients::Factory::MONGOID_WRAPPING_LIBRARY)]
           end
 
-          it_behaves_like 'includes rails wrapping library'
-
           context 'when configuration specifies a wrapping library' do
 
             let(:config) do
@@ -137,8 +110,6 @@ describe Mongoid::Clients::Factory do
                 {'name' => 'Foo'},
               ]
             end
-
-            it_behaves_like 'includes rails wrapping library'
           end
         end
 
@@ -275,6 +246,82 @@ describe Mongoid::Clients::Factory do
           }.to raise_error(Mongoid::Errors::NoClientConfig)
         end
       end
+
+      context 'when auto_encryption_options are provided' do
+        require_enterprise
+        require_libmongocrypt
+        restore_config_clients
+        include_context 'with encryption'
+
+        before do
+          Mongoid::Config.send(:clients=, config)
+          key_vault_client[key_vault_collection].drop
+        end
+
+        after do
+          client.close
+        end
+
+        let(:client) do
+          described_class.create(:encrypted)
+        end
+
+        context 'when no key vault client is provided' do
+          let(:config) do
+            {
+              default: { hosts: SpecConfig.instance.addresses, database: database_id },
+              encrypted: {
+                hosts: SpecConfig.instance.addresses,
+                database: database_id,
+                options: {
+                  auto_encryption_options: {
+                    kms_providers: kms_providers,
+                    key_vault_namespace: key_vault_namespace,
+                    extra_options: extra_options
+                  }
+                }
+              }
+            }
+          end
+
+          it "returns a client" do
+            expect(client).to be_a(Mongo::Client)
+          end
+
+          it 'sets schema_map for the client' do
+            expect(client.options[:auto_encryption_options][:schema_map]).not_to be_nil
+          end
+        end
+
+        context 'when a key vault client is provided' do
+          let(:config) do
+            {
+              default: { hosts: SpecConfig.instance.addresses, database: database_id },
+              key_vault: { hosts: SpecConfig.instance.addresses, database: database_id },
+              encrypted: {
+                hosts: SpecConfig.instance.addresses,
+                database: database_id,
+                options: {
+                  auto_encryption_options: {
+                    key_vault_client: :key_vault,
+                    kms_providers: kms_providers,
+                    key_vault_namespace: key_vault_namespace,
+                    extra_options: extra_options
+                  }
+                }
+              }
+            }
+          end
+
+          it "returns a client" do
+            expect(client).to be_a(Mongo::Client)
+          end
+
+          it 'sets key_vault_client option for the client' do
+            expect(client.options[:auto_encryption_options][:key_vault_client]).to eq(Mongoid::Clients.with_name(:key_vault))
+          end
+        end
+      end
     end
 
     context "when no name is provided" do

data/spec/mongoid/clients/options_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -141,7 +142,8 @@ describe Mongoid::Clients::Options, retry: 3 do
           end
 
           it 'does not create a new cluster' do
-            expect(connections_during).to eq(connections_before)
+            # https://jira.mongodb.org/browse/MONGOID-5130
+            # expect(connections_during).to eq(connections_before)
 
             cluster_during.should be cluster_before
           end
@@ -342,7 +344,7 @@ describe Mongoid::Clients::Options, retry: 3 do
 
         it 'clears the persistence context' do
           begin; persistence_context; rescue Mongoid::Errors::InvalidPersistenceOption; end
-          expect(test_model.persistence_context).to eq(Mongoid::PersistenceContext.new(test_model))
+          expect(test_model.persistence_context).to eq(Mongoid::PersistenceContext.new(test_model, test_model.storage_options))
         end
       end
 
@@ -413,7 +415,6 @@ describe Mongoid::Clients::Options, retry: 3 do
         end
 
         context 'when the options create a new cluster' do
-          retry_test
           # This test fails on sharded topologies in Evergreen but not locally
           require_topology :single, :replica_set
 
@@ -426,8 +427,11 @@ describe Mongoid::Clients::Options, retry: 3 do
             expect(cluster_during).not_to be(cluster_before)
           end
 
+          # Here connections_after should be equal to connections_before,
+          # but that case fails randomly.
           it 'disconnects the new cluster when the block exits' do
-            expect(connections_after).to eq(connections_before)
+            expect(connections_after).to be < connections_during
+            expect(cluster_after).to be(cluster_before)
           end
         end
 
@@ -438,7 +442,7 @@ describe Mongoid::Clients::Options, retry: 3 do
           let(:options) { { read: :secondary } }
 
           it 'does not create a new cluster' do
-            expect(connections_during).to eq(connections_before)
+            expect(connections_during).to be <= connections_before
           end
 
           it 'does not disconnect the original cluster' do

data/spec/mongoid/clients/sessions_spec.rb

@@ -1,8 +1,19 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 
 describe Mongoid::Clients::Sessions do
+  let(:buffer) { StringIO.new }
+  let(:logger) { ::Logger.new(buffer, Logger::DEBUG) }
+
+  around do |example|
+    old_logger = Mongoid.logger
+    Mongoid.logger = logger
+    example.run
+  ensure
+    Mongoid.logger = old_logger
+  end
 
   before(:all) do
     CONFIG[:clients][:other] = CONFIG[:clients][:default].dup
@@ -38,7 +49,6 @@ describe Mongoid::Clients::Sessions do
   context 'when a session is used on a model class' do
 
     context 'when sessions are supported' do
-      min_server_version '3.6'
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -126,8 +136,8 @@ describe Mongoid::Clients::Sessions do
             e
           end
 
-          it 'raises an error' do
-            expect(error).to be_a(Mongoid::Errors::InvalidSessionUse)
+          it 'does not raise an error' do
+            expect(error).to be_nil
           end
 
           it 'uses a single session id for all operations on the class' do
@@ -156,7 +166,7 @@ describe Mongoid::Clients::Sessions do
           end
 
           it 'raises an error' do
-            expect(error).to be_a(Mongoid::Errors::InvalidSessionUse)
+            expect(error).to be_a(Mongoid::Errors::InvalidSessionNesting)
           end
 
           it 'does not execute any operations' do
@@ -177,7 +187,6 @@ describe Mongoid::Clients::Sessions do
     end
 
     context 'when sessions are supported' do
-      min_server_version '3.6'
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -233,6 +242,10 @@ describe Mongoid::Clients::Sessions do
             expect(insert_lsids_sent.uniq.size).to eq(1)
             expect(update_lsids_sent.uniq).to eq(insert_lsids_sent.uniq)
           end
+
+          it 'does not warn about a different client' do
+            expect(buffer.string).not_to include("used within another client's session")
+          end
         end
 
         context 'when the other class uses a different client' do
@@ -251,15 +264,19 @@ describe Mongoid::Clients::Sessions do
             e
           end
 
-          it 'raises an error' do
-            expect(error).to be_a(Mongoid::Errors::InvalidSessionUse)
+          it 'does not raise an error' do
+            expect(error).to be_nil
           end
 
           it 'uses a single session id for all operations on the class' do
             expect(person.reload.username).to eq('Emily')
-            expect(Post.count).to be(0)
+            expect(Post.count).to be(1)
             update_lsids_sent = update_events.collect { |event| event.command['lsid'] }
-            expect(update_lsids_sent.size).to eq(1)
+            expect(update_lsids_sent.size).to eq(2)
+          end
+
+          it 'warns about a different client' do
+            expect(buffer.string).to include("used within another client's session")
           end
         end
 
@@ -282,7 +299,7 @@ describe Mongoid::Clients::Sessions do
           end
 
           it 'raises an error' do
-            expect(error).to be_a(Mongoid::Errors::InvalidSessionUse)
+            expect(error).to be_a(Mongoid::Errors::InvalidSessionNesting)
           end
 
           it 'does not execute any operations' do