mongoid 6.4.8 → 7.0.0.beta

data/spec/mongoid/criteria/queryable/extensions/big_decimal_spec.rb

@@ -7,7 +7,7 @@ describe BigDecimal do
     context "when provided a big decimal" do
 
       let(:big_decimal) do
-        BigDecimal("123456.789")
+        BigDecimal.new("123456.789")
       end
 
       it "returns the decimal as a string" do
@@ -25,11 +25,11 @@ describe BigDecimal do
     context "when provided an array of big decimals" do
 
       let(:bd_one) do
-        BigDecimal("123456.789")
+        BigDecimal.new("123456.789")
       end
 
       let(:bd_two) do
-        BigDecimal("123333.789")
+        BigDecimal.new("123333.789")
       end
 
       let(:array) do

data/spec/mongoid/criteria/queryable/pipeline_spec.rb

@@ -196,5 +196,17 @@ describe Mongoid::Criteria::Queryable::Pipeline do
         end
       end
     end
+
+    context "when provided a hash" do
+      before do
+        pipeline.unwind(path: "$author", "includeArrayIndex" => "author_index", preserveNullAndEmptyArrays: true)
+      end
+
+      it "sets the hash" do
+        expect(pipeline).to eq([
+          { "$unwind" => { path: "$author", "includeArrayIndex" => "author_index", preserveNullAndEmptyArrays: true } }
+        ])
+      end
+    end
   end
 end

data/spec/mongoid/criteria/queryable/selectable_spec.rb

@@ -1073,26 +1073,6 @@ describe Mongoid::Criteria::Queryable::Selectable do
           })
         end
 
-        context "when used with the $box operator ($geoWithin query) " do
-          let(:selection) do
-            query.geo_spacial(
-              :location.within_box => [[ 1, 10 ], [ 2, 10 ]]
-            )
-          end
-  
-          it "adds the $geoIntersects expression" do
-            expect(selection.selector).to eq({
-              "location" => {
-                "$geoWithin" => {
-                  "$box" => [
-                    [ 1, 10 ], [ 2, 10 ]
-                  ]
-                }
-              }
-            })
-          end
-        end
-
         it_behaves_like "a cloning selection"
       end
     end
@@ -1469,7 +1449,7 @@ describe Mongoid::Criteria::Queryable::Selectable do
 
       context "when the criterion are on the same field" do
 
-        context "when the strategy is the default (intersection)" do
+        context "when the stretegy is the default (intersection)" do
 
           let(:selection) do
             query.in(first: [ 1, 2 ].freeze).in(first: [ 2, 3 ])
@@ -1486,35 +1466,6 @@ describe Mongoid::Criteria::Queryable::Selectable do
           end
         end
 
-        context 'when the field is aliased' do
-
-          before(:all) do
-            class TestModel
-              include Mongoid::Document
-            end
-          end
-
-          after(:all) do
-            Object.send(:remove_const, :TestModel)
-          end
-
-          let(:bson_object_id) do
-            BSON::ObjectId.new
-          end
-
-          let(:selection) do
-            TestModel.in(id: [bson_object_id.to_s]).in(id: [bson_object_id.to_s])
-          end
-
-          it "intersects the $in selectors" do
-            expect(selection.selector).to eq("_id" =>  { "$in" => [ bson_object_id ] })
-          end
-
-          it "returns a cloned query" do
-            expect(selection).to_not equal(query)
-          end
-        end
-
         context "when the stretegy is intersect" do
 
           let(:selection) do
@@ -1532,7 +1483,7 @@ describe Mongoid::Criteria::Queryable::Selectable do
           end
         end
 
-        context "when the strategy is override" do
+        context "when the stretegy is override" do
 
           let(:selection) do
             query.in(first: [ 1, 2 ]).override.in(first: [ 3, 4 ])
@@ -1549,7 +1500,7 @@ describe Mongoid::Criteria::Queryable::Selectable do
           end
         end
 
-        context "when the strategy is union" do
+        context "when the stretegy is union" do
 
           let(:selection) do
             query.in(first: [ 1, 2 ]).union.in(first: [ 3, 4 ])
@@ -3389,7 +3340,7 @@ describe Mongoid::Criteria::Queryable::Selectable do
       end
 
       it "constructs a text search document" do
-        expect(selection.selector).to eq({ '$text' => { '$search' => "testing" }})
+        expect(selection.selector).to eq({ :$text => { :$search => "testing" }})
       end
 
       it "returns the cloned selectable" do
@@ -3403,35 +3354,16 @@ describe Mongoid::Criteria::Queryable::Selectable do
         end
 
         it "constructs a text search document" do
-          expect(selection.selector['$text']['$search']).to eq("essais")
+          expect(selection.selector[:$text][:$search]).to eq("essais")
         end
 
         it "add the options to the text search document" do
