mongoid 7.0.2 → 7.0.3

data/spec/mongoid/clients/options_spec.rb

@@ -2,15 +2,13 @@ require "spec_helper"
 
 describe Mongoid::Clients::Options do
 
-  before(:all) do
-    class TestModel
-      include Mongoid::Document
-      field :name
-    end
-  end
-
-  after(:all) do
-    Object.send(:remove_const, :TestModel)
+  before do
+    # This test asserts on numbers of open connections,
+    # to make these assertions work in jruby we cannot have connections
+    # bleeding from one test to another and this includes background SDAM
+    # threads in the driver
+    Mongoid.disconnect_clients
+    Mongoid::Clients.clients.clear
   end
 
   describe '#with', if: non_legacy_server? do
@@ -18,7 +16,7 @@ describe Mongoid::Clients::Options do
     context 'when passing some options' do
 
       let(:persistence_context) do
-        TestModel.with(options) do |klass|
+        Minim.with(options) do |klass|
           klass.persistence_context
         end
       end
@@ -30,13 +28,13 @@ describe Mongoid::Clients::Options do
       end
 
       it 'does not set the options on class level' do
-        expect(TestModel.persistence_context.client.options['database']).to eq('mongoid_test')
+        expect(Minim.persistence_context.client.options['database']).to eq('mongoid_test')
       end
 
       context 'when the options are not valid mongo client options' do
 
         let(:persistence_context) do
-          TestModel.with(invalid_options) do |klass|
+          Minim.with(invalid_options) do |klass|
             klass.persistence_context
           end
         end
@@ -51,7 +49,7 @@ describe Mongoid::Clients::Options do
 
         it 'clears the persistence context' do
           begin; persistence_context; rescue Mongoid::Errors::InvalidPersistenceOption; end
-          expect(TestModel.persistence_context).to eq(Mongoid::PersistenceContext.new(TestModel))
+          expect(Minim.persistence_context).to eq(Mongoid::PersistenceContext.new(Minim))
         end
       end
 
@@ -77,14 +75,14 @@ describe Mongoid::Clients::Options do
       context 'when passing a block', if: testing_locally? do
 
         let!(:connections_before) do
-          TestModel.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+          Minim.mongo_client.database.command(serverStatus: 1).first['connections']['current']
         end
 
         let!(:connections_and_cluster_during) do
           connections = nil
-          cluster = TestModel.with(options) do |klass|
+          cluster = Minim.with(options) do |klass|
             klass.where(name: 'emily').to_a
-            connections = TestModel.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+            connections = Minim.mongo_client.database.command(serverStatus: 1).first['connections']['current']
           end
           [ connections, cluster ]
         end
@@ -98,15 +96,15 @@ describe Mongoid::Clients::Options do
         end
 
         let(:connections_after) do
-          TestModel.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+          Minim.mongo_client.database.command(serverStatus: 1).first['connections']['current']
         end
 
         let!(:cluster_before) do
-          TestModel.persistence_context.cluster
+          Minim.persistence_context.cluster
         end
 
         let(:cluster_after) do
-          TestModel.persistence_context.cluster
+          Minim.persistence_context.cluster
         end
 
         context 'when the options create a new cluster' do
@@ -145,8 +143,8 @@ describe Mongoid::Clients::Options do
 
           let(:config) do
             {
-                default: { hosts: [ "127.0.0.1:27017" ], database: database_id },
-                secondary: { uri: "mongodb://127.0.0.1:27017/secondary-db?connectTimeoutMS=3000" }
+                default: { hosts: SpecConfig.instance.addresses, database: database_id },
+                secondary: { uri: "mongodb://#{SpecConfig.instance.addresses.first}/secondary-db?connectTimeoutMS=3000" }
             }
           end
 
@@ -159,7 +157,7 @@ describe Mongoid::Clients::Options do
           end
 
           let(:persistence_context) do
-            TestModel.with(client: :secondary) do |klass|
+            Minim.with(client: :secondary) do |klass|
               klass.persistence_context
             end
           end
@@ -192,7 +190,7 @@ describe Mongoid::Clients::Options do
 
           let(:context_and_criteria) do
             collection = nil
-            cxt = TestModel.with(read_secondary_option) do |klass|
+            cxt = Minim.with(read_secondary_option) do |klass|
               collection = klass.all.collection
               klass.persistence_context
             end
@@ -232,11 +230,11 @@ describe Mongoid::Clients::Options do
           100.times do |i|
             threads << Thread.new do
               if i % 2 == 0
-                TestModel.with(collection: 'British') do |klass|
+                Minim.with(collection: 'British') do |klass|
                   klass.create(name: 'realised')
                 end
               else
-                TestModel.with(collection: 'American') do |klass|
+                Minim.with(collection: 'American') do |klass|
                   klass.create(name: 'realized')
                 end
               end
