mongo 2.0.0.beta → 2.0.0.rc

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

@@ -83,263 +83,6 @@ describe Mongo::Operation::Write::BulkUpdate do
     end
   end
 
-  describe '#write_concern' do
-
-    let(:other_write_concern) do
-      { w: 2 }
-    end
-
-    context 'when the write concern is set' do
-
-      it 'sets the write concern' do
-        new_op = op.write_concern(other_write_concern)
-        expect(new_op.write_concern.options).to eq(other_write_concern)
-      end
-    end
-  end
-
-  describe '#batch' do
-
-    context 'when number of updates is evenly divisible by number of batches' do
-      let(:documents) do
-        [{ q: { a: 1 },
-           u: { :$set => { a: 2 } },
-           multi: true,
-           upsert: false },
-         { q: { b: 1 },
-           u: { :$set => { b: 2 } },
-           multi: true,
-           upsert: false },
-         { q: { c: 1 },
-           u: { :$set => { c: 2 } },
-           multi:  true,
-           upsert: false },
-         { q: { d: 1 },
-           u: { :$set => { d: 2 } },
-           multi: true,
-           upsert: false },
-         { q: { e: 1 },
-           u: { :$set => { e: 2 } },
-           multi: true,
-           upsert: false },
-         { q: { f: 1 },
-           u: { :$set => { f: 2 } },
-           multi:  true,
-           upsert: false }
-        ]
-      end
-
-      let(:n_batches) { 3 }
-
-      it 'splits the op into the n_batches number of children ops' do
-        expect(op.batch(n_batches).size).to eq(n_batches)
-      end
-
-      it 'divides the updates evenly between children ops' do
-        ops = op.batch(n_batches)
-        batch_size = documents.size / n_batches
-
-        n_batches.times do |i|
-          start_index = i * batch_size
-          expect(ops[i].spec[:updates]).to eq(documents[start_index, batch_size])
-        end
-      end
-    end
-
-    context 'when number of updates is less than number of batches' do
-      let(:documents) do
-        [ { q: { a: 1 },
-            u: { :$set => { a: 2 } } } ]
-      end
-      let(:n_batches) { 3 }
-
-      it 'raises an exception' do
-        expect {
-            op.batch(n_batches)
-          }.to raise_error(Exception)
-      end
-    end
-
-    context 'when number of updates is not evenly divisible by number of batches' do
-      let(:documents) do
-        [{ q: { a: 1 },
-           u: { :$set => { a: 2 } },
-           multi: true,
-           upsert: false },
-         { q: { b: 1 },
-           u: { :$set => { b: 2 } },
-           multi: true,
-           upsert: false },
-         { q: { c: 1 },
-           u: { :$set => { c: 2 } },
-           multi:  true,
-           upsert: false },
-         { q: { d: 1 },
-           u: { :$set => { d: 2 } },
-           multi: true,
-           upsert: false },
-         { q: { e: 1 },
-           u: { :$set => { e: 2 } },
-           multi: true,
-           upsert: false },
-         { q: { f: 1 },
-           u: { :$set => { f: 2 } },
-           multi:  true,
-           upsert: false }
-        ]
-      end
-      let(:n_batches) { 4 }
-
-      it 'splits the op into the n_batches number of children ops' do
-        expect(op.batch(n_batches).size).to eq(n_batches)
-      end
-
-      it 'divides the updates evenly between children ops' do
-        ops = op.batch(n_batches)
-        batch_size = documents.size / n_batches
-
-        n_batches.times do |i|
-          start_index = i * batch_size
-          if i == n_batches - 1
-            expect(ops[i].spec[:updates]).to eq(documents[start_index..-1])
-          else
-            expect(ops[i].spec[:updates]).to eq(documents[start_index, batch_size])
-          end
-        end
-      end
-    end
-  end
-
-  describe '#merge!' do
-
-    context 'same collection and database' do
-
-      let(:other_docs) do
-        [ { q: { foo: 1 },
-            u: { :$set => { bar: 1 } },
-            multi: true,
-            upsert: true } ]
-      end
-
-      let(:other_spec) do
-        { updates: other_docs,
-          db_name: db_name,
-          coll_name: coll_name
-        }
-      end
-
-      let(:other) { described_class.new(other_spec) }
-
-      it 'merges the two ops' do
-        expect{ op.merge!(other) }.not_to raise_exception
-      end
-    end
-
-    context 'different database' do
-
-      let(:other_docs) do
-        [ { q: { :foo => 1 },
-            u: { :$set => { bar: 1 } },
-            multi: true,
-            upsert: true } ]
-      end
-
-      let(:other_spec) do
-        { updates: other_docs,
-          db_name: 'different',
-          coll_name: coll_name
-        }
-      end
-
-      let(:other) { described_class.new(other_spec) }
-
-      it 'raises an exception' do
-        expect{ op.merge!(other) }.to raise_exception
-      end
-    end
-
-    context 'different collection' do
-
-      let(:other_docs) do
-        [ { q: { foo: 1 },
-            u: { :$set => { bar: 1 } },
-            multi: true,
-            upsert: true } ]
-      end
-
-      let(:other_spec) do
-        { updates: other_docs,
-          db_name: db_name,
-          coll_name: 'different'
-        }
-      end
-
-      let(:other) { described_class.new(other_spec) }
-
-      it 'raises an exception' do
-        expect{ op.merge!(other) }.to raise_exception
-      end
-    end
-
-    context 'different operation type' do
-      let(:other) { Mongo::Write::Insert.new(spec) }
-
-      it 'raises an exception' do
-        expect{ op.merge!(other) }.to raise_exception
-      end
-    end
-
-    context 'merged updates' do
-
-      let(:other_docs) do
-        [ { q: { foo: 1 },
-            u: { :$set => { bar: 1 } },
-            multi: true,
-            upsert: true } ]
-      end
-
-      let(:other_spec) do
-        { updates: other_docs,
-          db_name: db_name,
-          coll_name: coll_name
-        }
-      end
-
-      let(:other) { described_class.new(other_spec) }
-
-      let(:expected) do
-        documents + other_docs
-      end
-
-      it 'merges the list of updates' do
-        expect(op.merge!(other).spec[:updates]).to eq(expected)
-      end
-    end
-
-    context 'mutability' do
-
-      let(:other_docs) do
-        [ { q: { foo: 1 },
-            u: { :$set => { bar: 1 } },
-            multi: true,
-            upsert: true } ]
-      end
-
-      let(:other_spec) do
-        { updates: other_docs,
-          db_name: db_name,
-          coll_name: coll_name
-        }
-      end
-
-      let(:other) { described_class.new(other_spec) }
-
-      it 'mutates the operation itself' do
-        expect(op.merge!(other)).to be(op)
-      end
-    end
-  end
-
   describe '#execute' do
 
     before do
