mongo 2.13.0.beta1 → 2.13.0.rc1

data/spec/mongo/server_selector/primary_spec.rb

@@ -95,13 +95,13 @@ describe Mongo::ServerSelector::Primary do
     end
   end
 
-  describe '#select' do
+  describe '#select_in_replica_set' do
 
     context 'no candidates' do
       let(:candidates) { [] }
 
       it 'returns an empty array' do
-        expect(selector.send(:select, candidates)).to be_empty
+        expect(selector.send(:select_in_replica_set, candidates)).to be_empty
       end
     end
 
@@ -109,7 +109,7 @@ describe Mongo::ServerSelector::Primary do
       let(:candidates) { [secondary] }
 
       it 'returns an empty array' do
-        expect(selector.send(:select, candidates)).to be_empty
+        expect(selector.send(:select_in_replica_set, candidates)).to be_empty
       end
     end
 
@@ -117,7 +117,7 @@ describe Mongo::ServerSelector::Primary do
       let(:candidates) { [primary] }
 
       it 'returns an array with the primary' do
-        expect(selector.send(:select, candidates)).to eq([primary])
+        expect(selector.send(:select_in_replica_set, candidates)).to eq([primary])
       end
     end
 
@@ -125,7 +125,7 @@ describe Mongo::ServerSelector::Primary do
       let(:candidates) { [secondary, primary] }
 
       it 'returns an array with the primary' do
-        expect(selector.send(:select, candidates)).to eq([primary])
+        expect(selector.send(:select_in_replica_set, candidates)).to eq([primary])
       end
     end
 
@@ -139,7 +139,7 @@ describe Mongo::ServerSelector::Primary do
           let(:candidates) { [far_primary] }
 
           it 'returns array with the primary' do
-            expect(selector.send(:select, candidates)).to eq([far_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_primary])
           end
         end
 
@@ -147,7 +147,7 @@ describe Mongo::ServerSelector::Primary do
           let(:candidates) { [far_secondary] }
 
           it 'returns empty array' do
-            expect(selector.send(:select, candidates)).to be_empty
+            expect(selector.send(:select_in_replica_set, candidates)).to be_empty
           end
         end
       end
@@ -158,7 +158,7 @@ describe Mongo::ServerSelector::Primary do
           let(:candidates) { [far_primary, far_secondary] }
 
           it 'returns an array with the primary' do
-            expect(selector.send(:select, candidates)).to eq([far_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_primary])
           end
         end
 
@@ -166,7 +166,7 @@ describe Mongo::ServerSelector::Primary do
           let(:candidates) { [far_primary, far_secondary] }
 
           it 'returns an array with the primary' do
-            expect(selector.send(:select, candidates)).to eq([far_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_primary])
           end
         end
       end

data/spec/mongo/server_selector/secondary_preferred_spec.rb

@@ -127,12 +127,12 @@ describe Mongo::ServerSelector::SecondaryPreferred do
 
   end
 
-  describe '#select' do
+  describe '#select_in_replica_set' do
     context 'no candidates' do
       let(:candidates) { [] }
 
       it 'returns an empty array' do
-        expect(selector.send(:select, candidates)).to be_empty
+        expect(selector.send(:select_in_replica_set, candidates)).to be_empty
       end
     end
 
@@ -140,7 +140,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
       let(:candidates) { [primary] }
 
       it 'returns array with primary' do
-        expect(selector.send(:select, candidates)).to eq([primary])
+        expect(selector.send(:select_in_replica_set, candidates)).to eq([primary])
       end
     end
 
@@ -148,7 +148,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
       let(:candidates) { [secondary] }
 
       it 'returns array with secondary' do
-        expect(selector.send(:select, candidates)).to eq([secondary])
+        expect(selector.send(:select_in_replica_set, candidates)).to eq([secondary])
       end
     end
 
@@ -157,7 +157,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
       let(:expected) { [secondary, primary] }
 
       it 'returns array with secondary first, then primary' do
-        expect(selector.send(:select, candidates)).to eq(expected)
+        expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
       end
     end
 
@@ -166,7 +166,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
       let(:expected) { [secondary, primary] }
 
       it 'returns array with secondary and primary' do
-        expect(selector.send(:select, candidates)).to eq(expected)
+        expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
       end
     end
 
@@ -190,7 +190,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [primary] }
 
           it 'returns array with primary' do
-            expect(selector.send(:select, candidates)).to eq([primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([primary])
           end
         end
 
@@ -198,7 +198,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [matching_primary] }
 
           it 'returns array with matching primary' do
-            expect(selector.send(:select, candidates)).to eq([matching_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_primary])
           end
         end
 
@@ -206,7 +206,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [matching_secondary] }
 
           it 'returns array with matching secondary' do
-            expect(selector.send(:select, candidates)).to eq([matching_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_secondary])
           end
         end
 
@@ -214,7 +214,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [secondary] }
 
           it 'returns an empty array' do
