mongo 2.9.2 → 2.10.0.rc0

data/spec/mongo/uri_spec.rb

@@ -262,6 +262,19 @@ describe Mongo::URI do
       end
     end
 
+    context 'options start with ampersand' do
+
+      let(:string) { 'mongodb://example.com/?&appName=foo' }
+
+      it 'returns a Mongo::URI object' do
+        expect(uri).to be_a(Mongo::URI)
+      end
+
+      it 'parses the options' do
+        expect(uri.uri_options[:app_name]).to eq('foo')
+      end
+    end
+
     context 'mongodb://alice:foo:bar@127.0.0.1' do
 
       let(:string) { 'mongodb://alice:foo:bar@127.0.0.1' }
@@ -444,12 +457,12 @@ describe Mongo::URI do
         let(:concern) { Mongo::Options::Redacted.new(:w => 1)}
 
         it 'sets the write concern options' do
-          expect(uri.uri_options[:write]).to eq(concern)
+          expect(uri.uri_options[:write_concern]).to eq(concern)
         end
 
         it 'sets the options on a client created with the uri' do
           client = new_local_client_nmio(string)
-          expect(client.options[:write]).to eq(concern)
+          expect(client.options[:write_concern]).to eq(concern)
         end
       end
 
@@ -458,12 +471,12 @@ describe Mongo::URI do
         let(:concern) { Mongo::Options::Redacted.new(:w => :majority) }
 
         it 'sets the write concern options' do
-          expect(uri.uri_options[:write]).to eq(concern)
+          expect(uri.uri_options[:write_concern]).to eq(concern)
         end
 
         it 'sets the options on a client created with the uri' do
           client = new_local_client_nmio(string)
-          expect(client.options[:write]).to eq(concern)
+          expect(client.options[:write_concern]).to eq(concern)
         end
       end
 
@@ -472,12 +485,12 @@ describe Mongo::URI do
         let(:concern) { Mongo::Options::Redacted.new(:j => true) }
 
         it 'sets the write concern options' do
-          expect(uri.uri_options[:write]).to eq(concern)
+          expect(uri.uri_options[:write_concern]).to eq(concern)
         end
 
         it 'sets the options on a client created with the uri' do
           client = new_local_client_nmio(string)
-          expect(client.options[:write]).to eq(concern)
+          expect(client.options[:write_concern]).to eq(concern)
         end
       end
 
@@ -486,12 +499,12 @@ describe Mongo::URI do
         let(:concern) { Mongo::Options::Redacted.new(:fsync => true) }
 
         it 'sets the write concern options' do
-          expect(uri.uri_options[:write]).to eq(concern)
+          expect(uri.uri_options[:write_concern]).to eq(concern)
         end
 
         it 'sets the options on a client created with the uri' do
           client = new_local_client_nmio(string)
-          expect(client.options[:write]).to eq(concern)
+          expect(client.options[:write_concern]).to eq(concern)
         end
       end
 
@@ -501,12 +514,12 @@ describe Mongo::URI do
         let(:concern) { Mongo::Options::Redacted.new(:w => 2, :wtimeout => timeout) }
 
         it 'sets the write concern options' do
-          expect(uri.uri_options[:write]).to eq(concern)
+          expect(uri.uri_options[:write_concern]).to eq(concern)
         end
 
         it 'sets the options on a client created with the uri' do
           client = new_local_client_nmio(string)
-          expect(client.options[:write]).to eq(concern)
+          expect(client.options[:write_concern]).to eq(concern)
         end
       end
     end

data/spec/mongo/write_concern_spec.rb

@@ -4,6 +4,8 @@ describe Mongo::WriteConcern do
 
   describe '#get' do
 
+    let(:wc) { Mongo::WriteConcern.get(options) }
+
     context 'when no options are set' do
 
       let(:options) do
@@ -70,6 +72,19 @@ describe Mongo::WriteConcern do
               Mongo::WriteConcern.get(options)
             }.to raise_error(Mongo::Error::InvalidWriteConcern)
           end
+
+          context 'when j is given as a string' do
+
+            let(:options) do
+              { w: 0, 'j' => true }
+            end
+
+            it 'raises an exception' do
+              expect {
+                Mongo::WriteConcern.get(options)
+              }.to raise_error(Mongo::Error::InvalidWriteConcern)
+            end
+          end
         end
 
         context 'when fsync is true' do