-          expect(selection.selector['$text'][:$language]).to eq("fr")
+          expect(selection.selector[:$text][:$language]).to eq("fr")
         end
 
         it_behaves_like "a cloning selection"
       end
     end
-
-    context 'when given more than once' do
-      let(:selection) do
-        query.text_search("one").text_search('two')
-      end
-
-      # MongoDB server can only handle one text expression at a time,
-      # per https://docs.mongodb.com/manual/reference/operator/query/text/.
-      # Nonetheless we test that the query is built correctly when
-      # a user supplies more than one text condition.
-      it 'merges conditions' do
-        expect(Mongoid.logger).to receive(:warn)
-        expect(selection.selector).to eq('$and' => [
-            {'$text' => {'$search' => 'one'}}
-          ],
-          '$text' => {'$search' => 'two'},
-        )
-      end
-    end
   end
 
   describe "#where" do

data/spec/mongoid/criteria/queryable/selector_spec.rb

@@ -370,11 +370,11 @@ describe Mongoid::Criteria::Queryable::Selector do
         context "when providing an array" do
 
           let(:big_one) do
-            BigDecimal("1.2321")
+            BigDecimal.new("1.2321")
           end
 
           let(:big_two) do
-            BigDecimal("4.2222")
+            BigDecimal.new("4.2222")
           end
 
           let(:array) do

data/spec/mongoid/criteria/scopable_spec.rb

@@ -388,85 +388,4 @@ describe Mongoid::Criteria::Scopable do
       end
     end
   end
-
-  describe 'scope and where' do
-    class ScopeWhereModel
-      include Mongoid::Document
-
-      scope :foo, -> { where(foo: true) }
-    end
-
-    shared_examples_for 'restricts to both' do
-      it 'restricts to both' do
-        expect(result.selector['foo']).to eq(true)
-        expect(result.selector['hello']).to eq('world')
-      end
-    end
-
-    context 'scope is given first' do
-      let(:result) { ScopeWhereModel.foo.where(hello: 'world') }
-
-      it_behaves_like 'restricts to both'
-    end
-
-    context 'where is given first' do
-      let(:result) { ScopeWhereModel.where(hello: 'world').foo }
-
-      it_behaves_like 'restricts to both'
-    end
-  end
-
-  describe 'scope with argument and where' do
-    class ArgumentScopeWhereModel
-      include Mongoid::Document
-
-      scope :my_text_search, ->(search) { where('$text' => {'$search' => search}) }
-    end
-
-    shared_examples_for 'restricts to both' do
-      it 'restricts to both' do
-        expect(result.selector['$text']).to eq({'$search' => 'bar'})
-        expect(result.selector['hello']).to eq('world')
-      end
-    end
-
-    context 'scope is given first' do
-      let(:result) { ArgumentScopeWhereModel.my_text_search('bar').where(hello: 'world') }
-
-      it_behaves_like 'restricts to both'
-    end
-
-    context 'where is given first' do
-      let(:result) { ArgumentScopeWhereModel.where(hello: 'world').my_text_search('bar') }
-
-      it_behaves_like 'restricts to both'
-    end
-  end
-
-  describe 'built in text search scope and where' do
-    class TextSearchScopeWhereModel
-      include Mongoid::Document
-
-      # using the default text_search scope
-    end
-
-    shared_examples_for 'restricts to both' do
-      it 'restricts to both' do
-        expect(result.selector['$text']).to eq({'$search' => 'bar'})
-        expect(result.selector['hello']).to eq('world')
-      end
-    end
-
-    context 'scope is given first' do
-      let(:result) { TextSearchScopeWhereModel.text_search('bar').where(hello: 'world') }
-
-      it_behaves_like 'restricts to both'
-    end
-
-    context 'where is given first' do
-      let(:result) { TextSearchScopeWhereModel.where(hello: 'world').text_search('bar') }
-
-      it_behaves_like 'restricts to both'
-    end
-  end
 end

data/spec/mongoid/criteria_spec.rb

@@ -975,7 +975,6 @@ describe Mongoid::Criteria do
   end
 
   describe "#geo_near" do
-    max_server_version '4.0'
 
     before do
       Bar.create_indexes
@@ -1445,18 +1444,18 @@ describe Mongoid::Criteria do
       end
     end
 
-    context "when including the same metadata multiple times" do
+    context "when including the same association multiple times" do
 
       let(:criteria) do
         Person.all.includes(:posts, :posts).includes(:posts)
       end
 
-      let(:metadata) do
+      let(:association) do
         Person.reflect_on_association(:posts)
       end
 
-      it "does not duplicate the metadata in the inclusions" do
-        expect(criteria.inclusions).to eq([ metadata ])
+      it "does not duplicate the association in the inclusions" do
+        expect(criteria.inclusions).to eq([ association ])
       end
     end
 
