mongoid 7.0.10 → 7.4.0

data/spec/mongoid/clients/options_spec.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
-describe Mongoid::Clients::Options do
+describe Mongoid::Clients::Options, retry: 3 do
 
   before do
     # This test asserts on numbers of open connections,
@@ -80,9 +82,11 @@ describe Mongoid::Clients::Options do
 
         let!(:connections_and_cluster_during) do
           connections = nil
-          cluster = Minim.with(options) do |klass|
+          cluster = nil
+          Minim.with(options) do |klass|
             klass.where(name: 'emily').to_a
             connections = Minim.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+            cluster = Minim.collection.cluster
           end
           [ connections, cluster ]
         end
@@ -108,6 +112,8 @@ describe Mongoid::Clients::Options do
         end
 
         context 'when the options create a new cluster' do
+          # This test fails on sharded topologies in Evergreen but not locally
+          require_topology :single, :replica_set
 
           let(:options) do
             { connect_timeout: 2 }
@@ -119,11 +125,16 @@ describe Mongoid::Clients::Options do
           end
 
           it 'disconnects the new cluster when the block exits' do
-            expect(connections_before).to eq(connections_after)
+            expect(cluster_after).not_to be(cluster_during)
+
+            cluster_during.connected?.should be false
+            cluster_before.connected?.should be true
           end
         end
 
         context 'when the options do not create a new cluster' do
+          # This test fails on sharded topologies in Evergreen but not locally
+          require_topology :single, :replica_set
 
           let(:options) do
             { database: 'same-cluster' }
@@ -131,11 +142,14 @@ describe Mongoid::Clients::Options do
 
           it 'does not create a new cluster' do
             expect(connections_during).to eq(connections_before)
+
+            cluster_during.should be cluster_before
           end
 
           it 'does not disconnect the original cluster' do
-            expect(connections_after).to eq(connections_before)
             expect(cluster_before).to be(cluster_after)
+
+            cluster_before.connected?.should be true
           end
         end
 
@@ -144,7 +158,7 @@ describe Mongoid::Clients::Options 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
 
@@ -157,14 +171,14 @@ describe Mongoid::Clients::Options 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
@@ -230,12 +244,12 @@ describe Mongoid::Clients::Options do
           100.times do |i|
             threads << Thread.new do
               if i % 2 == 0
-                Minim.with(collection: 'British') do |klass|
-                  klass.create(name: 'realised')
+                NameOnly.with(collection: 'British') do |klass|
+                  klass.create!(name: 'realised')
                 end
               else
-                Minim.with(collection: 'American') do |klass|
-                  klass.create(name: 'realized')
+                NameOnly.with(collection: 'American') do |klass|
+                  klass.create!(name: 'realized')
                 end
               end
             end
@@ -244,13 +258,13 @@ describe Mongoid::Clients::Options do
         end
 
         let(:british_count) do
-          Minim.with(collection: 'British') do |klass|
+          NameOnly.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
 
         let(:american_count) do
-          Minim.with(collection: 'American') do |klass|
+          NameOnly.with(collection: 'American') do |klass|
             klass.all.count
           end
         end
@@ -293,7 +307,7 @@ describe Mongoid::Clients::Options do
       end
 
       let(:test_model) do
-        Minim.create
+        Minim.create!
       end
 
       let(:persistence_context) do
@@ -337,8 +351,8 @@ describe Mongoid::Clients::Options 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,
                 },
@@ -351,14 +365,14 @@ describe Mongoid::Clients::Options 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
 
@@ -399,22 +413,26 @@ describe Mongoid::Clients::Options do
         end
 
         context 'when the options create a new cluster' do
+          # This test fails on sharded topologies in Evergreen but not locally
+          require_topology :single, :replica_set
 
           let(:options) do
             { connect_timeout: 2 }
           end
 
           it 'creates a new cluster' do
-            expect(connections_before).to be <(connections_during)
-            expect(cluster_before).not_to be(cluster_during)
+            expect(connections_during).to be > connections_before
+            expect(cluster_during).not_to be(cluster_before)
           end
 
           it 'disconnects the new cluster when the block exits' do
-            expect(connections_before).to eq(connections_after)
+            expect(connections_after).to eq(connections_before)
           end
         end
 
         context 'when the options do not create a new cluster' do
+          # This test fails on sharded topologies in Evergreen but not locally
+          require_topology :single, :replica_set
 
           let(:options) { { read: :secondary } }
 
@@ -445,7 +463,7 @@ describe Mongoid::Clients::Options do
         before do
           threads = []
           100.times do |i|
-            test_model = Minim.create
+            test_model = NameOnly.create!
             threads << Thread.new do
               if i % 2 == 0
                 test_model.with(collection: 'British') do |b|
@@ -464,13 +482,13 @@ describe Mongoid::Clients::Options do
         end
 
         let(:british_count) do
-          Minim.with(collection: 'British') do |klass|
+          NameOnly.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
 
         let(:american_count) do
-          Minim.with(collection: 'British') do |klass|
+          NameOnly.with(collection: 'British') do |klass|
             klass.all.count
           end
         end