@@ -246,13 +244,13 @@ describe Mongoid::Clients::Options do
         end
 
         let(:british_count) do
-          TestModel.with(collection: 'British') do |klass|
+          Minim.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
 
         let(:american_count) do
-          TestModel.with(collection: 'American') do |klass|
+          Minim.with(collection: 'American') do |klass|
             klass.all.count
           end
         end
@@ -267,7 +265,7 @@ describe Mongoid::Clients::Options do
     context 'when passing a persistence context' do
 
       let(:instance) do
-        TestModel.new
+        Minim.new
       end
 
       let(:persistence_context) do
@@ -279,7 +277,7 @@ describe Mongoid::Clients::Options do
       let(:options) { { database: 'other' } }
 
       it 'sets the persistence context on the object' do
-        TestModel.new.with(persistence_context) do |model_instance|
+        Minim.new.with(persistence_context) do |model_instance|
           expect(model_instance.persistence_context.options).to eq(persistence_context.options)
         end
       end
@@ -295,7 +293,7 @@ describe Mongoid::Clients::Options do
       end
 
       let(:test_model) do
-        TestModel.create
+        Minim.create
       end
 
       let(:persistence_context) do
@@ -338,8 +336,13 @@ describe Mongoid::Clients::Options do
 
         let(:config) do
           {
-              default: { hosts: [ "127.0.0.1:27017" ], database: database_id },
-              secondary: { uri: "mongodb://127.0.0.1:27017/secondary-db" }
+              default: { hosts: SpecConfig.instance.addresses, database: database_id },
+              secondary: {
+                uri: "mongodb://#{SpecConfig.instance.addresses.first}/secondary-db",
+                options: {
+                  server_selection_timeout: 0.5,
+                },
+              }
           }
         end
 
@@ -442,7 +445,7 @@ describe Mongoid::Clients::Options do
         before do
           threads = []
           100.times do |i|
-            test_model = TestModel.create
+            test_model = Minim.create
             threads << Thread.new do
               if i % 2 == 0
                 test_model.with(collection: 'British') do |b|
@@ -461,13 +464,13 @@ describe Mongoid::Clients::Options do
         end
 
         let(:british_count) do
-          TestModel.with(collection: 'British') do |klass|
+          Minim.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
 
         let(:american_count) do
-          TestModel.with(collection: 'British') do |klass|
+          Minim.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
@@ -482,7 +485,7 @@ describe Mongoid::Clients::Options do
     context 'when passing a persistence context' do
 
       let(:persistence_context) do
-        TestModel.with(options) do |klass|
+        Minim.with(options) do |klass|
           klass.persistence_context
         end
       end
@@ -490,7 +493,7 @@ describe Mongoid::Clients::Options do
       let(:options) { { database: 'other' } }
 
       it 'sets the persistence context on the object' do
-        TestModel.with(persistence_context) do |test_model_class|
+        Minim.with(persistence_context) do |test_model_class|
           expect(test_model_class.persistence_context.options).to eq(persistence_context.options)
         end
       end

data/spec/mongoid/clients_spec.rb

@@ -208,6 +208,72 @@ describe Mongoid::Clients do
       end
 
       it_behaves_like "an overridden collection name at the class level"
+
+      context 'when nesting #with calls' do
+        let(:instance_collection_name) do
+          Band.with(collection: "ignore") do |klass|
+            Band.with(collection: "artists") do |klass|
+              klass.new.collection_name
+            end
+          end
+        end
+
+        let(:class_collection_name) do
+          Band.with(collection: "ignore") do |klass|
+            Band.with(collection: "artists") do |klass|
+              klass.collection_name
+            end
+          end
+        end
+
+        it_behaves_like "an overridden collection name at the class level"
+      end
+
+      context 'when outer #with call specifies the collection' do
+        use_spec_mongoid_config
+
+        let(:instance_collection_name) do
+          Band.with(collection: "artists") do |klass|
+            Band.with(client: :reports) do |klass|
+              klass.new.collection_name
+            end
+          end
+        end
+
+        let(:class_collection_name) do
+          Band.with(collection: "artists") do |klass|
+            Band.with(client: :reports) do |klass|
+              klass.collection_name
+            end
+          end
+        end
+
+        it_behaves_like "an overridden collection name at the class level"
+      end
+
+      context 'restores outer context in outer block' do
+        use_spec_mongoid_config
+
+        let(:instance_collection_name) do
+          Band.with(collection: "artists") do |klass|
+            Band.with(collection: "scratch") do |klass|
+              # nothing
+            end
+            klass.new.collection_name
+          end
+        end
+
+        let(:class_collection_name) do
+          Band.with(collection: "artists") do |klass|
+            Band.with(collection: "scratch") do |klass|
+              # nothing
+            end
+            klass.collection_name
+          end
+        end
+
+        it_behaves_like "an overridden collection name at the class level"
+      end
     end
 
     context "when overriding store_in and persistence options" do
