mongo 2.5.0.beta → 2.5.0

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::CreateIndex do
+describe Mongo::Operation::Write::Command::CreateIndex do
 
   describe '#execute' do
 
@@ -49,15 +49,11 @@ describe Mongo::Operation::Write::CreateIndex do
         authorized_collection.indexes.drop_one('random_1')
       end
 
-      it 'raises an exception', if: write_command_enabled? do
+      it 'raises an exception' do
         expect {
           second_operation.execute(authorized_primary)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
-
-      it 'does not raise an exception', unless: write_command_enabled? do
-        expect(second_operation.execute(authorized_primary)).to be_successful
-      end
     end
   end
 end

data/spec/mongo/operation/write/command/delete_spec.rb

@@ -6,13 +6,15 @@ describe Mongo::Operation::Write::Command::Delete do
     Mongo::WriteConcern.get(WRITE_CONCERN)
   end
 
+  let(:session) { nil }
   let(:deletes) { [{:q => { :foo => 1 }, :limit => 1}] }
   let(:spec) do
     { :deletes       => deletes,
       :db_name       => authorized_collection.database.name,
       :coll_name     => authorized_collection.name,
       :write_concern => write_concern,
-      :ordered       => true
+      :ordered       => true,
+      :session       => session
     }
   end
 
@@ -93,7 +95,8 @@ describe Mongo::Operation::Write::Command::Delete do
             delete: TEST_COLL,
             ordered: true,
             writeConcern: write_concern.options,
-            '$db' => TEST_DB
+            '$db' => TEST_DB,
+            lsid: session.session_id
         }
       end
 
@@ -106,7 +109,11 @@ describe Mongo::Operation::Write::Command::Delete do
         }
       end
 
-      context 'when the topology is sharded', if: sharded? && op_msg_enabled? do
+      let(:session) do
+        authorized_client.start_session
+      end
+
+      context 'when the topology is replica set or sharded', if: (replica_set? || sharded?) && op_msg_enabled? do
 
         let(:expected_global_args) do
           global_args.merge(Mongo::Operation::CLUSTER_TIME => authorized_client.cluster.cluster_time)
@@ -119,7 +126,7 @@ describe Mongo::Operation::Write::Command::Delete do
         end
       end
 
-      context 'when the topology is not sharded', if: !sharded? && op_msg_enabled? do
+      context 'when the topology is standalone', if: standalone? && op_msg_enabled? do
 
         let(:expected_global_args) do
           global_args
@@ -130,6 +137,25 @@ describe Mongo::Operation::Write::Command::Delete do
           expect(Mongo::Protocol::Msg).to receive(:new).with([:none], {}, expected_global_args, expected_payload_1)
           op.send(:message, authorized_primary)
         end
+
+        context 'when an implicit session is created and the topology is then updated and the server does not support sessions' do
+
+          let(:expected_global_args) do
+            global_args.delete(:lsid)
+            global_args
+          end
+
+          before do
+            session.instance_variable_set(:@options, { implicit: true })
+            allow(authorized_primary.features).to receive(:sessions_enabled?).and_return(false)
+          end
+
+          it 'creates the correct OP_MSG message' do
+            authorized_client.command(ping:1)
+            expect(Mongo::Protocol::Msg).to receive(:new).with([:none], {}, expected_global_args, expected_payload_1)
+            op.send(:message, authorized_primary)
+          end
+        end
       end
 
       context 'when the write concern is 0' do
@@ -138,10 +164,11 @@ describe Mongo::Operation::Write::Command::Delete do
           Mongo::WriteConcern.get(w: 0)
         end
 
-        context 'when the topology is sharded', if: sharded? && op_msg_enabled? do
+        context 'when the topology is replica set or sharded', if: (replica_set? || sharded?) && op_msg_enabled? do
 
           let(:expected_global_args) do
-            global_args.merge(Mongo::Operation::CLUSTER_TIME => authorized_client.cluster.cluster_time)
+            global_args.delete(:lsid)
+            global_args.merge!(Mongo::Operation::CLUSTER_TIME => authorized_client.cluster.cluster_time)
           end
 
           it 'creates the correct OP_MSG message' do
@@ -151,9 +178,10 @@ describe Mongo::Operation::Write::Command::Delete do
           end
         end
 
-        context 'when the topology is not sharded', if: !sharded? && op_msg_enabled? do
+        context 'when the topology is standalone', if: standalone? && op_msg_enabled? do
 
           let(:expected_global_args) do
+            global_args.delete(:lsid)
             global_args
           end
 

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

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

data/spec/mongo/operation/write/command/insert_spec.rb

@@ -3,12 +3,14 @@ require 'spec_helper'
 describe Mongo::Operation::Write::Command::Insert do
 
   let(:documents) { [{ :_id => 1, :foo => 1 }] }
+  let(:session) { nil }
   let(:spec) do
     { :documents     => documents,
       :db_name       => authorized_collection.database.name,
       :coll_name     => authorized_collection.name,
       :write_concern => write_concern,
-      :ordered       => true
+      :ordered       => true,
+      :session       => session
     }
   end
 
