mongo 2.4.0.rc0 → 2.4.0.rc1

data/spec/mongo/collection/view_spec.rb

@@ -187,6 +187,19 @@ describe Mongo::Collection::View do
               result
             }.to raise_exception(Mongo::Error::UnsupportedCollation)
           end
+
+          context 'when a String key is used' do
+
+            let(:options) do
+              { 'collation' => { locale: 'en_US', strength: 2 } }
+            end
+
+            it 'raises an exception' do
+              expect {
+                result
+              }.to raise_exception(Mongo::Error::UnsupportedCollation)
+            end
+          end
         end
       end
 

data/spec/mongo/collection_spec.rb

@@ -451,7 +451,7 @@ describe Mongo::Collection do
 
         shared_examples 'a collection command with a collation option' do
 
-          let!(:response) do
+          let(:response) do
             collection.create
           end
 
@@ -474,10 +474,12 @@ describe Mongo::Collection do
             end
 
             it 'sets the collection with a collation' do
+              response
               expect(collection_info['options']['collation']['locale']).to eq('fr')
             end
 
             it 'creates the collection in the database' do
+              response
               expect(database.collection_names).to include('specs')
             end
           end
@@ -489,6 +491,19 @@ describe Mongo::Collection do
                 response
               }.to raise_exception(Mongo::Error::UnsupportedCollation)
             end
+
+            context 'when a String key is used' do
+
+              let(:options) do
+                { 'collation' => { locale: 'fr' } }
+              end
+
+              it 'raises an exception' do
+                expect {
+                  response
+                }.to raise_exception(Mongo::Error::UnsupportedCollation)
+              end
+            end
           end
         end
 
@@ -498,9 +513,7 @@ describe Mongo::Collection do
             described_class.new(database, :specs, options)
           end
 
-          context 'when the server supports collation', if: collation_enabled? do
-            it_behaves_like 'a collection command with a collation option'
-          end
+          it_behaves_like 'a collection command with a collation option'
         end
 
         context 'when instantiating a collection through the database' do
@@ -509,9 +522,7 @@ describe Mongo::Collection do
             authorized_client[:specs, options]
           end
 
-          context 'when the server supports collation', if: collation_enabled? do
-            it_behaves_like 'a collection command with a collation option'
-          end
+          it_behaves_like 'a collection command with a collation option'
         end
       end
     end
@@ -1182,6 +1193,19 @@ describe Mongo::Collection do
               result
             }.to raise_exception(Mongo::Error::UnsupportedCollation)
           end
+
+          context 'when a String key is used' do
+
+            let(:options) do
+              { 'collation' => { locale: 'en_US', strength: 2 } }
+            end
+
+            it 'raises an exception' do
+              expect {
+                result
+              }.to raise_exception(Mongo::Error::UnsupportedCollation)
+            end
+          end
         end
       end
     end
@@ -1239,6 +1263,19 @@ describe Mongo::Collection do
               result
             }.to raise_exception(Mongo::Error::UnsupportedCollation)
           end
+
+          context 'when a String key is used' do
+
+            let(:options) do
+              { 'collation' => { locale: 'en_US', strength: 2 } }
+            end
+
+            it 'raises an exception' do
+              expect {
+                result
+              }.to raise_exception(Mongo::Error::UnsupportedCollation)
+            end
+          end
         end
       end
     end
@@ -1301,6 +1338,19 @@ describe Mongo::Collection do
             result
           }.to raise_exception(Mongo::Error::UnsupportedCollation)
         end
+
+        context 'when a String key is used' do
+
+          let(:options) do
+            { 'collation' => { locale: 'en_US', strength: 2 } }
+          end
+
+          it 'raises an exception' do
+            expect {
+              result
+            }.to raise_exception(Mongo::Error::UnsupportedCollation)
+          end
+        end
       end
     end
 
@@ -1414,6 +1464,19 @@ describe Mongo::Collection do
               result
             }.to raise_exception(Mongo::Error::UnsupportedCollation)
           end
+
+          context 'when a String key is used' do
+
+            let(:options) do
+              { 'collation' => { locale: 'en_US', strength: 2 } }
+            end
+
+            it 'raises an exception' do
+              expect {
+                result
+              }.to raise_exception(Mongo::Error::UnsupportedCollation)
+            end
+          end
         end
       end
 
