mongo 2.5.1 → 2.5.2

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

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

data/spec/mongo/operation/{read/query_spec.rb → find/legacy_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Read::Query, unless: op_msg_enabled? do
+describe Mongo::Operation::Find::Legacy, unless: op_msg_enabled? do
   
   let(:selector) { { foo: 1 } }
   let(:query_options) { {} }
@@ -95,7 +95,7 @@ describe Mongo::Operation::Read::Query, unless: op_msg_enabled? do
       end
 
       it 'does not raise an exception' do
-        expect(op.execute(authorized_primary)).to be_a(Mongo::Operation::Read::Query::Result)
+        expect(op.execute(authorized_primary)).to be_a(Mongo::Operation::Find::Legacy::Result)
       end
     end
   end

data/spec/mongo/operation/{read/get_more_spec.rb → get_more_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Read::GetMore do
+describe Mongo::Operation::GetMore::Legacy do
 
   let(:to_return) do
     50
@@ -46,8 +46,8 @@ describe Mongo::Operation::Read::GetMore do
   describe '#message' do
 
     it 'creates a get more wire protocol message with correct specs' do
-      expect(Mongo::Protocol::GetMore).to receive(:new).with(TEST_DB, TEST_COLL, to_return, cursor_id)
-      op.send(:message, authorized_primary)
+      expect(Mongo::Protocol::GetMore).to receive(:new).with(TEST_DB, TEST_COLL, to_return, cursor_id).and_call_original
+      begin; op.execute(authorized_primary); rescue; end
     end
   end
 end

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

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Commands::Indexes do
+describe Mongo::Operation::Indexes do
 
   describe '#execute' do
 
-    let(:spec) do
+    let(:index_spec) do
       { name: 1 }
     end
 
     before do
-      authorized_collection.indexes.create_one(spec, unique: true)
+      authorized_collection.indexes.create_one(index_spec, unique: true)
     end
 
     after do
@@ -17,7 +17,9 @@ describe Mongo::Operation::Commands::Indexes do
     end
 
     let(:operation) do
-      described_class.new(db_name: TEST_DB, coll_name: TEST_COLL)
+      described_class.new({ selector: { listIndexes: TEST_COLL },
+                            coll_name: TEST_COLL,
+                            db_name: TEST_DB })
     end
 
     let(:indexes) do

data/spec/mongo/operation/{write/bulk/insert_spec.rb → insert/bulk_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::Bulk::Insert do
+describe Mongo::Operation::Insert do
 
   let(:documents) do
     [{ :name => 'test' }]
@@ -87,7 +87,7 @@ describe Mongo::Operation::Write::Bulk::Insert do
       end
 
       let(:inserted_ids) do
-        op.execute(authorized_primary).inserted_ids
+        op.bulk_execute(authorized_primary).inserted_ids
       end
 
       let(:collection_ids) do
@@ -100,7 +100,7 @@ describe Mongo::Operation::Write::Bulk::Insert do
     end
   end
 
-  describe '#execute' do
+  describe '#bulk_execute' do
 
     before do
       authorized_collection.indexes.create_one({ name: 1 }, { unique: true })
@@ -116,7 +116,7 @@ describe Mongo::Operation::Write::Bulk::Insert do
       context 'when the insert succeeds' do
 
         let(:response) do
-          op.execute(authorized_primary)
+          op.bulk_execute(authorized_primary)
         end
 
         it 'inserts the documents into the database' do
@@ -134,7 +134,7 @@ describe Mongo::Operation::Write::Bulk::Insert do
         end
 
         let(:response) do
-          op.execute(authorized_primary)
+          op.bulk_execute(authorized_primary)
         end
 
         it 'inserts the documents into the database' do
@@ -171,7 +171,7 @@ describe Mongo::Operation::Write::Bulk::Insert do
         context 'when the insert fails' do
     
           it 'aborts after first error' do
-            failing_insert.execute(authorized_primary)
+            failing_insert.bulk_execute(authorized_primary)
             expect(authorized_collection.find.count).to eq(1)
           end
         end
@@ -186,7 +186,7 @@ describe Mongo::Operation::Write::Bulk::Insert do
         context 'when the insert fails' do
 
           it 'aborts after first error' do
-            failing_insert.execute(authorized_primary)
+            failing_insert.bulk_execute(authorized_primary)
             expect(authorized_collection.find.count).to eq(1)
           end
         end
@@ -217,7 +217,7 @@ describe Mongo::Operation::Write::Bulk::Insert do
         context 'when the insert fails' do
     
           it 'does not abort after first error' do
-            failing_insert.execute(authorized_primary)
+            failing_insert.bulk_execute(authorized_primary)
             expect(authorized_collection.find.count).to eq(2)
           end
         end
@@ -232,7 +232,7 @@ describe Mongo::Operation::Write::Bulk::Insert do
         context 'when the insert fails' do
 
           it 'does not after first error' do
-            failing_insert.execute(authorized_primary)
+            failing_insert.bulk_execute(authorized_primary)
             expect(authorized_collection.find.count).to eq(2)
           end
         end

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

@@ -0,0 +1,110 @@
+require 'spec_helper'
+
+describe Mongo::Operation::Insert::Command 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,
+      :session       => session
+    }
+  end
+
+  let(:write_concern) do
+    Mongo::WriteConcern.get(WRITE_CONCERN)
+  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_documents) { [{ :bar => 1 }] }
+        let(:other_spec) do
+          { :documents     => other_documents,
+            :db_name       => authorized_collection.database.name,
+            :insert        => authorized_collection.name,
+            :write_concern => write_concern.options,
+            :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
+        { :documents     => documents,
+          :db_name       => authorized_collection.database.name,
+          :coll_name     => authorized_collection.name,
+          :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
+        { :documents     => documents,
+          :insert        => authorized_collection.name,
+          :writeConcern => write_concern.options,
+          :ordered       => true
+        }
+      end
+
+      it 'creates a query wire protocol message with correct specs', unless: op_msg_enabled? do
+        expect(Mongo::Protocol::Query).to receive(:new).with(authorized_collection.database.name,
+                                                             '$cmd',
+                                                             expected_selector,
+                                                             { limit: -1, validating_keys: true })
+        op.send(:message, authorized_primary)
+      end
+    end
+  end
+end

data/spec/mongo/operation/{write/command/insert_spec.rb → insert/op_msg_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::Command::Insert do
+describe Mongo::Operation::Insert::OpMsg do
 
   let(:documents) { [{ :_id => 1, :foo => 1 }] }
   let(:session) { nil }
@@ -74,14 +74,14 @@ describe Mongo::Operation::Write::Command::Insert 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
@@ -91,7 +91,7 @@ describe Mongo::Operation::Write::Command::Insert do
     context 'when the server supports OP_MSG', if: op_msg_enabled? do
 
       let(:documents) do
-        [ { foo: 1}, { bar: 2 }]
+        [ { foo: 1 }, { bar: 2 }]
       end
 
       let(:global_args) do
@@ -104,11 +104,11 @@ describe Mongo::Operation::Write::Command::Insert do
         }
       end
 
-      let(:expected_payload_1) do
+      let!(:expected_payload_1) do
         {
             type: 1,
             payload: { identifier: 'documents',
-                       sequence: documents
+                       sequence: op.documents
             }
         }
       end
@@ -117,7 +117,7 @@ describe Mongo::Operation::Write::Command::Insert 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)
@@ -133,7 +133,7 @@ describe Mongo::Operation::Write::Command::Insert 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
@@ -177,31 +177,60 @@ describe Mongo::Operation::Write::Command::Insert 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],
-                                                               { validating_keys: true },
-                                                               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],
+                                                                 { validating_keys: true },
+                                                                 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],
+                                                                 { validating_keys: true },
+                                                                 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],
                                                                { validating_keys: true },