@@ -97,7 +99,8 @@ describe Mongo::Operation::Write::Command::Insert do
             insert: TEST_COLL,
             ordered: true,
             writeConcern: write_concern.options,
-            '$db' => TEST_DB
+            '$db' => TEST_DB,
+            lsid: session.session_id
         }
       end
 
@@ -110,7 +113,11 @@ describe Mongo::Operation::Write::Command::Insert do
         }
       end
 
-      context 'when the topology is sharded', if: sharded? && op_msg_enabled? do
+      let(:session) do
+        authorized_client.start_session
+      end
+
+      context 'when the topology is replica set or sharded', if: (replica_set? || sharded?) && op_msg_enabled? do
 
         let(:expected_global_args) do
           global_args.merge(Mongo::Operation::CLUSTER_TIME => authorized_client.cluster.cluster_time)
@@ -126,7 +133,7 @@ describe Mongo::Operation::Write::Command::Insert do
         end
       end
 
-      context 'when the topology is not sharded', if: !sharded? && op_msg_enabled? do
+      context 'when the topology is standalone', if: standalone? && op_msg_enabled? do
 
         let(:expected_global_args) do
           global_args
@@ -140,6 +147,28 @@ describe Mongo::Operation::Write::Command::Insert do
                                                              expected_payload_1)
           op.send(:message, authorized_primary)
         end
+
+        context 'when an implicit session is created and the topology is then updated and the server does not support sessions' do
+
+          let(:expected_global_args) do
+            global_args.delete(:lsid)
+            global_args
+          end
+
+          before do
+            session.instance_variable_set(:@options, { implicit: true })
+            allow(authorized_primary.features).to receive(:sessions_enabled?).and_return(false)
+          end
+
+          it 'creates the correct OP_MSG message' do
+            authorized_client.command(ping:1)
+            expect(Mongo::Protocol::Msg).to receive(:new).with([:none],
+                                                               { validating_keys: true },
+                                                               expected_global_args,
+                                                               expected_payload_1)
+            op.send(:message, authorized_primary)
+          end
+        end
       end
 
       context 'when the write concern is 0' do
@@ -148,9 +177,10 @@ describe Mongo::Operation::Write::Command::Insert do
           Mongo::WriteConcern.get(w: 0)
         end
 
-        context 'when the topology is sharded', if: sharded? && op_msg_enabled? do
+        context 'when the topology is replica set or sharded', if: (replica_set? || sharded?) && op_msg_enabled? do
 
           let(:expected_global_args) do
+            global_args.delete(:lsid)
             global_args.merge(Mongo::Operation::CLUSTER_TIME => authorized_client.cluster.cluster_time)
           end
 
@@ -164,9 +194,10 @@ describe Mongo::Operation::Write::Command::Insert do
           end
         end
 
-        context 'when the topology is not sharded', if: !sharded? && op_msg_enabled? do
+        context 'when the topology is standalone', if: standalone? && op_msg_enabled? do
 
           let(:expected_global_args) do
+            global_args.delete(:lsid)
             global_args
           end
 

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::RemoveUser do
+describe Mongo::Operation::Write::Command::RemoveUser do
 
   describe '#execute' do
 
@@ -32,15 +32,11 @@ describe Mongo::Operation::Write::RemoveUser do
         operation.execute(root_authorized_primary)
       end
 
-      it 'raises an exception', if: write_command_enabled? do
+      it 'raises an exception' do
         expect {
           operation.execute(root_authorized_primary)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
-
-      it 'does not raise an exception', unless: write_command_enabled? do
-        expect(operation.execute(root_authorized_primary).written_count).to eq(0)
-      end
     end
   end
 end

data/spec/mongo/operation/write/command/update_spec.rb

@@ -10,13 +10,14 @@ describe Mongo::Operation::Write::Command::Update do
   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
+      :ordered       => true,
+      :session       => session
     }
   end
 
@@ -100,7 +101,8 @@ describe Mongo::Operation::Write::Command::Update do
             update: TEST_COLL,
             ordered: true,
             writeConcern: write_concern.options,
-            '$db' => TEST_DB
+            '$db' => TEST_DB,
+            lsid: session.session_id
         }
       end
 
@@ -113,7 +115,11 @@ describe Mongo::Operation::Write::Command::Update do
         }
       end
 
-      context 'when the topology is sharded', if: sharded? && op_msg_enabled? do
+      let(:session) do
+        authorized_client.start_session
+      end
+
+      context 'when the topology is replica set or sharded', if: (replica_set? || sharded?) && op_msg_enabled? do
 
         let(:expected_global_args) do
           global_args.merge(Mongo::Operation::CLUSTER_TIME => authorized_client.cluster.cluster_time)
@@ -126,7 +132,7 @@ describe Mongo::Operation::Write::Command::Update do
         end
       end
 
-      context 'when the topology is not sharded', if: !sharded? && op_msg_enabled? do
+      context 'when the topology is standalone', if: standalone? && op_msg_enabled? do
 
         let(:expected_global_args) do
           global_args
