mongo 2.2.7 → 2.3.0

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

@@ -1,16 +1,19 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Write::Bulk::Insert do
-  include_context 'operation'
 
   let(:documents) do
     [{ :name => 'test' }]
   end
 
+  let(:write_concern) do
+    Mongo::WriteConcern.get(WRITE_CONCERN)
+  end
+
   let(:spec) do
     { documents: documents,
-      db_name: db_name,
-      coll_name: coll_name,
+      db_name: authorized_collection.database.name,
+      coll_name: authorized_collection.name,
       write_concern: write_concern
     }
   end
@@ -84,7 +87,7 @@ describe Mongo::Operation::Write::Bulk::Insert do
       end
 
       let(:inserted_ids) do
-        op.execute(authorized_primary.context).inserted_ids
+        op.execute(authorized_primary).inserted_ids
       end
 
       let(:collection_ids) do
@@ -113,7 +116,7 @@ describe Mongo::Operation::Write::Bulk::Insert do
       context 'when the insert succeeds' do
 
         let(:response) do
-          op.execute(authorized_primary.context)
+          op.execute(authorized_primary)
         end
 
         it 'inserts the documents into the database', if: write_command_enabled? do
@@ -135,7 +138,7 @@ describe Mongo::Operation::Write::Bulk::Insert do
         end
 
         let(:response) do
-          op.execute(authorized_primary.context)
+          op.execute(authorized_primary)
         end
 
         it 'inserts the documents into the database', if: write_command_enabled? do
@@ -156,8 +159,8 @@ describe Mongo::Operation::Write::Bulk::Insert do
 
       let(:spec) do
         { documents: documents,
-          db_name: db_name,
-          coll_name: coll_name,
+          db_name: authorized_collection.database.name,
+          coll_name: authorized_collection.name,
           write_concern: write_concern,
           ordered: true
         }
@@ -176,7 +179,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.context)
+            failing_insert.execute(authorized_primary)
             expect(authorized_collection.find.count).to eq(1)
           end
         end
@@ -191,7 +194,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.context)
+            failing_insert.execute(authorized_primary)
             expect(authorized_collection.find.count).to eq(1)
           end
         end
@@ -206,8 +209,8 @@ describe Mongo::Operation::Write::Bulk::Insert do
 
       let(:spec) do
         { documents: documents,
-          db_name: db_name,
-          coll_name: coll_name,
+          db_name: authorized_collection.database.name,
+          coll_name: authorized_collection.name,
           write_concern: write_concern,
           ordered: false
         }
@@ -219,14 +222,10 @@ describe Mongo::Operation::Write::Bulk::Insert do
 
       context 'when write concern is acknowledged' do
 
-        let(:write_concern) do
-          Mongo::WriteConcern.get(w: 1)
-        end
-
         context 'when the insert fails' do
     
           it 'does not abort after first error' do
-            failing_insert.execute(authorized_primary.context)
+            failing_insert.execute(authorized_primary)
             expect(authorized_collection.find.count).to eq(2)
           end
         end
