mongoid 6.4.8 → 7.0.0.beta

data/spec/mongoid/clients/factory_spec.rb

@@ -1,35 +1,7 @@
-# frozen_string_literal: true
-# encoding: utf-8
-
 require "spec_helper"
 
 describe Mongoid::Clients::Factory do
 
-  shared_examples_for 'includes seed address' do
-    let(:configured_address) do
-      address = SpecConfig.instance.addresses.first
-      unless address.include?(':')
-        address = "#{address}:27017"
-      end
-      address
-    end
-
-    let(:expected_addresses) do
-      [
-        configured_address,
-        configured_address.sub(/\Alocalhost:/, '127.0.0.1:'),
-        configured_address.sub(/\A127\.0\.0\.1:/, 'localhost:'),
-      ].uniq
-    end
-
-    it 'includes seed address' do
-      ok = cluster_addresses.any? do |address|
-        expected_addresses.include?(address)
-      end
-      expect(ok).to be true
-    end
-  end
-
   describe ".create" do
 
     context "when provided a name" do
@@ -40,8 +12,8 @@ describe Mongoid::Clients::Factory do
 
           let(:config) do
             {
-              default: { hosts: SpecConfig.instance.addresses, database: database_id },
-              secondary: { hosts: SpecConfig.instance.addresses, database: database_id }
+              default: { hosts: [ "127.0.0.1:27017" ], database: database_id },
+              secondary: { hosts: [ "127.0.0.1:27017" ], database: database_id }
             }
           end
 
@@ -65,12 +37,10 @@ describe Mongoid::Clients::Factory do
             expect(client).to be_a(Mongo::Client)
           end
 