@@ -137,6 +143,25 @@ describe Mongo::Operation::Write::Command::Update do
           expect(Mongo::Protocol::Msg).to receive(:new).with([:none], {}, expected_global_args, expected_payload_1)
           op.send(:message, authorized_primary)
         end
+
+        context 'when an implicit session is created and the topology is then updated and the server does not support sessions' do
+
+          let(:expected_global_args) do
+            global_args.delete(:lsid)
+            global_args
+          end
+
+          before do
+            session.instance_variable_set(:@options, { implicit: true })
+            allow(authorized_primary.features).to receive(:sessions_enabled?).and_return(false)
+          end
+
+          it 'creates the correct OP_MSG message' do
+            authorized_client.command(ping:1)
+            expect(Mongo::Protocol::Msg).to receive(:new).with([:none], {}, expected_global_args, expected_payload_1)
+            op.send(:message, authorized_primary)
+          end
+        end
       end
 
       context 'when the write concern is 0' do
@@ -145,9 +170,10 @@ describe Mongo::Operation::Write::Command::Update do
           Mongo::WriteConcern.get(w: 0)
         end
 
-        context 'when the topology is sharded', if: sharded? && op_msg_enabled? do
+        context 'when the topology is replica set or sharded', if: (replica_set? || sharded?) && op_msg_enabled? do
 
           let(:expected_global_args) do
+            global_args.delete(:lsid)
             global_args.merge(Mongo::Operation::CLUSTER_TIME => authorized_client.cluster.cluster_time)
           end
 
@@ -158,9 +184,10 @@ describe Mongo::Operation::Write::Command::Update do
           end
         end
 
-        context 'when the topology is not sharded', if: !sharded? && op_msg_enabled? do
+        context 'when the topology is standalone', if: standalone? && op_msg_enabled? do
 
           let(:expected_global_args) do
+            global_args.delete(:lsid)
             global_args
           end
 

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

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

data/spec/mongo/operation/write/create_user_spec.rb

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

data/spec/mongo/operation/write/delete_spec.rb

@@ -152,7 +152,7 @@ describe Mongo::Operation::Write::Delete do
       context 'when a delete fails' do
 
         let(:document) do
-          failing_delete_doc
+          { q: { '$set' => { a: 1 } }, limit: 0 }
         end
 
         let(:result) do

data/spec/mongo/operation/write/insert_spec.rb

@@ -115,14 +115,10 @@ describe Mongo::Operation::Write::Insert do
           insert.execute(authorized_primary)
         end
 
-        it 'reports the correct written count', if: write_command_enabled? do
+        it 'reports the correct written count' do
           expect(response.written_count).to eq(1)
         end
 
-        it 'reports the correct written count', unless: write_command_enabled? do
-          expect(response.written_count).to eq(0)
-        end
-
         it 'inserts the document into the collection' do
           expect(authorized_collection.find(_id: 1).to_a). to eq(documents)
         end
@@ -170,14 +166,10 @@ describe Mongo::Operation::Write::Insert do
           insert.execute(authorized_primary)
         end
 
-        it 'reports the correct written count', if: write_command_enabled? do
+        it 'reports the correct written count' do
           expect(response.written_count).to eq(2)
         end
 
-        it 'reports the correct written count', unless: write_command_enabled? do
-          expect(response.written_count).to eq(0)
-        end
-
         it 'inserts the documents into the collection' do
           expect(authorized_collection.find.to_a). to eq(documents)
         end

data/spec/mongo/operation/write/update_spec.rb

@@ -106,14 +106,10 @@ describe Mongo::Operation::Write::Update do
           expect(result.written_count).to eq(1)
         end
 
-        it 'reports the modified count', if: write_command_enabled? do
+        it 'reports the modified count' do
           expect(result.modified_count).to eq(1)
         end
 
-        it 'returns nil for the modified count', unless: write_command_enabled? do
-          expect(result.modified_count).to be_nil
-        end
-
         it 'reports the matched count' do
           expect(result.matched_count).to eq(1)
         end
@@ -162,14 +158,10 @@ describe Mongo::Operation::Write::Update do
           expect(result.written_count).to eq(2)
         end
 
-        it 'reports the modified count', if: write_command_enabled? do
+        it 'reports the modified count' do
           expect(result.modified_count).to eq(2)
         end
 
-        it 'returns nil for the modified count', unless: write_command_enabled? do
-          expect(result.modified_count).to be_nil
-        end
-
         it 'reports the matched count' do
           expect(result.matched_count).to eq(2)
         end
@@ -219,14 +211,10 @@ describe Mongo::Operation::Write::Update do
           expect(result.written_count).to eq(1)
         end
 
-        it 'reports the modified count', if: write_command_enabled? do
+        it 'reports the modified count' do
           expect(result.modified_count).to eq(0)
         end
 
-        it 'returns nil for the modified count', unless: write_command_enabled? do
-          expect(result.modified_count).to be_nil
-        end
-
         it 'reports the matched count' do
           expect(result.matched_count).to eq(0)
         end