@@ -1424,6 +1487,19 @@ describe Mongo::Collection do
             result
           }.to raise_exception(Mongo::Error::UnsupportedCollation)
         end
+
+        context 'when a String key is used' do
+
+          let(:options) do
+            { 'collation' => { locale: 'en_US', strength: 2 } }
+          end
+
+          it 'raises an exception' do
+            expect {
+              result
+            }.to raise_exception(Mongo::Error::UnsupportedCollation)
+          end
+        end
       end
     end
 
@@ -1526,6 +1602,19 @@ describe Mongo::Collection do
               result
             }.to raise_exception(Mongo::Error::UnsupportedCollation)
           end
+
+          context 'when a String key is used' do
+
+            let(:options) do
+              { 'collation' => { locale: 'en_US', strength: 2 } }
+            end
+
+            it 'raises an exception' do
+              expect {
+                result
+              }.to raise_exception(Mongo::Error::UnsupportedCollation)
+            end
+          end
         end
       end
 
@@ -1536,6 +1625,19 @@ describe Mongo::Collection do
             result
           }.to raise_exception(Mongo::Error::UnsupportedCollation)
         end
+
+        context 'when a String key is used' do
+
+          let(:options) do
+            { 'collation' => { locale: 'en_US', strength: 2 } }
+          end
+
+          it 'raises an exception' do
+            expect {
+              result
+            }.to raise_exception(Mongo::Error::UnsupportedCollation)
+          end
+        end
       end
     end
 
@@ -1882,6 +1984,19 @@ describe Mongo::Collection do
               result
             }.to raise_exception(Mongo::Error::UnsupportedCollation)
           end
+
+          context 'when a String key is used' do
+
+            let(:options) do
+              { 'collation' => { locale: 'en_US', strength: 2 } }
+            end
+
+            it 'raises an exception' do
+              expect {
+                result
+              }.to raise_exception(Mongo::Error::UnsupportedCollation)
+            end
+          end
         end
       end
 
@@ -1892,6 +2007,19 @@ describe Mongo::Collection do
             result
           }.to raise_exception(Mongo::Error::UnsupportedCollation)
         end
+
+        context 'when a String key is used' do
+
+          let(:options) do
+            { 'collation' => { locale: 'en_US', strength: 2 } }
+          end
+
+          it 'raises an exception' do
+            expect {
+              result
+            }.to raise_exception(Mongo::Error::UnsupportedCollation)
+          end
+        end
       end
     end
 
@@ -2116,6 +2244,19 @@ describe Mongo::Collection do
               result
             }.to raise_exception(Mongo::Error::UnsupportedCollation)
           end
+
+          context 'when a String key is used' do
+
+            let(:options) do
+              { 'collation' => { locale: 'en_US', strength: 2 } }
+            end
+
+            it 'raises an exception' do
+              expect {
+                result
+              }.to raise_exception(Mongo::Error::UnsupportedCollation)
+            end
+          end
         end
       end
 
@@ -2126,6 +2267,19 @@ describe Mongo::Collection do
             result
           }.to raise_exception(Mongo::Error::UnsupportedCollation)
         end
+
+        context 'when a String key is used' do
+
+          let(:options) do
+            { 'collation' => { locale: 'en_US', strength: 2 } }
+          end
+
+          it 'raises an exception' do
+            expect {
+              result
+            }.to raise_exception(Mongo::Error::UnsupportedCollation)
+          end
+        end
       end
     end
 
@@ -2349,6 +2503,19 @@ describe Mongo::Collection do
               result
             }.to raise_exception(Mongo::Error::UnsupportedCollation)
           end
+
+          context 'when a String key is used' do
+
+            let(:options) do
+              { 'collation' => { locale: 'en_US', strength: 2 } }
+            end
+
+            it 'raises an exception' do
+              expect {
+                result
+              }.to raise_exception(Mongo::Error::UnsupportedCollation)
+            end
+          end
         end
       end
 
@@ -2359,6 +2526,19 @@ describe Mongo::Collection do
             result
           }.to raise_exception(Mongo::Error::UnsupportedCollation)
         end
+
+        context 'when a String key is used' do
+
+          let(:options) do
+            { 'collation' => { locale: 'en_US', strength: 2 } }
+          end
+
+          it 'raises an exception' do
+            expect {
+              result
+            }.to raise_exception(Mongo::Error::UnsupportedCollation)
+          end
+        end
       end
     end
 
