mongoid 7.1.0.rc0 → 7.1.5

data/spec/mongoid/association/referenced/has_many/proxy_spec.rb

@@ -2907,7 +2907,8 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         expect(posts).to eq([ post_one ])
       end
 
-      context 'when providing a collation', if: collation_supported? do
+      context 'when providing a collation' do
+        min_server_version '3.4'
 
         let(:posts) do
           person.posts.where(title: "FIRST").collation(locale: 'en_US', strength: 2)

data/spec/mongoid/attributes_spec.rb

@@ -1349,10 +1349,16 @@ describe Mongoid::Attributes do
     context "when attribute is a Hash" do
       let(:person) { Person.new map: { somekey: "somevalue" } }
 
-      it "raises an error when try to set an invalid value" do
-        expect {
+      it "raises an error when trying to set a value of invalid type - array" do
+        expect do
           person.map = []
-        }.to raise_error(Mongoid::Errors::InvalidValue)
+        end.to raise_error(Mongoid::Errors::InvalidValue, /Value of type Array cannot be written to a field of type Hash/)
+      end
+
+      it "raises an error when trying to set a value of invalid type - boolean" do
+        expect do
+          person.map = false
+        end.to raise_error(Mongoid::Errors::InvalidValue, /Value of type FalseClass cannot be written to a field of type Hash/)
       end
 
       it "can set a Hash value" do
@@ -1367,10 +1373,16 @@ describe Mongoid::Attributes do
         expect(person.aliases).to eq([ :alias_1 ])
       end
 
-      it "raises an error when try to set an invalid value" do
-        expect {
+      it "raises an error when trying to set a value of invalid type - hash" do
+        expect do
           person.aliases = {}
-        }.to raise_error(Mongoid::Errors::InvalidValue)
+        end.to raise_error(Mongoid::Errors::InvalidValue, /Value of type Hash cannot be written to a field of type Array/)
+      end
+
+      it "raises an error when trying to set a value of invalid type - boolean" do
+        expect do
+          person.aliases = false
+        end.to raise_error(Mongoid::Errors::InvalidValue, /Value of type FalseClass cannot be written to a field of type Array/)
       end
     end
 
@@ -1425,7 +1437,7 @@ describe Mongoid::Attributes do
   end
 
   describe "#typed_attributes"  do
-    
+
     let(:date_time) do
       DateTime.current
     end

data/spec/mongoid/changeable_spec.rb

@@ -949,6 +949,29 @@ describe Mongoid::Changeable do
       end
     end
 
+    context 'when habtm association changes' do
+
+      let(:person) do
+        Person.create!(title: "Grand Poobah")
+      end
+
+      let(:user_account) do
+        UserAccount.create!
+      end
+
+      before do
+        person.user_accounts << user_account
+      end
+
+      it 'returns a hash of changes' do
+        pending 'https://jira.mongodb.org/browse/MONGOID-4843'
+
+        person.changes.should == {
+          user_account_ids: [[], [user_account.id]]
+        }
+      end
+    end
+
     context "when the document has not changed" do
 
       let(:acolyte) do

data/spec/mongoid/clients/factory_spec.rb

@@ -41,7 +41,7 @@ describe Mongoid::Clients::Factory do
           let(:config) do
             {
               default: { hosts: SpecConfig.instance.addresses, database: database_id },
-              secondary: { hosts: SpecConfig.instance.addresses, database: database_id }
+              analytics: { hosts: SpecConfig.instance.addresses, database: database_id }
             }
           end
 
@@ -54,7 +54,7 @@ describe Mongoid::Clients::Factory do
           end
 
           let(:client) do
-            described_class.create(:secondary)
+            described_class.create(:analytics)
           end
 
           let(:cluster) do
@@ -81,7 +81,7 @@ describe Mongoid::Clients::Factory do
           let(:config) do
             {
               default: { hosts: [ "127.0.0.1" ], database: database_id },
-              secondary: { hosts: [ "127.0.0.1" ], database: database_id }
+              analytics: { hosts: [ "127.0.0.1" ], database: database_id }
             }
           end
 