data/spec/mongoid/clients/sessions_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Clients::Sessions do
@@ -17,12 +19,7 @@ describe Mongoid::Clients::Sessions do
 
   let(:subscriber) do
     client = Mongoid::Clients.with_name(:other)
-    monitoring = if client.respond_to?(:monitoring, true)
-      client.send(:monitoring)
-    else
-      # driver 2.5
-      client.instance_variable_get('@monitoring')
-    end
+    monitoring = client.send(:monitoring)
     monitoring.subscribers['Command'].find do |s|
       s.is_a?(EventSubscriber)
     end
@@ -56,10 +53,10 @@ describe Mongoid::Clients::Sessions do
 
         let!(:last_use_diff) do
           Person.with_session do |session|
-            Person.create
-            Person.create
+            Person.create!
+            Person.create!
             last_use = session.instance_variable_get(:@server_session).last_use
-            Thread.new { Person.create }.value
+            Thread.new { Person.create! }.value
             session.instance_variable_get(:@server_session).last_use - last_use
           end
         end
@@ -78,8 +75,8 @@ describe Mongoid::Clients::Sessions do
 
         before do
           Person.with_session do
-            Person.create
-            Person.create
+            Person.create!
+            Person.create!
           end
         end
 
@@ -98,9 +95,9 @@ describe Mongoid::Clients::Sessions do
           before do
             Post.with(client: :other) do
               Person.with_session do
-                Person.create
-                Person.create
-                Post.create
+                Person.create!
+                Person.create!
+                Post.create!
               end
             end
           end
@@ -119,9 +116,9 @@ describe Mongoid::Clients::Sessions do
             e = nil
             begin
               Person.with_session do
-                Person.create
-                Person.create
-                Post.create
+                Person.create!
+                Person.create!
+                Post.create!
               end
             rescue => ex
                 e = ex
@@ -148,8 +145,8 @@ describe Mongoid::Clients::Sessions do
             begin
               Person.with_session do
                 Person.with_session do
-                  Person.create
-                  Post.create
+                  Person.create!
+                  Post.create!
                 end
               end
             rescue => ex
@@ -194,7 +191,7 @@ describe Mongoid::Clients::Sessions do
 
     let!(:person) do
       Person.with(client: :other) do |klass|
-        klass.create
+        klass.create!
       end
     end
 
@@ -215,9 +212,9 @@ describe Mongoid::Clients::Sessions do
         before do
           person.with_session do
             person.username = 'Emily'
-            person.save
+            person.save!
             person.age = 80
-            person.save
+            person.save!
           end
         end
 
@@ -238,8 +235,8 @@ describe Mongoid::Clients::Sessions do
             Post.with(client: :other) do
               person.with_session do
                 person.username = 'Emily'
-                person.save
-                person.posts << Post.create
+                person.save!
+                person.posts << Post.create!
               end
             end
           end
@@ -264,8 +261,8 @@ describe Mongoid::Clients::Sessions do
             begin
               person.with_session do
                 person.username = 'Emily'
-                person.save
-                person.posts << Post.create
+                person.save!
+                person.posts << Post.create!
               end
             rescue => ex
               e = ex
@@ -293,8 +290,8 @@ describe Mongoid::Clients::Sessions do
               person.with_session do
                 person.with_session do
                   person.username = 'Emily'
-                  person.save
-                  person.posts << Post.create
+                  person.save!
+                  person.posts << Post.create!
                 end
               end
             rescue => ex

data/spec/mongoid/clients/transactions_spec.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Clients::Sessions do
   before(:all) do
-    unless Mongo::VERSION >= '2.6'
+    if Gem::Version.new(Mongo::VERSION) < Gem::Version.new('2.6')
       skip 'Driver does not support transactions'
     end
   end
 
   before(:all) do
-    if Mongo::VERSION >= '2.6'
+    if Gem::Version.new(Mongo::VERSION) >= Gem::Version.new('2.6')
       CONFIG[:clients][:other] = CONFIG[:clients][:default].dup
       CONFIG[:clients][:other][:database] = 'other'
       Mongoid::Clients.clients.values.each(&:close)
@@ -18,7 +20,7 @@ describe Mongoid::Clients::Sessions do
   end
 
   after(:all) do
-    if Mongo::VERSION >= '2.6'
+    if Gem::Version.new(Mongo::VERSION) >= Gem::Version.new('2.6')
       Mongoid::Clients.with_name(:other).close
       Mongoid::Clients.clients.delete(:other)
     end
@@ -59,9 +61,12 @@ describe Mongoid::Clients::Sessions do
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
         Mongoid::Clients.with_name(:other).command(create: :people)
         Mongoid::Clients.with_name(:other).command(create: :posts)
+        Mongoid::Clients.with_name(:other).command(create: :canvases)
         subscriber.clear_events!
-        Person.with(client: :other) do
-          example.run
+        Canvas.with(client: :other) do
+          Person.with(client: :other) do
+            example.run
+          end
         end
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
       end
@@ -71,9 +76,9 @@ describe Mongoid::Clients::Sessions do
         let!(:last_use_diff) do
           Person.with_session do |s|
             s.start_transaction