@@ -350,7 +93,7 @@ describe Mongo::Operation::Write::BulkUpdate do
     end
 
     after do
-      authorized_collection.find.remove_many
+      authorized_collection.find.delete_many
     end
 
     context 'when updating a single document' do
@@ -489,36 +232,5 @@ describe Mongo::Operation::Write::BulkUpdate do
         end
       end
     end
-
-    context 'when a write concern override is specified' do
-
-      let(:op) do
-        described_class.new({
-          updates: documents,
-          db_name: db_name,
-          coll_name: coll_name,
-          write_concern: Mongo::WriteConcern.get(w: 1),
-          ordered: false
-        })
-      end
-
-      let(:documents) do
-        [ { q: { name: 'test' }, u: { '$st' => { field: 'blah' }}, multi: true} ]
-      end
-
-      let(:unacknowledged) do
-        { w: 0 }
-      end
-
-      it 'uses that write concern', if: write_command_enabled? do
-        result = op.write_concern(unacknowledged).execute(authorized_primary.context)
-        expect(result.replies.size).to eq(1)
-      end
-
-      it 'uses that write concern', unless: write_command_enabled? do
-        result = op.write_concern(unacknowledged).execute(authorized_primary.context)
-        expect(result.replies).to be(nil)
-      end
-    end
   end
 end

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