@@ -94,7 +94,7 @@ describe Mongoid::Clients::Factory do
           end
 
           let(:client) do
-            described_class.create(:secondary)
+            described_class.create(:analytics)
           end
 
           let(:default) do
@@ -125,7 +125,7 @@ describe Mongoid::Clients::Factory do
             let(:config) do
               {
                 default: { hosts: [ "127.0.0.1:27017" ], database: database_id },
-                secondary: { uri: "mongodb://127.0.0.1:27017/mongoid_test" }
+                analytics: { uri: "mongodb://127.0.0.1:27017/mongoid_test" }
               }
             end
 
@@ -138,7 +138,7 @@ describe Mongoid::Clients::Factory do
             end
 
             let(:client) do
-              described_class.create(:secondary)
+              described_class.create(:analytics)
             end
 
             let(:cluster) do
@@ -163,7 +163,7 @@ describe Mongoid::Clients::Factory do
             let(:config) do
               {
                 default: { hosts: [ "127.0.0.1:1234" ], database: database_id, server_selection_timeout: 1 },
-                secondary: { uri: "mongodb://127.0.0.1:1234,127.0.0.1:5678/mongoid_test?serverSelectionTimeoutMS=1000" }
+                analytics: { uri: "mongodb://127.0.0.1:1234,127.0.0.1:5678/mongoid_test?serverSelectionTimeoutMS=1000" }
               }
             end
 
@@ -176,7 +176,7 @@ describe Mongoid::Clients::Factory do
             end
 
             let(:client) do
-              described_class.create(:secondary)
+              described_class.create(:analytics)
             end
 
             let(:cluster) do

data/spec/mongoid/clients/options_spec.rb

@@ -14,7 +14,7 @@ describe Mongoid::Clients::Options, retry: 3 do
     Mongoid::Clients.clients.clear
   end
 
-  describe '#with', if: non_legacy_server? do
+  describe '#with' do
 
     context 'when passing some options' do
 
@@ -151,7 +151,7 @@ describe Mongoid::Clients::Options, retry: 3 do
           let(:config) do
             {
                 default: { hosts: SpecConfig.instance.addresses, database: database_id },
-                secondary: { uri: "mongodb://#{SpecConfig.instance.addresses.first}/secondary-db?connectTimeoutMS=3000" }
+                analytics: { uri: "mongodb://#{SpecConfig.instance.addresses.first}/analytics-db?connectTimeoutMS=3000" }
             }
           end
 
@@ -164,14 +164,14 @@ describe Mongoid::Clients::Options, retry: 3 do
           end
 
           let(:persistence_context) do
-            Minim.with(client: :secondary) do |klass|
+            Minim.with(client: :analytics) do |klass|
               klass.persistence_context
             end
           end
 
           it 'uses the database specified in the uri' do
-            expect(persistence_context.database_name).to eq('secondary-db')
-            expect(persistence_context.client.database.name).to eq('secondary-db')
+            expect(persistence_context.database_name).to eq('analytics-db')
+            expect(persistence_context.client.database.name).to eq('analytics-db')
           end
 
           it 'uses the options specified in the uri' do
@@ -291,7 +291,7 @@ describe Mongoid::Clients::Options, retry: 3 do
     end
   end
 
-  describe '.with', if: non_legacy_server? do
+  describe '.with' do
 
     context 'when passing some options' do
 