@@ -212,24 +241,5 @@ describe Mongo::Operation::Write::Command::Insert do
         end
       end
     end
-
-    context 'when the server does not support OP_MSG' do
-
-      let(:expected_selector) do
-        { :documents     => documents,
-          :insert        => authorized_collection.name,
-          :writeConcern => write_concern.options,
-          :ordered       => true
-        }
-      end
-
-      it 'creates a query wire protocol message with correct specs', unless: op_msg_enabled? do
-        expect(Mongo::Protocol::Query).to receive(:new).with(authorized_collection.database.name,
-                                                             '$cmd',
-                                                             expected_selector,
-                                                             { limit: -1, validating_keys: true })
-        op.send(:message, authorized_primary)
-      end
-    end
   end
 end

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::Insert do
+describe Mongo::Operation::Insert do
 
   let(:documents) do
     [{ '_id' => 1,
@@ -268,7 +268,7 @@ describe Mongo::Operation::Write::Insert do
       end
 
       before do
-        expect(op).to receive(:execute_message).and_call_original
+        expect(Mongo::Operation::Insert::Legacy).to receive(:new).and_call_original
       end
 
       let(:response) do

data/spec/mongo/operation/kill_cursors_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::KillCursors do
+describe Mongo::Operation::KillCursors::Legacy do
 
   let(:spec) do
     { coll_name: TEST_COLL,
@@ -35,7 +35,7 @@ describe Mongo::Operation::KillCursors do
 
     it 'creates a kill cursors wire protocol message with correct specs' do
       expect(Mongo::Protocol::KillCursors).to receive(:new).with(TEST_COLL, TEST_DB, spec[:cursor_ids])
-      op.send(:message, authorized_primary)
+      op.send(:message, double('server'))
     end
   end
 end