@@ -2535,6 +2715,19 @@ describe Mongo::Collection do
             result
           }.to raise_exception(Mongo::Error::UnsupportedCollation)
         end
+
+        context 'when a String key is used' do
+
+          let(:options) do
+            { 'collation' => { locale: 'en_US', strength: 2 } }
+          end
+
+          it 'raises an exception' do
+            expect {
+              result
+            }.to raise_exception(Mongo::Error::UnsupportedCollation)
+          end
+        end
       end
     end
 
@@ -2831,6 +3024,19 @@ describe Mongo::Collection do
             result
           }.to raise_exception(Mongo::Error::UnsupportedCollation)
         end
+
+        context 'when a String key is used' do
+
+          let(:options) do
+            { 'collation' => { locale: 'en_US', strength: 2 } }
+          end
+
+          it 'raises an exception' do
+            expect {
+              result
+            }.to raise_exception(Mongo::Error::UnsupportedCollation)
+          end
+        end
       end
     end
 
@@ -3101,6 +3307,19 @@ describe Mongo::Collection do
             result
           }.to raise_exception(Mongo::Error::UnsupportedCollation)
         end
+
+        context 'when a String key is used' do
+
+          let(:options) do
+            { 'collation' => { locale: 'en_US', strength: 2 } }
+          end
+
+          it 'raises an exception' do
+            expect {
+              result
+            }.to raise_exception(Mongo::Error::UnsupportedCollation)
+          end
+        end
       end
     end
 

data/spec/mongo/crud_spec.rb

@@ -24,13 +24,13 @@ describe 'CRUD' do
             test.run(authorized_collection)
           end
 
-          it "returns the correct result" do
-            skip 'Test cannot be run on this server version' unless test.feature_enabled?(authorized_collection)
-            expect(results).to eq(test.result)
+          it 'returns the correct result' do
+            skip 'Test cannot be run on this server version' unless spec.server_version_satisfied?(authorized_client)
+            expect(results).to match_operation_result(test)
           end
 
-          it 'has the correct data in the collection' do
-            skip 'Test cannot be run on this server version' unless test.feature_enabled?(authorized_collection)
+          it 'has the correct data in the collection', if: test.outcome_collection_data do
+            skip 'Test cannot be run on this server version' unless spec.server_version_satisfied?(authorized_client)
             results
             expect(authorized_collection.find.to_a).to match_collection_data(test)
           end

data/spec/mongo/index/view_spec.rb

@@ -224,6 +224,23 @@ describe Mongo::Index::View do
                 result
               }.to raise_exception(Mongo::Error::UnsupportedCollation)
             end
+
+            context 'when a String key is used' do
+
+              let(:result) do
+                view.create_many(
+                  { key: { random: 1 },
+                    unique: true,
+                    'collation' => { locale: 'en_US', strength: 2 } }
+                )
+              end
+
+              it 'raises an exception' do
+                expect {
+                  result
+                }.to raise_exception(Mongo::Error::UnsupportedCollation)
+              end
+            end
           end
         end
 
@@ -337,6 +354,23 @@ describe Mongo::Index::View do
                 result
               }.to raise_exception(Mongo::Error::UnsupportedCollation)
             end
+
+            context 'when a String key is used' do
+
+              let(:result) do
+                view.create_many([
+                                   { key: { random: 1 },
+                                     unique: true,
+                                     'collation' => { locale: 'en_US', strength: 2 }},
+                                 ])
+              end
+
+              it 'raises an exception' do
+                expect {
+                  result
+                }.to raise_exception(Mongo::Error::UnsupportedCollation)
+              end
+            end
           end
         end
 
@@ -477,6 +511,25 @@ describe Mongo::Index::View do
           end
         end
       end
+
+      context 'when the index is created on an subdocument field' do
+
+        let(:spec) do
+          { 'sub_document.random' => 1 }
+        end
+
+        let(:result) do
+          view.create_one(spec, unique: true)
+        end
+
+        after do
+          begin; view.drop_one('sub_document.random_1'); rescue; end
+        end
+
+        it 'returns ok' do
+          expect(result).to be_successful
+        end
+      end
     end
 
     context 'when index creation fails' do