mongo 2.5.1 → 2.5.2

data/spec/mongo/operation/limited_spec.rb

@@ -18,7 +18,7 @@ describe Mongo::Operation::Limited do
       end
 
       it 'returns a limit of -1' do
-        expect(limited.options).to eq({ :skip => 5, :limit => -1 })
+        expect(limited.send(:options)).to eq({ :skip => 5, :limit => -1 })
       end
     end
 
@@ -31,7 +31,7 @@ describe Mongo::Operation::Limited do
         end
 
         it 'returns a limit of -1' do
-          expect(limited.options).to eq({ :skip => 5, :limit => -1 })
+          expect(limited.send(:options)).to eq({ :skip => 5, :limit => -1 })
         end
       end
 
@@ -42,7 +42,7 @@ describe Mongo::Operation::Limited do
         end
 
         it 'returns a limit of -1' do
-          expect(limited.options).to eq({ :skip => 5, :limit => -1 })
+          expect(limited.send(:options)).to eq({ :skip => 5, :limit => -1 })
         end
       end
     end

data/spec/mongo/operation/{commands/map_reduce_spec.rb → map_reduce_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Commands::MapReduce do
+describe Mongo::Operation::MapReduce do
 
   let(:map) do
   %Q{

data/spec/mongo/operation/read_preference_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::ReadPreference do
+describe Mongo::Operation::ReadPreferenceSupported do
 
   let(:selector) do
     { name: 'test' }
@@ -28,7 +28,7 @@ describe Mongo::Operation::ReadPreference do
 
   let(:operation) do
     Class.new do
-      include Mongo::Operation::ReadPreference
+      include Mongo::Operation::ReadPreferenceSupported
     end.new.tap do |rp|
       allow(rp).to receive(:read).and_return(read_pref)
       allow(rp).to receive(:selector).and_return(selector)

data/spec/mongo/operation/{write/command/remove_user_spec.rb → remove_user_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::Command::RemoveUser do
+describe Mongo::Operation::RemoveUser do
 
   describe '#execute' do
 

data/spec/mongo/operation/{write/bulk/update_spec.rb → update/bulk_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::Bulk::Update do
+describe Mongo::Operation::Update do
 
   let(:documents) do
     [{ :q => { :foo => 1 },
@@ -75,7 +75,7 @@ describe Mongo::Operation::Write::Bulk::Update do
     end
   end
 
-  describe '#execute' do
+  describe '#bulk_execute' do
 
     before do
       authorized_collection.insert_many([
@@ -97,7 +97,7 @@ describe Mongo::Operation::Write::Bulk::Update do
         end
 
         it 'updates the document' do
-          op.execute(authorized_primary)
+          op.bulk_execute(authorized_primary)
           expect(authorized_collection.find(field: 'blah').count).to eq(1)
         end
       end
@@ -121,7 +121,7 @@ describe Mongo::Operation::Write::Bulk::Update do
         end
 
         it 'updates the documents' do
-          op.execute(authorized_primary)
+          op.bulk_execute(authorized_primary)
           expect(authorized_collection.find(field: 'blah').count).to eq(2)
         end
       end
@@ -153,7 +153,7 @@ describe Mongo::Operation::Write::Bulk::Update do
         context 'when write concern is acknowledged' do
 
           it 'aborts after first error' do
-            failing_update.execute(authorized_primary)
+            failing_update.bulk_execute(authorized_primary)
             expect(authorized_collection.find(other: 'blah').count).to eq(0)
           end
         end
@@ -165,7 +165,7 @@ describe Mongo::Operation::Write::Bulk::Update do
           end
 
           it 'aborts after first error' do
-            failing_update.execute(authorized_primary)
+            failing_update.bulk_execute(authorized_primary)
             expect(authorized_collection.find(other: 'blah').count).to eq(0)
           end
         end
@@ -198,7 +198,7 @@ describe Mongo::Operation::Write::Bulk::Update do
         context 'when write concern is acknowledged' do
 
           it 'does not abort after first error' do
-            failing_update.execute(authorized_primary)
+            failing_update.bulk_execute(authorized_primary)
             expect(authorized_collection.find(other: 'blah').count).to eq(1)
           end
         end
@@ -210,7 +210,7 @@ describe Mongo::Operation::Write::Bulk::Update do
           end
 
           it 'does not abort after first error' do
-            failing_update.execute(authorized_primary)
+            failing_update.bulk_execute(authorized_primary)
             expect(authorized_collection.find(other: 'blah').count).to eq(1)
           end
         end

data/spec/mongo/operation/update/command_spec.rb

@@ -0,0 +1,114 @@
+require 'spec_helper'
+
+describe Mongo::Operation::Update::Command do
+
+  let(:updates) { [{:q => { :foo => 1 },
+                    :u => { :$set => { :bar => 1 } },
+                    :multi => true,
+                    :upsert => false }] }
+
+  let(:write_concern) do
+    Mongo::WriteConcern.get(WRITE_CONCERN)
+  end
+  let(:session) { nil }
+  let(:spec) do
+    { :updates       => updates,
+      :db_name       => TEST_DB,
+      :coll_name     => TEST_COLL,
+      :write_concern => write_concern,
+      :ordered       => true,
+      :session       => session
+    }
+  end
+
+  let(:op) { described_class.new(spec) }
+
+  describe '#initialize' do
+
+    context 'spec' do
+
+      it 'sets the spec' do
+        expect(op.spec).to eq(spec)
+      end
+    end
+  end
+
+  describe '#==' do
+
+    context 'spec' do
+
+      context 'when two ops have the same specs' do
+        let(:other) { described_class.new(spec) }
+
+        it 'returns true' do
+          expect(op).to eq(other)
+        end
+      end
+
+      context 'when two ops have different specs' do
+        let(:other_updates) { [{:q => { :bar => 1 },
+                                :u => { :$set => { :bar => 2 } },
+                                :multi => true,
+                                :upsert => false }] }
+        let(:other_spec) do
+          { :updates       => other_updates,
+            :db_name       => TEST_DB,
+            :coll_name     => TEST_COLL,
+            :write_concern => Mongo::WriteConcern.get(WRITE_CONCERN),
+            :ordered       => true
+          }
+        end
+        let(:other) { described_class.new(other_spec) }
+
+        it 'returns false' do
+          expect(op).not_to eq(other)
+        end
+      end
+    end
+  end
+
+  describe 'write concern' do
+
+    context 'when write concern is not specified' do
+
+      let(:spec) do
+        { :updates       => updates,
+          :db_name       => TEST_DB,
+          :coll_name     => TEST_COLL,
+          :ordered       => true
+        }
+      end
+
+      it 'does not include write concern in the selector' do
+        expect(op.send(:command, double('server'))[:writeConcern]).to be_nil
+      end
+    end
+
+    context 'when write concern is specified' do
+
+      it 'includes write concern in the selector' do
+        expect(op.send(:command, double('server'))[:writeConcern]).to eq(write_concern.options)
+      end
+    end
+  end
+
+  describe '#message' do
+
+    context 'when the server does not support OP_MSG' do
+
+      let(:expected_selector) do
+        {
+            :update        => TEST_COLL,
+            :updates       => updates,
+            :ordered       => true,
+            :writeConcern   => write_concern.options
+        }
+      end
+
+      it 'creates the correct Command message', unless: op_msg_enabled? do
+        expect(Mongo::Protocol::Query).to receive(:new).with(TEST_DB, '$cmd', expected_selector, { limit: -1 })
+        op.send(:message, authorized_primary)
+      end
+    end
+  end
+end

data/spec/mongo/operation/{write/command/update_spec.rb → update/op_msg_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::Command::Update do
+describe Mongo::Operation::Update::OpMsg do
 
   let(:updates) { [{:q => { :foo => 1 },
                     :u => { :$set => { :bar => 1 } },
@@ -47,9 +47,9 @@ describe Mongo::Operation::Write::Command::Update do
 
       context 'when two ops have different specs' do
         let(:other_updates) { [{:q => { :bar => 1 },
-                          :u => { :$set => { :bar => 2 } },
-                          :multi => true,
-                          :upsert => false }] }
+                                :u => { :$set => { :bar => 2 } },
+                                :multi => true,
+                                :upsert => false }] }
         let(:other_spec) do
           { :updates       => other_updates,
             :db_name       => TEST_DB,
@@ -80,14 +80,14 @@ describe Mongo::Operation::Write::Command::Update do
       end
 
       it 'does not include write concern in the selector' do
-        expect(op.send(:selector)[:writeConcern]).to be_nil
+        expect(op.send(:command, authorized_primary)[:writeConcern]).to be_nil
       end
     end
 
     context 'when write concern is specified' do
 
       it 'includes write concern in the selector' do
-        expect(op.send(:selector)[:writeConcern]).to eq(write_concern.options)
+        expect(op.send(:command, authorized_primary)[:writeConcern]).to eq(write_concern.options)
       end
     end
   end
@@ -108,10 +108,10 @@ describe Mongo::Operation::Write::Command::Update do
 
       let(:expected_payload_1) do
         {
-          type: 1,
-          payload: { identifier: 'updates',
-                     sequence: updates
-          }
+            type: 1,
+            payload: { identifier: 'updates',
+                       sequence: updates
+            }
         }
       end
 
@@ -119,7 +119,7 @@ describe Mongo::Operation::Write::Command::Update do
         authorized_client.start_session
       end
 
-      context 'when the topology is replica set or sharded', if: (replica_set? || sharded?) && op_msg_enabled? do
+      context 'when the topology is replica set or sharded', if: test_sessions? do
 
         let(:expected_global_args) do
           global_args.merge(Mongo::Operation::CLUSTER_TIME => authorized_client.cluster.cluster_time)
@@ -132,7 +132,7 @@ describe Mongo::Operation::Write::Command::Update do
         end
       end
 
-      context 'when the topology is standalone', if: standalone? && op_msg_enabled? do
+      context 'when the topology is standalone', if: standalone? && sessions_enabled? do
 
         let(:expected_global_args) do
           global_args
@@ -170,28 +170,54 @@ describe Mongo::Operation::Write::Command::Update do
           Mongo::WriteConcern.get(w: 0)
         end
 
-        context 'when the topology is replica set or sharded', if: (replica_set? || sharded?) && op_msg_enabled? do
+        context 'when the session is implicit' do
 
-          let(:expected_global_args) do
-            global_args.delete(:lsid)
-            global_args.merge(Mongo::Operation::CLUSTER_TIME => authorized_client.cluster.cluster_time)
+          let(:session) do
+            # Use client#get_session so the session is implicit
+            authorized_client.send(:get_session)
           end
 
-          it 'creates the correct OP_MSG message' do
-            authorized_client.command(ping:1)
-            expect(Mongo::Protocol::Msg).to receive(:new).with([:more_to_come], {}, expected_global_args, expected_payload_1)
-            op.send(:message, authorized_primary)
+          context 'when the topology is replica set or sharded', if: test_sessions? do
+
+            let(:expected_global_args) do
+              global_args.delete(:lsid)
+              global_args.merge(Mongo::Operation::CLUSTER_TIME => authorized_client.cluster.cluster_time)
+            end
+
+            it 'does not send a session id in the command' do
+              authorized_client.command(ping:1)
+              expect(Mongo::Protocol::Msg).to receive(:new).with([:more_to_come], {}, expected_global_args, expected_payload_1)
+              op.send(:message, authorized_primary)
+            end
+          end
+
+          context 'when the topology is standalone', if: standalone? && sessions_enabled? do
+
+            let(:expected_global_args) do
+              global_args.delete(:lsid)
+              global_args
+            end
+
+            it 'creates the correct OP_MSG message' do
+              authorized_client.command(ping:1)
+              expect(Mongo::Protocol::Msg).to receive(:new).with([:more_to_come], {}, expected_global_args, expected_payload_1)
+              op.send(:message, authorized_primary)
+            end
           end
         end
 
-        context 'when the topology is standalone', if: standalone? && op_msg_enabled? do
+        context 'when the session is explicit', if: test_sessions? do
+
+          let(:session) do
+            authorized_client.start_session
+          end
 
           let(:expected_global_args) do
             global_args.delete(:lsid)
-            global_args
+            global_args.merge(Mongo::Operation::CLUSTER_TIME => authorized_client.cluster.cluster_time)
           end
 
-          it 'creates the correct OP_MSG message' do
+          it 'does not send a session id in the command' do
             authorized_client.command(ping:1)
             expect(Mongo::Protocol::Msg).to receive(:new).with([:more_to_come], {}, expected_global_args, expected_payload_1)
             op.send(:message, authorized_primary)
@@ -199,22 +225,5 @@ describe Mongo::Operation::Write::Command::Update do
         end
       end
     end
-
-    context 'when the server does not support OP_MSG' do
-
-      let(:expected_selector) do
-        {
-            :update        => TEST_COLL,
-            :updates       => updates,
-            :ordered       => true,
-            :writeConcern   => write_concern.options
-        }
-      end
-
-      it 'creates the correct Command message', unless: op_msg_enabled? do
-        expect(Mongo::Protocol::Query).to receive(:new).with(TEST_DB, '$cmd', expected_selector, { limit: -1 })
-        op.send(:message, authorized_primary)
-      end
-    end
   end
 end

data/spec/mongo/operation/{write/update_spec.rb → update_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::Update do
+describe Mongo::Operation::Update do
 
   let(:document) do
     { :q => { :foo => 1 },
@@ -10,7 +10,7 @@ describe Mongo::Operation::Write::Update do
   end
 
   let(:spec) do
-    { :update        => document,
+    { :updates        => [ document ],
       :db_name       => TEST_DB,
       :coll_name     => TEST_COLL,
       :write_concern => Mongo::WriteConcern.get(:w => 1),
@@ -85,7 +85,7 @@ describe Mongo::Operation::Write::Update do
 
       let(:update) do
         described_class.new({
-          update: document,
+          updates: [ document ],
           db_name: TEST_DB,
           coll_name: TEST_COLL,
           write_concern: Mongo::WriteConcern.get(:w => 1)
@@ -137,7 +137,7 @@ describe Mongo::Operation::Write::Update do
 
       let(:update) do
         described_class.new({
-          update: document,
+          updates: [ document ],
           db_name: TEST_DB,
           coll_name: TEST_COLL,
           write_concern: Mongo::WriteConcern.get(:w => 1)
@@ -229,7 +229,7 @@ describe Mongo::Operation::Write::Update do
 
       let(:update) do
         described_class.new({
-                                update: document,
+                                updates: [ document ],
                                 db_name: TEST_DB,
                                 coll_name: TEST_COLL,
                                 write_concern: Mongo::WriteConcern.get(:w => 0)
@@ -245,7 +245,7 @@ describe Mongo::Operation::Write::Update do
       end
 
       before do
-        expect(update).to receive(:execute_message).and_call_original
+        expect(Mongo::Operation::Update::Legacy).to receive(:new).and_call_original
       end
 
       it 'uses op codes instead of write commands' do