-            expect(selector.send(:select, candidates)).to be_empty
+            expect(selector.send(:select_in_replica_set, candidates)).to be_empty
           end
         end
       end
@@ -225,7 +225,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [primary, secondary, secondary] }
 
           it 'returns an array with the primary' do
-            expect(selector.send(:select, candidates)).to eq([primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([primary])
           end
         end
 
@@ -233,7 +233,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [primary, matching_secondary] }
 
           it 'returns an array of the matching secondary, then primary' do
-            expect(selector.send(:select, candidates)).to eq(
+            expect(selector.send(:select_in_replica_set, candidates)).to eq(
               [matching_secondary, primary]
             )
           end
@@ -244,7 +244,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:expected) { [matching_secondary, matching_secondary, primary] }
 
           it 'returns an array of the matching secondaries, then primary' do
-            expect(selector.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
           end
         end
 
@@ -253,7 +253,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:expected) {[matching_secondary, matching_primary] }
 
           it 'returns an array of the matching secondary, then the primary' do
-            expect(selector.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
           end
         end
       end
@@ -269,7 +269,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [far_primary] }
 
           it 'returns array with primary' do
-            expect(selector.send(:select, candidates)).to eq([far_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_primary])
           end
         end
 
@@ -277,7 +277,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [far_secondary] }
 
           it 'returns an array with the secondary' do
-            expect(selector.send(:select, candidates)).to eq([far_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_secondary])
           end
         end
       end
@@ -288,7 +288,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [primary, secondary] }
 
           it 'returns an array with secondary, then primary' do
-            expect(selector.send(:select, candidates)).to eq([secondary, primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([secondary, primary])
           end
         end
 
@@ -296,7 +296,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [primary, far_secondary] }
 
           it 'returns an array with the secondary, then primary' do
-            expect(selector.send(:select, candidates)).to eq([far_secondary, primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_secondary, primary])
           end
         end
 
@@ -305,7 +305,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:expected) { [secondary, far_primary] }
 
           it 'returns an array with secondary, then primary' do
-            expect(selector.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
           end
         end
 
@@ -314,7 +314,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:expected) { [far_secondary, far_primary] }
 
           it 'returns an array with secondary, then primary' do
-            expect(selector.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
           end
         end
 
@@ -325,7 +325,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
             let(:expected) { [secondary, primary] }
 
             it 'returns an array with near secondary, then primary' do
-              expect(selector.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
             end
           end
 
@@ -334,7 +334,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
             let(:expected) { [secondary, secondary, far_primary] }
 
             it 'returns an array with secondaries, then primary' do
-              expect(selector.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
             end
           end
         end

data/spec/mongo/server_selector/secondary_spec.rb

@@ -106,13 +106,13 @@ describe Mongo::ServerSelector::Secondary do
     end
   end
 
-  describe '#select' do
+  describe '#select_in_replica_set' do
 
     context 'no candidates' do
       let(:candidates) { [] }
 
       it 'returns an empty array' do
-        expect(selector.send(:select, candidates)).to be_empty
+        expect(selector.send(:select_in_replica_set, candidates)).to be_empty
       end
     end
 
@@ -120,7 +120,7 @@ describe Mongo::ServerSelector::Secondary do
       let(:candidates) { [primary] }
 
       it 'returns an empty array' do
-        expect(selector.send(:select, candidates)).to be_empty
+        expect(selector.send(:select_in_replica_set, candidates)).to be_empty
       end
     end
 
@@ -128,7 +128,7 @@ describe Mongo::ServerSelector::Secondary do
       let(:candidates) { [secondary] }
 
       it 'returns array with secondary' do
-        expect(selector.send(:select, candidates)).to eq([secondary])
+        expect(selector.send(:select_in_replica_set, candidates)).to eq([secondary])
       end
     end
 
@@ -136,7 +136,7 @@ describe Mongo::ServerSelector::Secondary do
       let(:candidates) { [primary, secondary] }
 
       it 'returns array with secondary' do
-        expect(selector.send(:select, candidates)).to eq([secondary])
+        expect(selector.send(:select_in_replica_set, candidates)).to eq([secondary])
       end
     end
 
@@ -144,7 +144,7 @@ describe Mongo::ServerSelector::Secondary do
       let(:candidates) { [secondary, secondary, primary] }
 
       it 'returns array with all secondaries' do
-        expect(selector.send(:select, candidates)).to eq([secondary, secondary])
+        expect(selector.send(:select_in_replica_set, candidates)).to eq([secondary, secondary])
       end
     end
 
@@ -158,7 +158,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [primary] }
 
           it 'returns an empty array' do
-            expect(selector.send(:select, candidates)).to be_empty
+            expect(selector.send(:select_in_replica_set, candidates)).to be_empty
           end
         end
 
@@ -166,7 +166,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [secondary] }
 
           it 'returns an empty array' do
-            expect(selector.send(:select, candidates)).to be_empty
+            expect(selector.send(:select_in_replica_set, candidates)).to be_empty
           end
         end
 
@@ -174,7 +174,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [matching_secondary] }
 
           it 'returns an array with matching secondary' do