-          let(:cluster_addresses) do
-            cluster.addresses.map(&:to_s)
+          it "sets the cluster's seeds" do
+            expect(cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
           end
 
-          it_behaves_like 'includes seed address'
-
           it "sets the platform to Mongoid's platform constant" do
             expect(client.options[:platform]).to eq(Mongoid::PLATFORM_DETAILS)
           end
@@ -110,11 +80,11 @@ describe Mongoid::Clients::Factory do
           end
 
           it "sets the cluster's seed ports to 27017" do
-            expect(%w(127.0.0.1:27017 localhost:27017)).to include(cluster.addresses.first.to_s)
+            expect(cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
           end
 
           it "sets ips with no ports to 27017" do
-            expect(%w(127.0.0.1:27017 localhost:27017)).to include(cluster.addresses.first.to_s)
+            expect(default.cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
           end
         end
 
@@ -150,7 +120,7 @@ describe Mongoid::Clients::Factory do
             end
 
             it "sets the cluster's seeds" do
-              expect(%w(127.0.0.1:27017 localhost:27017)).to include(cluster.addresses.first.to_s)
+              expect(cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
             end
 
             it "sets the database" do
@@ -162,8 +132,8 @@ 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" }
+                default: { hosts: [ "127.0.0.1:27017" ], database: database_id },
+                secondary: { uri: "mongodb://127.0.0.1:27017,127.0.0.1:27018/mongoid_test" }
               }
             end
 
@@ -192,7 +162,7 @@ describe Mongoid::Clients::Factory do
             end
 
             it "sets the cluster's seeds" do
-              expect(seeds).to eq([ "127.0.0.1:1234", "127.0.0.1:5678" ])
+              expect(seeds).to eq([ "127.0.0.1:27017", "127.0.0.1:27018" ])
             end
           end
         end
@@ -211,7 +181,7 @@ describe Mongoid::Clients::Factory do
     context "when no name is provided" do
 
       let(:config) do
-        { default: { hosts: SpecConfig.instance.addresses, database: database_id }}
+        { default: { hosts: ["127.0.0.1:27017"], database: database_id }}
       end
 
       before do
@@ -230,15 +200,17 @@ describe Mongoid::Clients::Factory do
         client.cluster
       end
 
-      let(:cluster_addresses) do
-        cluster.addresses.map(&:to_s)
+      let(:seeds) do
+        cluster.addresses.map{ |address| address.to_s }
       end
 
       it "returns the default client" do
         expect(client).to be_a(Mongo::Client)
       end
 
-      it_behaves_like 'includes seed address'
+      it "sets the cluster's seeds" do
+        expect(seeds).to eq([ "127.0.0.1:27017" ])
+      end
     end
 
     context "when nil is provided and no default config" do
@@ -258,7 +230,7 @@ describe Mongoid::Clients::Factory do
   describe ".default" do
 
     let(:config) do
-      { default: { hosts: SpecConfig.instance.addresses, database: database_id }}
+      { default: { hosts: ["127.0.0.1:27017"], database: database_id }}
     end
 
     before do
@@ -277,15 +249,17 @@ describe Mongoid::Clients::Factory do
       client.cluster
     end
 
-    let(:cluster_addresses) do
-      cluster.addresses.map(&:to_s)
+    let(:seeds) do
+      cluster.addresses.map{ |address| address.to_s }
     end
 
     it "returns the default client" do
       expect(client).to be_a(Mongo::Client)
     end
 
-    it_behaves_like 'includes seed address'
+    it "sets the cluster's seeds" do
+      expect(seeds).to eq([ "127.0.0.1:27017" ])
+    end
   end
 
   context "when options are provided with string keys" do
@@ -293,7 +267,7 @@ describe Mongoid::Clients::Factory do
     let(:config) do
       {
         default: {
-          hosts: SpecConfig.instance.addresses,
+          hosts: [ "127.0.0.1:27017" ],
           database: database_id,
           options: {
             "server_selection_timeout" => 10,
@@ -319,15 +293,17 @@ describe Mongoid::Clients::Factory do
       client.cluster
     end
 
-    let(:cluster_addresses) do
-      cluster.addresses.map(&:to_s)
+    let(:seeds) do
+      cluster.addresses.map{ |address| address.to_s }
     end
 
     it "returns the default client" do
       expect(client).to be_a(Mongo::Client)
     end
 
-    it_behaves_like 'includes seed address'
+    it "sets the cluster's seeds" do
+      expect(seeds).to eq([ "127.0.0.1:27017" ])
+    end
 
     it "sets the server selection timeout" do
       expect(cluster.options[:server_selection_timeout]).to eq(10)

data/spec/mongoid/clients/options_spec.rb

@@ -2,12 +2,23 @@ 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)
+  end
+
   describe '#with', if: non_legacy_server? do
 
     context 'when passing some options' do
 
       let(:persistence_context) do
-        Band.with(options) do |klass|
+        TestModel.with(options) do |klass|
           klass.persistence_context
         end
       end
@@ -19,13 +30,13 @@ describe Mongoid::Clients::Options do
       end
 
       it 'does not set the options on class level' do
-        expect(Band.persistence_context.client.options['database']).to eq('mongoid_test')
+        expect(TestModel.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
-          Band.with(invalid_options) do |klass|
+          TestModel.with(invalid_options) do |klass|
             klass.persistence_context
           end
         end
@@ -40,7 +51,7 @@ describe Mongoid::Clients::Options do
 
         it 'clears the persistence context' do
           begin; persistence_context; rescue Mongoid::Errors::InvalidPersistenceOption; end
-          expect(Band.persistence_context).to eq(Mongoid::PersistenceContext.new(Band))
+          expect(TestModel.persistence_context).to eq(Mongoid::PersistenceContext.new(TestModel))
         end
       end
 
@@ -66,14 +77,14 @@ describe Mongoid::Clients::Options do
       context 'when passing a block', if: testing_locally? do
 
         let!(:connections_before) do
-          Band.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+          TestModel.mongo_client.database.command(serverStatus: 1).first['connections']['current']
         end
 
         let!(:connections_and_cluster_during) do
           connections = nil
-          cluster = Band.with(options) do |klass|
+          cluster = TestModel.with(options) do |klass|
             klass.where(name: 'emily').to_a
-            connections = Band.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+            connections = TestModel.mongo_client.database.command(serverStatus: 1).first['connections']['current']
           end
           [ connections, cluster ]
         end
@@ -87,15 +98,15 @@ describe Mongoid::Clients::Options do
         end
 
         let(:connections_after) do
-          Band.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+          TestModel.mongo_client.database.command(serverStatus: 1).first['connections']['current']
         end
 
         let!(:cluster_before) do
-          Band.persistence_context.cluster
+          TestModel.persistence_context.cluster
         end
 
         let(:cluster_after) do
-          Band.persistence_context.cluster
+          TestModel.persistence_context.cluster
         end
 
         context 'when the options create a new cluster' do
@@ -148,7 +159,7 @@ describe Mongoid::Clients::Options do
           end
 
           let(:persistence_context) do
-            Band.with(client: :secondary) do |klass|
+            TestModel.with(client: :secondary) do |klass|
               klass.persistence_context
             end
           end
@@ -177,40 +188,25 @@ describe Mongoid::Clients::Options do
 
       context 'when returning a criteria' do
 
-        shared_context 'applies secondary read preference' do
-
-          let(:context_and_criteria) do
-            collection = nil
-            cxt = Band.with(read_secondary_option) do |klass|
-              collection = klass.all.collection
-              klass.persistence_context
-            end
-            [ cxt, collection ]
-          end
-
-          let(:persistence_context) do
-            context_and_criteria[0]
-          end
-
-          let(:client) do
-            context_and_criteria[1].client
-          end
-
-          it 'applies the options to the criteria client' do
-            expect(client.options['read']).to eq('mode' => :secondary)
+        let(:context_and_criteria) do
+          collection = nil
+          cxt = TestModel.with(read: :secondary) do |klass|
+            collection = klass.all.collection
+            klass.persistence_context
           end
+          [ cxt, collection ]
         end
 
-        context 'read: :secondary shorthand' do
-          let(:read_secondary_option) { {read: :secondary} }
-
-          it_behaves_like 'applies secondary read preference'
+        let(:persistence_context) do
+          context_and_criteria[0]
         end
 
-        context 'read: {mode: :secondary}' do
-          let(:read_secondary_option) { {read: {mode: :secondary}} }
+        let(:client) do
+          context_and_criteria[1].client
+        end
 
-          it_behaves_like 'applies secondary read preference'
+        it 'applies the options to the criteria client' do
+          expect(client.options['read']).to eq(:secondary)
         end
       end
 
@@ -221,11 +217,11 @@ describe Mongoid::Clients::Options do
           100.times do |i|
             threads << Thread.new do
               if i % 2 == 0
-                Band.with(collection: 'British') do |klass|
+                TestModel.with(collection: 'British') do |klass|
                   klass.create(name: 'realised')
                 end
               else
-                Band.with(collection: 'American') do |klass|
+                TestModel.with(collection: 'American') do |klass|
                   klass.create(name: 'realized')
                 end
               end
@@ -235,13 +231,13 @@ describe Mongoid::Clients::Options do
         end
 
         let(:british_count) do
-          Band.with(collection: 'British') do |klass|
+          TestModel.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
 
         let(:american_count) do
-          Band.with(collection: 'American') do |klass|
+          TestModel.with(collection: 'American') do |klass|
             klass.all.count
           end
         end
@@ -256,7 +252,7 @@ describe Mongoid::Clients::Options do
     context 'when passing a persistence context' do
 
       let(:instance) do
-        Band.new
+        TestModel.new
       end
 
       let(:persistence_context) do
@@ -268,8 +264,8 @@ describe Mongoid::Clients::Options do
       let(:options) { { database: 'other' } }
 
       it 'sets the persistence context on the object' do
-        Band.new.with(persistence_context) do |band_instance|
-          expect(band_instance.persistence_context.options).to eq(persistence_context.options)
+        TestModel.new.with(persistence_context) do |model_instance|
+          expect(model_instance.persistence_context.options).to eq(persistence_context.options)
         end
       end
     end
@@ -283,12 +279,12 @@ describe Mongoid::Clients::Options do
         { database: 'other' }
       end
 
-      let(:band) do
-        Band.create
+      let(:test_model) do
+        TestModel.create
       end
 
       let(:persistence_context) do
-        band.with(options) do |object|
+        test_model.with(options) do |object|
           object.persistence_context
         end
       end
@@ -298,13 +294,13 @@ describe Mongoid::Clients::Options do
       end
 
       it 'does not set the options on instance level' do
-        expect(band.persistence_context.client.database.name).to eq('mongoid_test')
+        expect(test_model.persistence_context.client.database.name).to eq('mongoid_test')
       end
 
       context 'when the options are not valid mongo client options' do
 
         let(:persistence_context) do
-          band.with(invalid_options) do |object|
+          test_model.with(invalid_options) do |object|
             object.persistence_context
           end
         end
@@ -319,7 +315,7 @@ describe Mongoid::Clients::Options do
 
         it 'clears the persistence context' do
           begin; persistence_context; rescue Mongoid::Errors::InvalidPersistenceOption; end
-          expect(band.persistence_context).to eq(Mongoid::PersistenceContext.new(band))
+          expect(test_model.persistence_context).to eq(Mongoid::PersistenceContext.new(test_model))
         end
       end
 
@@ -337,7 +333,7 @@ describe Mongoid::Clients::Options do
         end
 
         let(:persistence_context) do
-          band.with(client: :secondary) do |object|
+          test_model.with(client: :secondary) do |object|
             object.persistence_context
           end
         end
@@ -351,14 +347,14 @@ describe Mongoid::Clients::Options do
       context 'when passing a block', if: testing_locally? do
 
         let!(:connections_before) do
-          band.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+          test_model.mongo_client.database.command(serverStatus: 1).first['connections']['current']
         end
 
-        let(:connections_and_cluster_during) do
+        let!(:connections_and_cluster_during) do
           connections = nil
-          cluster = band.with(options) do |b|
+          cluster = test_model.with(options) do |b|
             b.reload
-            connections = band.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+            connections = test_model.mongo_client.database.command(serverStatus: 1).first['connections']['current']
             b.persistence_context.cluster
           end
           [ connections, cluster ]
@@ -373,15 +369,15 @@ describe Mongoid::Clients::Options do
         end
 
         let(:connections_after) do
-          band.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+          test_model.mongo_client.database.command(serverStatus: 1).first['connections']['current']
         end
 
         let!(:cluster_before) do
-          band.persistence_context.cluster
+          test_model.persistence_context.cluster
         end
 
         let(:cluster_after) do
-          band.persistence_context.cluster
+          test_model.persistence_context.cluster
         end
 
         context 'when the options create a new cluster' do
@@ -396,7 +392,7 @@ describe Mongoid::Clients::Options do
           end
 
           it 'disconnects the new cluster when the block exits' do
-            expect(connections_after).to eq(connections_before)
+            expect(connections_before).to eq(connections_after)
           end
         end
 
@@ -431,15 +427,15 @@ describe Mongoid::Clients::Options do
         before do
           threads = []
           100.times do |i|
-            band = Band.create
+            test_model = TestModel.create
             threads << Thread.new do
               if i % 2 == 0
-                band.with(collection: 'British') do |b|
+                test_model.with(collection: 'British') do |b|
                   b.name = 'realised'
                   b.upsert
                 end
               else
-                band.with(collection: 'American') do |b|
+                test_model.with(collection: 'American') do |b|
                   b.name = 'realized'
                   b.upsert
                 end
@@ -450,13 +446,13 @@ describe Mongoid::Clients::Options do
         end
 
         let(:british_count) do
-          Band.with(collection: 'British') do |klass|
+          TestModel.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
 
         let(:american_count) do
-          Band.with(collection: 'British') do |klass|
+          TestModel.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
@@ -471,7 +467,7 @@ describe Mongoid::Clients::Options do
     context 'when passing a persistence context' do
 
       let(:persistence_context) do
-        Band.with(options) do |klass|
+        TestModel.with(options) do |klass|
           klass.persistence_context
         end
       end
@@ -479,8 +475,8 @@ describe Mongoid::Clients::Options do
       let(:options) { { database: 'other' } }
 
       it 'sets the persistence context on the object' do
-        Band.with(persistence_context) do |band_class|
-          expect(band_class.persistence_context.options).to eq(persistence_context.options)
+        TestModel.with(persistence_context) do |test_model_class|
+          expect(test_model_class.persistence_context.options).to eq(persistence_context.options)
         end
       end
     end