@@ -427,7 +493,7 @@ describe Mongoid::Clients do
       let(:client_name) { :alternative }
 
       before do
-        Mongoid.clients[client_name] = { database: database_id_alt, hosts: [ "#{HOST}:#{PORT}" ] }
+        Mongoid.clients[client_name] = { database: database_id_alt, hosts: SpecConfig.instance.addresses }
       end
 
       after do
@@ -552,20 +618,14 @@ describe Mongoid::Clients do
     end
 
     context "when getting a client by name" do
-
-      let(:file) do
-        File.join(File.dirname(__FILE__), "..", "config", "mongoid.yml")
-      end
+      use_spec_mongoid_config
 
       before do
-        described_class.clear
-        Mongoid.load!(file, :test)
         Band.store_in(client: :reports)
       end
 
       after do
         mongo_client.close
-        Mongoid::Config.reset
         Band.reset_storage_options!
       end
 

data/spec/mongoid/config_spec.rb

@@ -370,7 +370,9 @@ describe Mongoid::Config do
           end
 
           it "sets the default hosts" do
-            expect(default[:hosts]).to eq(["#{HOST}:#{PORT}"])
+            expect(default[:hosts]).to eq(SpecConfig.instance.addresses)
+            # and make sure the value is not empty
+            expect(default[:hosts].first).to include(':')
           end
 
           context "when the default has options" do

data/spec/mongoid/contextual/mongo_spec.rb

@@ -451,7 +451,7 @@ describe Mongoid::Contextual::Mongo do
       end
 
       it "returns the distinct field values" do
-        expect(context.distinct(:years)).to eq([ 30, 25 ])
+        expect(context.distinct(:years).sort).to eq([ 25, 30 ])
       end
     end
 
@@ -1718,6 +1718,9 @@ describe Mongoid::Contextual::Mongo do
     end
 
     context "when limiting is provided" do
+      # map/reduce with limit is not supported on sharded clusters:
+      # https://jira.mongodb.org/browse/SERVER-2099
+      require_topology :single, :replica_set
 
       let(:criteria) do
         Band.limit(1)
@@ -2388,7 +2391,7 @@ describe Mongoid::Contextual::Mongo do
       end
 
       it 'creates a pipeline with the selector as one of the $match criteria' do
-        expect(pipeline_match).to include({ :'$text' => { :'$search' => "New Order" } })
+        expect(pipeline_match).to include({ '$text' => { '$search' => "New Order" } })
       end
 
       it 'creates a pipeline with the $exists operator as one of the $match criteria' do

data/spec/mongoid/copyable_spec.rb

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 require "spec_helper"
 
+require_relative './copyable_spec_models'
+
 describe Mongoid::Copyable do
 
   [ :clone, :dup ].each do |method|
@@ -90,13 +92,45 @@ describe Mongoid::Copyable do
 
         context "and dynamic attributes are not set" do
 
-          it "clones" do
-            t = StoreAsDupTest1.new(:name => "hi")
-            t.build_store_as_dup_test2(:name => "there")
-            t.save
-            copy = t.send(method)
-            expect(copy.store_as_dup_test2.name).to eq(t.store_as_dup_test2.name)
+          context 'embeds_one' do
+
+            it "clones" do
+              t = StoreAsDupTest1.new(:name => "hi")
+              t.build_store_as_dup_test2(:name => "there")
+              t.save
+              copy = t.send(method)
+              expect(copy.object_id).not_to eq(t.object_id)
+              expect(copy.store_as_dup_test2.name).to eq(t.store_as_dup_test2.name)
+            end
           end
+
+          context 'embeds_many' do
+
+
+            it "clones" do
+              t = StoreAsDupTest3.new(:name => "hi")
+              t.store_as_dup_test4s << StoreAsDupTest4.new
+              t.save
+              copy = t.send(method)
+              expect(copy.object_id).not_to eq(t.object_id)
+              expect(copy.store_as_dup_test4s).not_to be_empty
+              expect(copy.store_as_dup_test4s.first.object_id).not_to eq(t.store_as_dup_test4s.first.object_id)
+            end
+          end
+        end
+      end
+
+      context 'nested embeds_many' do
+        it 'works' do
+          a = CopyableSpec::A.new
+          a.locations << CopyableSpec::Location.new
+          a.locations.first.buildings << CopyableSpec::Building.new
+          a.save!
+
+          new_a = a.send(method)
+
+          expect(new_a.locations.length).to be 1
+          expect(new_a.locations.first.buildings.length).to be 1
         end
       end
 

data/spec/mongoid/copyable_spec_models.rb

@@ -0,0 +1,17 @@
+module CopyableSpec
+  class A
+    include Mongoid::Document
+
+    embeds_many :locations
+  end
+
+  class Location
+    include Mongoid::Document
+
+    embeds_many :buildings
+  end
+
+  class Building
+    include Mongoid::Document
+  end
+end