-            expect(selector.send(:select, candidates)).to eq([matching_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_secondary])
           end
         end
       end
@@ -185,7 +185,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [primary, secondary, secondary] }
 
           it 'returns an emtpy array' do
-            expect(selector.send(:select, candidates)).to be_empty
+            expect(selector.send(:select_in_replica_set, candidates)).to be_empty
           end
         end
 
@@ -193,7 +193,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [secondary, matching_secondary]}
 
           it 'returns array with matching secondary' do
-            expect(selector.send(:select, candidates)).to eq([matching_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_secondary])
           end
         end
 
@@ -201,7 +201,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [matching_secondary, matching_secondary] }
 
           it 'returns an array with both matching secondaries' do
-            expect(selector.send(:select, candidates)).to eq([matching_secondary, matching_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_secondary, matching_secondary])
           end
         end
       end
@@ -217,7 +217,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [far_primary] }
 
           it 'returns an empty array' do
-            expect(selector.send(:select, candidates)).to be_empty
+            expect(selector.send(:select_in_replica_set, candidates)).to be_empty
           end
         end
 
@@ -225,7 +225,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [far_secondary] }
 
           it 'returns an array with the secondary' do
-            expect(selector.send(:select, candidates)).to eq([far_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_secondary])
           end
         end
       end
@@ -236,7 +236,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [primary, far_secondary] }
 
           it 'returns an array with the secondary' do
-            expect(selector.send(:select, candidates)).to eq([far_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_secondary])
           end
         end
 
@@ -244,7 +244,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [far_primary, far_secondary] }
 
           it 'returns an array with the secondary' do
-            expect(selector.send(:select, candidates)).to eq([far_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_secondary])
           end
         end
 
@@ -254,7 +254,7 @@ describe Mongo::ServerSelector::Secondary do
             let(:candidates) { [primary, secondary, far_secondary] }
 
             it 'returns an array with near secondary' do
-              expect(selector.send(:select, candidates)).to eq([secondary])
+              expect(selector.send(:select_in_replica_set, candidates)).to eq([secondary])
             end
           end
 
@@ -262,7 +262,7 @@ describe Mongo::ServerSelector::Secondary do
             let(:candidates) { [far_primary, secondary, secondary] }
 
             it 'returns an array with two secondaries' do
-              expect(selector.send(:select, candidates)).to eq([secondary, secondary])
+              expect(selector.send(:select_in_replica_set, candidates)).to eq([secondary, secondary])
             end
           end
         end

data/spec/mongo/server_selector_spec.rb

@@ -198,7 +198,7 @@ describe Mongo::ServerSelector do
   describe "#select_server" do
     skip_if_linting
 
-    context 'when #select returns a list of nils' do
+    context 'when #select_in_replica_set returns a list of nils' do
 
       let(:servers) do
         [ make_server(:primary) ]
@@ -224,7 +224,7 @@ describe Mongo::ServerSelector do
 
       let(:read_pref) do
         described_class.get(mode: :primary).tap do |pref|
-          allow(pref).to receive(:select).and_return([ nil, nil ])
+          allow(pref).to receive(:select_in_replica_set).and_return([ nil, nil ])
         end
       end
 
@@ -564,7 +564,7 @@ describe Mongo::ServerSelector do
     end
   end
 
-  describe '#candidates' do
+  describe '#suitable_servers' do
     let(:selector) { Mongo::ServerSelector::Primary.new(options) }
 
     let(:cluster) { double('cluster') }
@@ -602,7 +602,7 @@ describe Mongo::ServerSelector do
           end
 
           it 'returns an empty list' do
-            expect(selector.candidates(cluster)).to eq([])
+            expect(selector.suitable_servers(cluster)).to eq([])
           end
         end
       end

data/spec/mongo/session_spec.rb

@@ -307,4 +307,39 @@ describe Mongo::Session do
       end
     end
   end
+
+  describe '#start_session' do
+    context 'when block doesn\'t raise an error' do 
+      it 'closes the session after the block' do 
+        block_session = nil
+        authorized_client.start_session do |session| 
+          expect(session.ended?).to be false
+          block_session = session 
+        end
+        expect(block_session.ended?).to be true
+      end
+    end
+
+    context 'when block raises an error' do
+      it 'closes the session after the block' do
+        block_session = nil
+        expect do 
+          authorized_client.start_session do |session|
+            block_session = session
+            raise 'This is an error!'
+          end
+        end.to raise_error(StandardError, 'This is an error!')
+        expect(block_session.ended?).to be true
+      end
+    end
+
+    context 'when block returns value' do
+      it 'is returned by the function' do
+        res = authorized_client.start_session do |session| 
+          4
+        end
+        expect(res).to be 4
+      end
+    end
+  end
 end