@@ -2218,12 +2217,12 @@ describe Mongoid::Criteria do
       Band.includes(:records)
     end
 
-    let(:metadata) do
+    let(:association) do
       Band.relations["records"]
     end
 
     it "returns the inclusions" do
-      expect(criteria.inclusions).to eq([ metadata ])
+      expect(criteria.inclusions).to eq([ association ])
     end
   end
 
@@ -2233,16 +2232,16 @@ describe Mongoid::Criteria do
       Band.all
     end
 
-    let(:metadata) do
+    let(:association) do
       Band.relations["records"]
     end
 
     before do
-      criteria.inclusions = [ metadata ]
+      criteria.inclusions = [ association ]
     end
 
     it "sets the inclusions" do
-      expect(criteria.inclusions).to eq([ metadata ])
+      expect(criteria.inclusions).to eq([ association ])
     end
   end
 
@@ -2410,7 +2409,7 @@ describe Mongoid::Criteria do
         end
       end
 
-      let(:metadata) do
+      let(:association) do
         Band.relations["records"]
       end
 
@@ -2435,7 +2434,7 @@ describe Mongoid::Criteria do
       end
 
       it "merges the inclusions" do
-        expect(merged.inclusions).to eq([ metadata ])
+        expect(merged.inclusions).to eq([ association ])
       end
 
       it "returns a new criteria" do
@@ -2449,7 +2448,7 @@ describe Mongoid::Criteria do
         { klass: Band, includes: [ :records ] }
       end
 
-      let(:metadata) do
+      let(:association) do
         Band.relations["records"]
       end
 
@@ -2470,7 +2469,7 @@ describe Mongoid::Criteria do
       end
 
       it "merges the inclusions" do
-        expect(merged.inclusions).to eq([ metadata ])
+        expect(merged.inclusions).to eq([ association ])
       end
 
       it "returns a new criteria" do
@@ -2495,7 +2494,7 @@ describe Mongoid::Criteria do
       end
     end
 
-    let(:metadata) do
+    let(:association) do
       Band.relations["records"]
     end
 
@@ -2520,7 +2519,7 @@ describe Mongoid::Criteria do
     end
 
     it "merges the inclusions" do
-      expect(merged.inclusions).to eq([ metadata ])
+      expect(merged.inclusions).to eq([ association ])
     end
 
     it "returns the same criteria" do
@@ -3322,8 +3321,6 @@ describe Mongoid::Criteria do
   end
 
   describe "#max_scan" do
-    max_server_version '4.0'
-
     let!(:band) do
       Band.create(name: "Depeche Mode")
     end
@@ -3468,7 +3465,7 @@ describe Mongoid::Criteria do
       context "when querying on a big decimal" do
 
         let(:sales) do
-          BigDecimal('0.1')
+          BigDecimal.new('0.1')
         end
 
         let!(:band) do

data/spec/mongoid/document_spec.rb

@@ -94,11 +94,11 @@ describe Mongoid::Document do
     context "when the document is not subclassed" do
 
       let(:types) do
-        Address._types
+        Kangaroo._types
       end
 
       it "returns the document" do
-        expect(types).to eq([ "Address" ])
+        expect(types).to eq([ "Kangaroo" ])
       end
     end
 
@@ -433,60 +433,6 @@ describe Mongoid::Document do
         end
       end
     end
-
-    context ':compact option' do
-
-      before do
-        # These tests require a specific set of defined attributes
-        # on the model
-        expect(church.as_json.keys.sort).to eq(%w(_id location name))
-      end
-
-      context 'there is a nil valued attribute' do
-        let(:church) do
-          Church.create!(name: 'St. Basil')
-        end
-
-        it 'returns non-nil fields and _id only' do
-          actual = church.as_json(compact: true)
-          expect(actual).to eq('_id' => church.id, 'name' => 'St. Basil')
-        end
-      end
-
-      context 'all attrbutes are nil valued' do
-        let(:church) do
-          Church.create!
-        end
-
-        it 'returns a hash with _id only' do
-          actual = church.as_json(compact: true)
-          expect(actual).to eq('_id' => church.id)
-        end
-      end
-
-      context 'there are no nil valued attributes' do
-        let(:church) do
-          Church.create!(name: 'St. Basil', location: {})
-        end
-
-        it 'returns all fields and _id' do
-          actual = church.as_json(compact: true)
-          expect(actual).to eq('_id' => church.id, 'name' => 'St. Basil',
-            'location' => {})
-        end
-      end
-
-      context 'when option is specified as a truthy value' do
-        let(:church) do
-          Church.create!(name: 'St. Basil')
-        end
-
-        it 'returns non-nil fields and _id only' do
-          actual = church.as_json(compact: 1)
-          expect(actual).to eq('_id' => church.id, 'name' => 'St. Basil')
-        end
-      end
-    end
   end
 
   describe "#as_document" do