-            Person.create
-            Person.create
-            Thread.new { Person.create }.value
+            Person.create!
+            Person.create!
+            Thread.new { Person.create! }.value
             s.commit_transaction
           end
         end
@@ -91,8 +96,8 @@ describe Mongoid::Clients::Sessions do
         before do
           Person.with_session do |s|
             s.start_transaction
-            Person.create
-            Person.create
+            Person.create!
+            Person.create!
             s.commit_transaction
           end
         end
@@ -112,9 +117,9 @@ describe Mongoid::Clients::Sessions do
             Post.with(client: :other) do
               Person.with_session do |s|
                 s.start_transaction
-                Person.create
-                Person.create
-                Post.create
+                Person.create!
+                Person.create!
+                Post.create!
                 s.commit_transaction
               end
             end
@@ -134,9 +139,9 @@ describe Mongoid::Clients::Sessions do
             begin
               Person.with_session do |s|
                 s.start_transaction
-                Person.create
-                Person.create
-                Post.create
+                Person.create!
+                Person.create!
+                Post.create!
                 s.commit_transaction
               end
             rescue => ex
@@ -166,8 +171,8 @@ describe Mongoid::Clients::Sessions do
               Person.with_session do |s|
                 s.start_transaction
                 s.start_transaction
-                Person.create
-                Post.create
+                Person.create!
+                Post.create!
                 s.commit_transaction
               end
             rescue => ex
@@ -187,6 +192,26 @@ describe Mongoid::Clients::Sessions do
           end
         end
       end
+
+      context 'When reloading an embedded document created inside a transaction' do
+        it 'does not raise an error and has the correct document' do
+          Canvas.with_session do |s|
+            s.start_transaction
+
+            p = Palette.new
+            c = Canvas.new(palette: p)
+            c.save!
+
+            expect do
+              p.reload
+            end.to_not raise_error
+
+            expect(c.palette).to eq(p)
+
+            s.commit_transaction
+          end
+        end
+      end
     end
 
     context 'when sessions are supported but transactions are not' do
@@ -199,7 +224,7 @@ describe Mongoid::Clients::Sessions do
         begin
           Person.with_session do |s|
             s.start_transaction
-            Person.create
+            Person.create!
             s.commit_transaction
           end
         rescue => ex
@@ -219,7 +244,7 @@ describe Mongoid::Clients::Sessions do
 
     let!(:person) do
       Person.with(client: :other) do |klass|
-        klass.create
+        klass.create!
       end
     end
 
@@ -243,9 +268,9 @@ describe Mongoid::Clients::Sessions do
           person.with_session do |s|
             s.start_transaction
             person.username = 'Emily'
-            person.save
+            person.save!
             person.age = 80
-            person.save
+            person.save!
             s.commit_transaction
           end
         end
@@ -267,8 +292,8 @@ describe Mongoid::Clients::Sessions do
               person.with_session do |s|
                 s.start_transaction
                 person.username = 'Emily'
-                person.save
-                person.posts << Post.create
+                person.save!
+                person.posts << Post.create!
                 s.commit_transaction
               end
             end
@@ -293,8 +318,8 @@ describe Mongoid::Clients::Sessions do
               person.with_session do |s|
                 s.start_transaction
                 person.username = 'Emily'
-                person.save
-                person.posts << Post.create
+                person.save!
+                person.posts << Post.create!
                 s.commit_transaction
               end
             rescue => ex
@@ -324,8 +349,8 @@ describe Mongoid::Clients::Sessions do
                 s.start_transaction
                 s.start_transaction
                 person.username = 'Emily'
-                person.save
-                person.posts << Post.create
+                person.save!
+                person.posts << Post.create!
                 s.commit_transaction
               end
             rescue => ex
@@ -372,7 +397,7 @@ describe Mongoid::Clients::Sessions do
           person.with_session do |s|
             s.start_transaction
             person.username = 'Emily'
-            person.save
+            person.save!
             s.commit_transaction
           end
         rescue => ex

data/spec/mongoid/clients_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Clients do
@@ -789,11 +791,11 @@ describe Mongoid::Clients do
         end
       end
 
-      describe ".create" do
+      describe ".create!" do
 
         let!(:band) do
           Band.with(database: database_id_alt) do |klass|
-            klass.create
+            klass.create!
           end
         end
 
@@ -827,11 +829,11 @@ describe Mongoid::Clients do
 
     context "when sending operations to a different collection" do
 
-      describe ".create" do
+      describe ".create!" do
 
         let!(:band) do
           Band.with(collection: "artists") do |klass|
-            klass.create
+            klass.create!
           end
         end
 
@@ -942,7 +944,7 @@ describe Mongoid::Clients do
       describe ".save" do
 
         before do
-          Person.create(ssn: "432-97-1113")
+          Person.create!(ssn: "432-97-1113")
         end
 
         context "when a mongodb error occurs" do
@@ -1035,7 +1037,7 @@ describe Mongoid::Clients do
       end
 
       let!(:band) do
-        Band.create(name: "Tool")
+        Band.create!(name: "Tool")
       end
 
       it "persists to the overridden database" do

data/spec/mongoid/composable_spec.rb

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