@@ -114,7 +129,7 @@ describe Mongo::WriteConcern do
     context 'when w is greater than 0' do
 
       let(:options) do
-        { w: 2, journal: true }
+        { w: 2, j: true }
       end
 
       it 'returns an Acknowledged write concern object' do
@@ -129,7 +144,7 @@ describe Mongo::WriteConcern do
     context 'when w is a string' do
 
       let(:options) do
-        { w: 'majority', journal: true }
+        { w: 'majority', j: true }
       end
 
       it 'returns an Acknowledged write concern object' do
@@ -144,7 +159,7 @@ describe Mongo::WriteConcern do
     context 'when w is a symbol' do
 
       let(:options) do
-        { w: :majority, journal: true }
+        { w: :majority, j: true }
       end
 
       it 'returns an Acknowledged write concern object' do
@@ -155,5 +170,43 @@ describe Mongo::WriteConcern do
         expect(Mongo::WriteConcern.get(options).options[:w]).to eq('majority')
       end
     end
+
+    context 'when options are provided with string keys' do
+
+      context 'acknowledged write concern' do
+        let(:options) do
+          { 'w' => 2, 'j' => true }
+        end
+
+        it 'converts keys to symbols' do
+          expect(wc).to be_a(Mongo::WriteConcern::Acknowledged)
+          expect(wc.options[:w]).to eq(2)
+          expect(wc.options[:j]).to be true
+        end
+      end
+
+      context 'unacknowledged write concern' do
+        let(:options) do
+          { 'w' => 0 }
+        end
+
+        it 'converts keys to symbols' do
+          expect(wc).to be_a(Mongo::WriteConcern::Unacknowledged)
+          expect(wc.options[:w]).to eq(0)
+        end
+      end
+    end
+
+    context 'when :journal option is given' do
+      let(:options) do
+        { 'w' => 1, journal: true }
+      end
+
+      it 'raises an exception' do
+        expect do
+          wc
+        end.to raise_error(Mongo::Error::InvalidWriteConcern, /use :j for journal/)
+      end
+    end
   end
 end

data/spec/spec_tests/change_streams_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe 'ChangeStreams' do
+  require_wired_tiger
 
   CHANGE_STREAMS_TESTS.each do |file|
 
@@ -29,7 +30,7 @@ describe 'ChangeStreams' do
             expect(result[:result]).to match_result(test)
           end
 
-          it 'has the correct command_started events' do
+          it 'has the correct command_started events', if: test.expectations do
             expect(result[:events]).to match_commands(test)
           end
         end

data/spec/spec_tests/cmap_spec.rb

@@ -11,7 +11,7 @@ describe 'Cmap' do
     end
   end
 
-  CMAP_TESTS.sort.each do |file|
+  CMAP_TESTS.each do |file|
     spec = Mongo::Cmap::Spec.new(file)
 
     context("#{spec.description} (#{file.sub(%r'.*/data/cmap/', '')})") do

data/spec/spec_tests/crud_spec.rb

@@ -1,7 +1,17 @@
 require 'spec_helper'
 
-describe do
-  define_crud_spec_tests('CRUD spec tests', CRUD_TESTS.sort) do |spec, req, test|
+describe 'CRUD v1 spec tests' do
+  define_crud_spec_tests(CRUD_TESTS) do |spec, req, test|
     let(:client) { authorized_client }
   end
 end
+
+describe 'CRUD v2 spec tests' do
+  define_crud_spec_tests(CRUD2_TESTS) do |spec, req, test|
+    let(:client) do
+      authorized_client.tap do |client|
+        client.subscribe(Mongo::Monitoring::COMMAND, event_subscriber)
+      end
+    end
+  end
+end

data/spec/spec_tests/data/change_streams/change-streams-errors.yml

@@ -50,4 +50,27 @@ tests:
           database_name: *database_name
     result:
       error:
-        code: 40324
+        code: 40324
+  -
+    description: Change Stream should error when _id is projected out
+    minServerVersion: "4.1.11"
+    target: collection
+    topology:
+      - replicaset
+      - sharded
+    changeStreamPipeline:
+      -
+        $project: { _id: 0 }
+    changeStreamOptions: {}
+    operations:
+      -
+        database: *database_name
+        collection: *collection_name
+        name: insertOne
+        arguments:
+          document:
+            z: 3
+    result:
+      error:
+        code: 280
+        errorLabels: [ "NonResumableChangeStreamError" ]