@@ -98,19 +98,6 @@ describe Mongo::Operation::Write::Command::Delete do
           op.execute(primary_context)
         end
       end
-
-      context 'write concern' do
-
-        context 'w == 0' do
-
-          pending 'no response is returned'
-        end
-
-        context 'w > 0' do
-
-          pending 'returns a response'
-        end
-      end
     end
   end
 end

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

@@ -98,20 +98,6 @@ describe Mongo::Operation::Write::Command::Insert do
           op.execute(primary_context)
         end
       end
-
-      context 'write concern' do
-
-        context 'w == 0' do
-
-          pending 'no response is returned'
-        end
-
-        context 'w > 0' do
-
-          pending 'returns a response'
-        end
-      end
     end
   end
 end
-

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

@@ -104,20 +104,6 @@ describe Mongo::Operation::Write::Command::Update do
           op.execute(primary_context)
         end
       end
-
-      context 'write concern' do
-
-        context 'w == 0' do
-
-          pending 'no response is returned'
-        end
-
-        context 'w > 0' do
-
-          pending 'returns a response'
-        end
-      end
     end
   end
 end
-

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

@@ -1,23 +1,17 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::EnsureIndex do
+describe Mongo::Operation::Write::CreateIndex do
 
   describe '#execute' do
 
     context 'when the index is created' do
 
       let(:spec) do
-        { random: 1 }
+        { key: { random: 1 }, name: 'random_1', unique: true }
       end
 
       let(:operation) do
-        described_class.new(
-          index: spec,
-          db_name: TEST_DB,
-          coll_name: TEST_COLL,
-          index_name: 'random_1',
-          options: { unique: true }
-        )
+        described_class.new(indexes: [ spec ], db_name: TEST_DB, coll_name: TEST_COLL)
       end
 
       let(:response) do
@@ -25,7 +19,7 @@ describe Mongo::Operation::Write::EnsureIndex do
       end
 
       after do
-        authorized_collection.indexes.drop(spec)
+        authorized_collection.indexes.drop_one('random_1')
       end
 
       it 'returns ok' do
@@ -36,27 +30,15 @@ describe Mongo::Operation::Write::EnsureIndex do
     context 'when index creation fails' do
 
       let(:spec) do
-        { random: 1 }
+        { key: { random: 1 }, name: 'random_1', unique: true }
       end
 
       let(:operation) do
-        described_class.new(
-          index: spec,
-          db_name: TEST_DB,
-          coll_name: TEST_COLL,
-          index_name: 'random_1',
-          options: { unique: true }
-        )
+        described_class.new(indexes: [ spec ], db_name: TEST_DB, coll_name: TEST_COLL)
       end
 
       let(:second_operation) do
-        described_class.new(
-          index: spec,
-          db_name: TEST_DB,
-          coll_name: TEST_COLL,
-          index_name: 'random_1',
-          options: { unique: false }
-        )
+        described_class.new(indexes: [ spec.merge(unique: false) ], db_name: TEST_DB, coll_name: TEST_COLL)
       end
 
       before do
@@ -64,7 +46,7 @@ describe Mongo::Operation::Write::EnsureIndex do
       end
 
       after do
-        authorized_collection.indexes.drop(spec)
+        authorized_collection.indexes.drop_one('random_1')
       end
 
       it 'raises an exception', if: write_command_enabled? do

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

@@ -72,7 +72,7 @@ describe Mongo::Operation::Write::Delete do
     end
 
     after do
-      authorized_collection.find.remove_many
+      authorized_collection.find.delete_many
     end
 
     context 'when deleting a single document' do