@@ -241,7 +240,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.context)
+            failing_insert.execute(authorized_primary)
             expect(authorized_collection.find.count).to eq(2)
           end
         end

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

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Write::Bulk::Update do
-  include_context 'operation'
 
   let(:documents) do
     [{ :q => { :foo => 1 },
@@ -12,13 +11,17 @@ describe Mongo::Operation::Write::Bulk::Update do
 
   let(:spec) do
     { updates: documents,
-      db_name: db_name,
-      coll_name: coll_name,
+      db_name: authorized_collection.database.name,
+      coll_name: authorized_collection.name,
       write_concern: write_concern,
       ordered: true
     }
   end
 
+  let(:write_concern) do
+    Mongo::WriteConcern.get(WRITE_CONCERN)
+  end
+
   let(:op) do
     described_class.new(spec)
   end
@@ -56,8 +59,8 @@ describe Mongo::Operation::Write::Bulk::Update do
 
         let(:other_spec) do
           { updates: other_docs,
-            db_name: db_name,
-            coll_name: coll_name,
+            db_name: authorized_collection.database.name,
+            coll_name: authorized_collection.name,
             write_concern: write_concern,
             ordered: true
           }
@@ -94,7 +97,7 @@ describe Mongo::Operation::Write::Bulk::Update do
         end
 
         it 'updates the document' do
-          op.execute(authorized_primary.context)
+          op.execute(authorized_primary)
           expect(authorized_collection.find(field: 'blah').count).to eq(1)
         end
       end
@@ -105,8 +108,8 @@ describe Mongo::Operation::Write::Bulk::Update do
       let(:update) do
         described_class.new({
           updates: documents,
-          db_name: db_name,
-          coll_name: coll_name,
+          db_name: authorized_collection.database.name,
+          coll_name: authorized_collection.name,
           write_concern: write_concern
         })
       end
@@ -118,7 +121,7 @@ describe Mongo::Operation::Write::Bulk::Update do
         end
 
         it 'updates the documents' do
-          op.execute(authorized_primary.context)
+          op.execute(authorized_primary)
           expect(authorized_collection.find(field: 'blah').count).to eq(2)
         end
       end
@@ -134,8 +137,8 @@ describe Mongo::Operation::Write::Bulk::Update do
 
       let(:spec) do
         { updates: documents,
-          db_name: db_name,
-          coll_name: coll_name,
+          db_name: authorized_collection.database.name,
+          coll_name: authorized_collection.name,
           write_concern: write_concern,
           ordered: true
         }
@@ -149,12 +152,8 @@ describe Mongo::Operation::Write::Bulk::Update do
 
         context 'when write concern is acknowledged' do
 
-          let(:write_concern) do
-            Mongo::WriteConcern.get(w: 1)
-          end
-
           it 'aborts after first error' do
-            failing_update.execute(authorized_primary.context)
+            failing_update.execute(authorized_primary)
             expect(authorized_collection.find(other: 'blah').count).to eq(0)
           end
         end
@@ -166,7 +165,7 @@ describe Mongo::Operation::Write::Bulk::Update do
           end
 
           it 'aborts after first error' do
-            failing_update.execute(authorized_primary.context)
+            failing_update.execute(authorized_primary)
             expect(authorized_collection.find(other: 'blah').count).to eq(0)
           end
         end
@@ -183,8 +182,8 @@ describe Mongo::Operation::Write::Bulk::Update do
 
       let(:spec) do
         { updates: documents,
-          db_name: db_name,
-          coll_name: coll_name,
+          db_name: authorized_collection.database.name,
+          coll_name: authorized_collection.name,
           write_concern: write_concern,
           ordered: false
         }
@@ -198,12 +197,8 @@ describe Mongo::Operation::Write::Bulk::Update do
 
         context 'when write concern is acknowledged' do
 
-          let(:write_concern) do
-            Mongo::WriteConcern.get(w: 1)
-          end
-
           it 'does not abort after first error' do
-            failing_update.execute(authorized_primary.context)
+            failing_update.execute(authorized_primary)
             expect(authorized_collection.find(other: 'blah').count).to eq(1)
           end
         end
@@ -215,7 +210,7 @@ describe Mongo::Operation::Write::Bulk::Update do
           end
 
           it 'does not abort after first error' do
-            failing_update.execute(authorized_primary.context)
+            failing_update.execute(authorized_primary)
             expect(authorized_collection.find(other: 'blah').count).to eq(1)
           end
         end

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

@@ -1,13 +1,16 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Write::Command::Delete do
-  include_context 'operation'
+
+  let(:write_concern) do
+    Mongo::WriteConcern.get(WRITE_CONCERN)
+  end
 
   let(:deletes) { [{:q => { :foo => 1 }, :limit => 1}] }
   let(:spec) do
     { :deletes       => deletes,
-      :db_name       => db_name,
-      :coll_name     => coll_name,
+      :db_name       => authorized_collection.database.name,
+      :coll_name     => authorized_collection.name,
       :write_concern => write_concern,
       :ordered       => true
     }
@@ -41,9 +44,9 @@ describe Mongo::Operation::Write::Command::Delete do
         let(:other_deletes) { [{:q => { :bar => 1 }, :limit => 1}] }
         let(:other_spec) do
           { :deletes       => other_deletes,
-            :db_name       => db_name,
-            :coll_name     => coll_name,
-            :write_concern => write_concern.options,
+            :db_name       => authorized_collection.database.name,
+            :coll_name     => authorized_collection.name,
+            :write_concern => write_concern,
             :ordered       => true
           }
         end
@@ -62,8 +65,8 @@ describe Mongo::Operation::Write::Command::Delete do
 
       let(:spec) do
         { :deletes       => deletes,
-          :db_name       => db_name,
-          :coll_name     => coll_name,
+          :db_name       => authorized_collection.database.name,
+          :coll_name     => authorized_collection.name,
           :ordered       => true
         }
       end
@@ -81,32 +84,23 @@ describe Mongo::Operation::Write::Command::Delete do
     end
   end
 
-  describe '#execute' do
-
-    context 'server' do
+  describe '#message' do
 
-      context 'message' do
-        let(:expected_selector) do
-          { :deletes       => deletes,
-            :delete        => coll_name,
-            :writeConcern => write_concern.options,
-            :ordered       => true
-          }
-        end
+    let(:expected_selector) do
+      {
+        :delete        => authorized_collection.name,
+        :deletes       => deletes,
+        :writeConcern => write_concern.options,
+        :ordered       => true
+      }
+    end
 
-        it 'creates a query wire protocol message with correct specs' do
-          allow_any_instance_of(Mongo::ServerSelector::Primary).to receive(:server) do
-            primary_server
-          end
-
-          expect(Mongo::Protocol::Query).to receive(:new) do |db, coll, sel, options|
-            expect(db).to eq(db_name)
-            expect(coll).to eq(Mongo::Database::COMMAND)
-            expect(sel).to eq(expected_selector)
-          end
-          op.execute(primary_context)
-        end
-      end
+    it 'creates the correct query wire protocol message' do
+      expect(Mongo::Protocol::Query).to receive(:new).with(authorized_collection.database.name,
+                                                           '$cmd',
+                                                           expected_selector,
+                                                           { limit: -1 } )
+      op.send(:message)
     end
   end
 end

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

@@ -1,18 +1,21 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Write::Command::Insert do
-  include_context 'operation'
 
   let(:documents) { [{ :_id => 1, :foo => 1 }] }
   let(:spec) do
     { :documents     => documents,
-      :db_name       => db_name,
-      :coll_name     => coll_name,
+      :db_name       => authorized_collection.database.name,
+      :coll_name     => authorized_collection.name,
       :write_concern => write_concern,
       :ordered       => true
     }
   end
 
+  let(:write_concern) do
+    Mongo::WriteConcern.get(WRITE_CONCERN)
+  end
+
   let(:op) { described_class.new(spec) }
 
   describe '#initialize' do
@@ -41,8 +44,8 @@ describe Mongo::Operation::Write::Command::Insert do
         let(:other_documents) { [{ :bar => 1 }] }
         let(:other_spec) do
           { :documents     => other_documents,
-            :db_name       => db_name,
-            :insert        => coll_name,
+            :db_name       => authorized_collection.database.name,
+            :insert        => authorized_collection.name,
             :write_concern => write_concern.options,
             :ordered       => true
           }
@@ -62,8 +65,8 @@ describe Mongo::Operation::Write::Command::Insert do
 
       let(:spec) do
         { :documents     => documents,
-          :db_name       => db_name,
-          :coll_name     => coll_name,
+          :db_name       => authorized_collection.database.name,
+          :coll_name     => authorized_collection.name,
           :ordered       => true
         }
       end
@@ -81,32 +84,22 @@ describe Mongo::Operation::Write::Command::Insert do
     end
   end
 
-  describe '#execute' do
-
-    context 'server' do
+  describe '#message' do
 
-      context 'message' do
-        let(:expected_selector) do
-          { :documents     => documents,
-            :insert        => coll_name,
-            :writeConcern => write_concern.options,
-            :ordered       => true
-          }
-        end
+    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' do
-          allow_any_instance_of(Mongo::ServerSelector::Primary).to receive(:server) do
-            primary_server
-          end
-
-          expect(Mongo::Protocol::Query).to receive(:new) do |db, coll, sel, options|
-            expect(db).to eq(db_name)
-            expect(coll).to eq(Mongo::Database::COMMAND)
-            expect(sel).to eq(expected_selector)
-          end
-          op.execute(primary_context)
-        end
-      end
+    it 'creates a query wire protocol message with correct specs' do
+      expect(Mongo::Protocol::Query).to receive(:new).with(authorized_collection.database.name,
+                                                           '$cmd',
+                                                            expected_selector,
+                                                            { limit: -1, validating_keys: true })
+      op.send(:message)
     end
   end
 end

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

@@ -1,16 +1,20 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Write::Command::Update do
-  include_context 'operation'
 
   let(:updates) { [{:q => { :foo => 1 },
                     :u => { :$set => { :bar => 1 } },
                     :multi => true,
                     :upsert => false }] }
+
+  let(:write_concern) do
+    Mongo::WriteConcern.get(WRITE_CONCERN)
+  end
+
   let(:spec) do
     { :updates       => updates,
-      :db_name       => db_name,
-      :coll_name     => coll_name,
+      :db_name       => TEST_DB,
+      :coll_name     => TEST_COLL,
       :write_concern => write_concern,
       :ordered       => true
     }
@@ -47,9 +51,9 @@ describe Mongo::Operation::Write::Command::Update do
                           :upsert => false }] }
         let(:other_spec) do
           { :updates       => other_updates,
-            :db_name       => db_name,
-            :coll_name     => coll_name,
-            :write_concern => write_concern.options,
+            :db_name       => TEST_DB,
+            :coll_name     => TEST_COLL,
+            :write_concern => Mongo::WriteConcern.get(WRITE_CONCERN),
             :ordered       => true
           }
         end