data/spec/spec_tests/data/change_streams/change-streams.yml

@@ -20,19 +20,29 @@ tests:
           document:
             x: 1
     expectations:
-      - 
+      -
         command_started_event:
           command:
             aggregate: *collection_name
             cursor: {}
             pipeline:
-              - 
+              -
                 $changeStream:
                   fullDocument: default
           command_name: aggregate
           database_name: *database_name
     result:
-      success: []
+      success:
+        -
+          _id: "42"
+          documentKey: "42"
+          operationType: insert
+          ns:
+            db: *database_name
+            coll: *collection_name
+          fullDocument:
+            x:
+              $numberInt: "1"
   -
     description: The server returns change stream responses in the specified server response format
     minServerVersion: "3.6.0"
@@ -297,3 +307,162 @@ tests:
           fullDocument:
             z:
               $numberInt: "3"
+  -
+    description: Test insert, update, replace, and delete event types
+    minServerVersion: "3.6.0"
+    target: collection
+    topology:
+      - replicaset
+    changeStreamPipeline: []
+    changeStreamOptions: {}
+    operations:
+      -
+        database: *database_name
+        collection: *collection_name
+        name: insertOne
+        arguments:
+          document:
+            x: 1
+      -
+        database: *database_name
+        collection: *collection_name
+        name: updateOne
+        arguments:
+          filter:
+            x: 1
+          update:
+            $set:
+              x: 2
+      -
+        database: *database_name
+        collection: *collection_name
+        name: replaceOne
+        arguments:
+          filter:
+            x: 2
+          replacement:
+            x: 3
+      -
+        database: *database_name
+        collection: *collection_name
+        name: deleteOne
+        arguments:
+          filter:
+            x: 3
+    expectations:
+      -
+        command_started_event:
+          command:
+            aggregate: *collection_name
+            cursor: {}
+            pipeline:
+              -
+                $changeStream:
+                  fullDocument: default
+          command_name: aggregate
+          database_name: *database_name
+    result:
+      success:
+        -
+          operationType: insert
+          ns:
+            db: *database_name
+            coll: *collection_name
+          fullDocument:
+            x:
+              $numberInt: "1"
+        -
+          operationType: update
+          ns:
+            db: *database_name
+            coll: *collection_name
+          updateDescription:
+            updatedFields:
+              x:
+                $numberInt: "2"
+        -
+          operationType: replace
+          ns:
+            db: *database_name
+            coll: *collection_name
+          fullDocument:
+            x:
+              $numberInt: "3"
+        -
+          operationType: delete
+          ns:
+            db: *database_name
+            coll: *collection_name
+  -
+    description: Test rename and invalidate event types
+    minServerVersion: "4.0.1"
+    target: collection
+    topology:
+      - replicaset
+    changeStreamPipeline: []
+    changeStreamOptions: {}
+    operations:
+      -
+        database: *database_name
+        collection: *collection_name
+        name: rename
+        arguments:
+          to: *collection2_name
+    expectations:
+      -
+        command_started_event:
+          command:
+            aggregate: *collection_name
+            cursor: {}
+            pipeline:
+              -
+                $changeStream:
+                  fullDocument: default
+          command_name: aggregate
+          database_name: *database_name
+    result:
+      success:
+        -
+          operationType: rename
+          ns:
+            db: *database_name
+            coll: *collection_name
+          to:
+            db: *database_name
+            coll: *collection2_name
+        -
+          operationType: invalidate
+  -
+    description: Test drop and invalidate event types
+    minServerVersion: "4.0.1"
+    target: collection
+    topology:
+      - replicaset
+    changeStreamPipeline: []
+    changeStreamOptions: {}
+    operations:
+      -
+        database: *database_name
+        collection: *collection_name
+        name: drop
+    expectations:
+      -
+        command_started_event:
+          command:
+            aggregate: *collection_name
+            cursor: {}
+            pipeline:
+              -
+                $changeStream:
+                  fullDocument: default
+          command_name: aggregate
+          database_name: *database_name
+    result:
+      success:
+        -
+          operationType: drop
+          ns:
+            db: *database_name
+            coll: *collection_name
+        -
+          operationType: invalidate