mongoid 7.4.3 → 8.0.7

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

@@ -210,7 +210,79 @@ describe Mongoid::Criteria::Queryable::Storable do
         }
       end
     end
+
+    context 'when value is a hash combine values with different operator keys' do
+      let(:base) do
+        query.add_field_expression('foo', {'$in' => ['bar']})
+      end
+
+      let(:modified) do
+        base.add_field_expression('foo', {'$nin' => ['zoom']})
+      end
+
+      it 'combines the conditions using $and' do
+        modified.selector.should == {
+          'foo' => {
+            '$in' => ['bar'],
+            '$nin' => ['zoom']
+          }
+        }
+      end
+    end
+
+    context 'when value is a hash with symbol operator key combine values with different operator keys' do
+      let(:base) do
+        query.add_field_expression('foo', {:$in => ['bar']})
+      end
+
+      let(:modified) do
+        base.add_field_expression('foo', {:$nin => ['zoom']})
+      end
+
+      it 'combines the conditions using $and' do
+        modified.selector.should == {
+          'foo' => {
+            :$in => ['bar'],
+            :$nin => ['zoom']
+          }
+        }
+      end
+    end
+
+    context 'when value is a hash add values with same operator keys using $and' do
+      let(:base) do
+        query.add_field_expression('foo', {'$in' => ['bar']})
+      end
+
+      let(:modified) do
+        base.add_field_expression('foo', {'$in' => ['zoom']})
+      end
+
+      it 'adds the new condition using $and' do
+        modified.selector.should == {
+          'foo' => {'$in' => ['bar']},
+          '$and' => ['foo' => {'$in' => ['zoom']}]
+        }
+      end
+    end
+
+  context 'when value is a hash with symbol operator key add values with same operator keys using $and' do
+    let(:base) do
+      query.add_field_expression('foo', {:$in => ['bar']})
+    end
+
+    let(:modified) do
+      base.add_field_expression('foo', {:$in => ['zoom']})
+    end
+
+    it 'adds the new condition using $and' do
+      modified.selector.should == {
+        'foo' => {:$in => ['bar']},
+        '$and' => ['foo' => {:$in => ['zoom']}]
+      }
+    end
   end
+end
 
   describe '#add_operator_expression' do
     let(:query_method) { :add_operator_expression }

data/spec/mongoid/criteria/translator_spec.rb

@@ -0,0 +1,132 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Mongoid::Criteria::Translator do
+  describe "#to_direction" do
+    context "when the value is a string" do
+      context "when ascending" do
+        it "returns 1" do
+          expect(described_class.to_direction("ascending")).to eq(1)
+        end
+      end
+
+      context "when asc" do
+        it "returns 1" do
+          expect(described_class.to_direction("asc")).to eq(1)
+        end
+      end
+
+      context "when ASCENDING" do
+        it "returns 1" do
+          expect(described_class.to_direction("ASCENDING")).to eq(1)
+        end
+      end
+
+      context "when ASC" do
+        it "returns 1" do
+          expect(described_class.to_direction("ASC")).to eq(1)
+        end
+      end
+
+      context "when descending" do
+        it "returns -1" do
+          expect(described_class.to_direction("descending")).to eq(-1)
+        end
+      end
+
+      context "when desc" do
+        it "returns -1" do
+          expect(described_class.to_direction("desc")).to eq(-1)
+        end
+      end
+
+      context "when DESCENDING" do
+        it "returns -1" do
+          expect(described_class.to_direction("DESCENDING")).to eq(-1)
+        end
+      end
+
+      context "when DESC" do
+        it "returns -1" do
+          expect(described_class.to_direction("DESC")).to eq(-1)
+        end
+      end
+    end
+
+    context "when the value is a symbol" do
+      context "when ascending" do
+        it "returns 1" do
+          expect(described_class.to_direction(:ascending)).to eq(1)
+        end
+      end
+  
+      context "when asc" do
+        it "returns 1" do
+          expect(described_class.to_direction(:asc)).to eq(1)
+        end
+      end
+  
+      context "when ASCENDING" do
+        it "returns 1" do
+          expect(described_class.to_direction(:ASCENDING)).to eq(1)
+        end
+      end
+  
+      context "when ASC" do
+        it "returns 1" do
+          expect(described_class.to_direction(:ASC)).to eq(1)
+        end
+      end
+  
+      context "when descending" do
+        it "returns -1" do
+          expect(described_class.to_direction(:descending)).to eq(-1)
+        end
+      end
+  
+      context "when desc" do
+        it "returns -1" do
+          expect(described_class.to_direction(:desc)).to eq(-1)
+        end
+      end
+  
+      context "when DESCENDING" do
+        it "returns -1" do
+          expect(described_class.to_direction(:DESCENDING)).to eq(-1)
+        end
+      end
+  
+      context "when DESC" do
+        it "returns -1" do
+          expect(described_class.to_direction(:DESC)).to eq(-1)
+        end
+      end
+    end
+
+    context "when the value is numeric" do
+      it "should pass the value through unchanged" do
+        expect(described_class.to_direction(1)).to eq(1)
+        expect(described_class.to_direction(-1)).to eq(-1)
+        expect(described_class.to_direction(Math::PI)).to eq(Math::PI)
+      end
+    end
+
+    context "when the value is a hash" do
+      it "should pass the value through unchanged" do
+        expect(described_class.to_direction({})).to eq({})
+        expect(described_class.to_direction(scope: { "$meta" => "textScore" }))
+          .to eq(scope: { "$meta" => "textScore" })
+        expect(described_class.to_direction(a: 1, b: 2)).to eq(a: 1, b: 2)
+      end
+    end
+
+    context "when the value is an unrecognized type" do
+      it "should raise ArgumentError" do
+        expect { described_class.to_direction([]) }.to raise_error(ArgumentError)
+        expect { described_class.to_direction(/a/) }.to raise_error(ArgumentError)
+        expect { described_class.to_direction(Object.new) }.to raise_error(ArgumentError)
+      end
+    end
+  end
+end

data/spec/mongoid/criteria_projection_spec.rb

@@ -171,7 +171,6 @@ describe Mongoid::Criteria do
 
         let(:dictionary) do
           Dictionary.only(:description).first
-
         end
 
         it 'loads all translations' do