@@ -68,8 +72,8 @@ describe Mongo::Operation::Write::Command::Update do
 
       let(:spec) do
         { :updates       => updates,
-          :db_name       => db_name,
-          :coll_name     => coll_name,
+          :db_name       => TEST_DB,
+          :coll_name     => TEST_COLL,
           :ordered       => true
         }
       end
@@ -87,32 +91,20 @@ describe Mongo::Operation::Write::Command::Update do
     end
   end
 
-  describe '#execute' do
+  describe '#message' do
 
-    context 'server' do
-
-      context 'message' do
-        let(:expected_selector) do
-          { :updates       => updates,
-            :update        => coll_name,
-            :writeConcern => write_concern.options,
-            :ordered       => true
-          }
-        end
+    let(:expected_selector) do
+      {
+        :update        => TEST_COLL,
+        :updates       => updates,
+        :ordered       => true,
+        :writeConcern   => write_concern.options
+      }
+    end
 
-        it 'creates a query wire protocol message with correct specs' do
-          allow_any_instance_of(Mongo::ServerSelector::Primary).to receive(:server) do
-            primary_server
-          end
-
-          expect(Mongo::Protocol::Query).to receive(:new) do |db, coll, sel, options|
-            expect(db).to eq(db_name)
-            expect(coll).to eq(Mongo::Database::COMMAND)
-            expect(sel).to eq(expected_selector)
-          end
-          op.execute(primary_context)
-        end
-      end
+    it 'creates the correct Command message' do
+      expect(Mongo::Protocol::Query).to receive(:new).with(TEST_DB, '$cmd', expected_selector, { limit: -1 })
+      op.send(:message)
     end
   end
 end