@@ -344,8 +344,8 @@ describe Mongoid::Clients::Options, retry: 3 do
         let(:config) do
           {
               default: { hosts: SpecConfig.instance.addresses, database: database_id },
-              secondary: {
-                uri: "mongodb://#{SpecConfig.instance.addresses.first}/secondary-db",
+              analytics: {
+                uri: "mongodb://#{SpecConfig.instance.addresses.first}/analytics-db",
                 options: {
                   server_selection_timeout: 0.5,
                 },
@@ -358,14 +358,14 @@ describe Mongoid::Clients::Options, retry: 3 do
         end
 
         let(:persistence_context) do
-          test_model.with(client: :secondary) do |object|
+          test_model.with(client: :analytics) do |object|
             object.persistence_context
           end
         end
 
         it 'uses the database specified in the uri' do
-          expect(persistence_context.database_name).to eq('secondary-db')
-          expect(persistence_context.client.database.name).to eq('secondary-db')
+          expect(persistence_context.database_name).to eq('analytics-db')
+          expect(persistence_context.client.database.name).to eq('analytics-db')
         end
       end
 

data/spec/mongoid/clients/sessions_spec.rb

@@ -43,7 +43,8 @@ describe Mongoid::Clients::Sessions do
 
   context 'when a session is used on a model class' do
 
-    context 'when sessions are supported', if: sessions_supported? do
+    context 'when sessions are supported' do
+      min_server_version '3.6'
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -172,7 +173,8 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when sessions are not supported', unless: sessions_supported? do
+    context 'when sessions are not supported' do
+      max_server_version '3.4'
 
       let!(:error) do
         e = nil
@@ -199,7 +201,8 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when sessions are supported', if: sessions_supported? do
+    context 'when sessions are supported' do
+      min_server_version '3.6'
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -316,7 +319,8 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when sessions are not supported', unless: sessions_supported? do
+    context 'when sessions are not supported' do
+      max_server_version '3.4'
 
       let!(:error) do
         e = nil

data/spec/mongoid/clients/transactions_spec.rb

@@ -55,7 +55,8 @@ describe Mongoid::Clients::Sessions do
 
   context 'when a transaction is used on a model class' do
 
-    context 'when transactions are supported', if: testing_transactions? do
+    context 'when transactions are supported' do
+      require_transaction_support
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -191,7 +192,10 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when sessions are supported but transactions are not', if: sessions_supported? && !testing_transactions? do
+    context 'when sessions are supported but transactions are not' do
+      min_server_version '3.6'
+      # Could also test 4.0 in sharded cluster
+      max_server_version '3.6'
 
       let!(:error) do
         e = nil
@@ -222,7 +226,8 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when transactions are supported', if: testing_transactions? do
+    context 'when transactions are supported' do
+      require_transaction_support
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -345,16 +350,23 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when sessions are supported but transactions are not', if: sessions_supported? && !testing_transactions? do
+    context 'when sessions are supported but transactions are not' do
+      min_server_version '3.6'
+      # Could also test 4.0 in sharded cluster
+      max_server_version '3.6'
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
         Mongoid::Clients.with_name(:other).command(create: :people)
-        subscriber.clear_events!
-        person.with(client: :other) do
-          example.run
+
+        begin
+          subscriber.clear_events!
+          person.with(client: :other) do
+            example.run
+          end
+        ensure
+          Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
         end
-        Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
       end
 
       let!(:error) do

data/spec/mongoid/clients_spec.rb

@@ -728,7 +728,7 @@ describe Mongoid::Clients do
     end
   end
 
-  describe ".store_in", if: non_legacy_server? do
+  describe ".store_in" do
 
     context "when provided a non hash" do
 
@@ -765,7 +765,7 @@ describe Mongoid::Clients do
     end
   end
 
-  describe ".with", if: non_legacy_server? do
+  describe ".with" do
 
     context "when changing write concern options" do
 

data/spec/mongoid/contextual/atomic_spec.rb

@@ -77,7 +77,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let(:criteria) do
         Band.where(members: [ "DAVE" ]).collation(locale: 'en_US', strength: 2)
@@ -173,7 +174,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let(:criteria) do
         Band.where(members: [ "DAVE" ]).collation(locale: 'en_US', strength: 2)
@@ -244,7 +246,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ], likes: 60)
@@ -323,7 +326,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -395,7 +399,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -449,7 +454,8 @@ describe Mongoid::Contextual::Atomic do
       expect(smiths.reload.members).to be_nil
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -506,7 +512,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave", "Alan", "Fletch" ])
@@ -563,7 +570,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -628,7 +636,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -689,7 +698,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -848,7 +858,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(name: "Depeche Mode", years: 10)