mongoid 7.5.4 → 8.1.6

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

@@ -142,107 +142,6 @@ describe Mongoid::Criteria::Queryable::Optional do
           it_behaves_like "a cloning option"
         end
       end
-
-      context "when using the mongo-1.x driver syntax" do
-
-        let(:query) do
-          Mongoid::Query.new({}, {}, :mongo1x)
-        end
-
-        context "when provided symbols" do
-
-          let(:selection) do
-            query.send(method, :field_one, :field_two)
-          end
-
-          it "adds the sorting criteria" do
-            expect(selection.options).to eq(
-              { sort: [[ :field_one, 1 ], [ :field_two, 1 ]]}
-            )
-          end
-
-          it_behaves_like "a cloning option"
-        end
-
-        context "when provided an array of symbols" do
-
-          let(:selection) do
-            query.send(method, [ :field_one, :field_two ])
-          end
-
-          it "adds the sorting criteria" do
-            expect(selection.options).to eq(
-              { sort: [[ :field_one, 1 ], [ :field_two, 1 ]]}
-            )
-          end
-
-          it_behaves_like "a cloning option"
-        end
-
-        context "when provided strings" do
-
-          let(:selection) do
-            query.send(method, "field_one", "field_two")
-          end
-
-          it "adds the sorting criteria" do
-            expect(selection.options).to eq(
-              { sort: [[ "field_one", 1 ], [ "field_two", 1 ]]}
-            )
-          end
-
-          it_behaves_like "a cloning option"
-        end
-
-        context "when provided an array of strings" do
-
-          let(:selection) do
-            query.send(method, [ "field_one", "field_two" ])
-          end
-
-          it "adds the sorting criteria" do
-            expect(selection.options).to eq(
-              { sort: [[ "field_one", 1 ], [ "field_two", 1 ]]}
-            )
-          end
-
-          it_behaves_like "a cloning option"
-        end
-
-        context "when provided no options" do
-
-          let(:selection) do
-            query.send(method)
-          end
-
-          it "does not add any sorting criteria" do
-            expect(selection.options).to be_empty
-          end
-
-          it "returns the query" do
-            expect(selection).to eq(query)
-          end
-
-          it_behaves_like "a cloning option"
-        end
-
-        context "when provided nil" do
-
-          let(:selection) do
-            query.send(method, nil)
-          end
-
-          it "does not add any sorting criteria" do
-            expect(selection.options).to be_empty
-          end
-
-          it "returns the query" do
-            expect(selection).to eq(query)
-          end
-
-          it_behaves_like "a cloning option"
-        end
-      end
     end
   end
 
@@ -415,107 +314,6 @@ describe Mongoid::Criteria::Queryable::Optional do
           it_behaves_like "a cloning option"
         end
       end
-
-      context "when using the mongo-1.x driver syntax" do
-
-        let(:query) do
-          Mongoid::Query.new({}, {}, :mongo1x)
-        end
-
-        context "when provided symbols" do
-
-          let(:selection) do
-            query.send(method, :field_one, :field_two)
-          end
-
-          it "adds the sorting criteria" do
-            expect(selection.options).to eq(
-              { sort: [[ :field_one, -1 ], [ :field_two, -1 ]]}
-            )
-          end
-
-          it_behaves_like "a cloning option"
-        end
-
-        context "when provided an array of symbols" do
-
-          let(:selection) do
-            query.send(method, [ :field_one, :field_two ])
-          end
-
-          it "adds the sorting criteria" do
-            expect(selection.options).to eq(
-              { sort: [[ :field_one, -1 ], [ :field_two, -1 ]]}
-            )
-          end
-
-          it_behaves_like "a cloning option"
-        end
-
-        context "when provided strings" do
-
-          let(:selection) do
-            query.send(method, "field_one", "field_two")
-          end
-
-          it "adds the sorting criteria" do
-            expect(selection.options).to eq(
-              { sort: [[ "field_one", -1 ], [ "field_two", -1 ]]}
-            )
-          end
-
-          it_behaves_like "a cloning option"
-        end
-
-        context "when provided an array of strings" do
-
-          let(:selection) do
-            query.send(method, [ "field_one", "field_two" ])
-          end
-
-          it "adds the sorting criteria" do
-            expect(selection.options).to eq(
-              { sort: [[ "field_one", -1 ], [ "field_two", -1 ]]}
-            )
-          end
-
-          it_behaves_like "a cloning option"
-        end
-
-        context "when provided no options" do
-
-          let(:selection) do
-            query.send(method)
-          end
-
-          it "does not add any sorting criteria" do
-            expect(selection.options).to be_empty
-          end
-
-          it "returns the query" do
-            expect(selection).to eq(query)
-          end
-
-          it_behaves_like "a cloning option"
-        end
-
-        context "when provided nil" do
-
-          let(:selection) do
-            query.send(method, nil)
-          end
-
-          it "does not add any sorting criteria" do
-            expect(selection.options).to be_empty
-          end
-
-          it "returns the query" do
-            expect(selection).to eq(query)
-          end
-
-          it_behaves_like "a cloning option"
-        end
-      end
     end
   end
 
@@ -943,283 +741,16 @@ describe Mongoid::Criteria::Queryable::Optional do
 
             it_behaves_like "a cloning option"
           end
-        end
-
-        context "when provided an array" do
-
-          context "when the array is multi-dimensional" do
-
-            context "when the arrays have integer values" do
-
-              let(:selection) do
-                query.send("#{method}", [[ :field_one, 1 ],[ :field_two, -1 ]])
-              end
-
-              it "adds the sorting criteria" do
-                expect(selection.options).to eq(
-                  { sort: { "field_one" => 1, "field_two" => -1 }}
-                )
-              end
-
-              it_behaves_like "a cloning option"
-            end
-
-            context "when the arrays have symbol values" do
-
-              let(:selection) do
-                query.send("#{method}", [[ :field_one, :asc ],[ :field_two, :desc ]])
-              end
-
-              it "adds the sorting criteria" do
-                expect(selection.options).to eq(
-                  { sort: { "field_one" => 1, "field_two" => -1 }}
-                )
-              end
-
-              it_behaves_like "a cloning option"
-            end
-
-            context "when the arrays have string values" do
-
-              let(:selection) do
-                query.send("#{method}", [[ :field_one, "asc" ],[ :field_two, "desc" ]])
-              end
-
-              it "adds the sorting criteria" do
-                expect(selection.options).to eq(
-                  { sort: { "field_one" => 1, "field_two" => -1 }}
-                )
-              end
-
-              it_behaves_like "a cloning option"
-            end
-          end
-
-          context "when the array is selectable keys" do
-
-            let(:selection) do
-              query.send("#{method}", [ :field_one.asc, :field_two.desc ])
-            end
-
-            it "adds the sorting criteria" do
-              expect(selection.options).to eq(
-                { sort: { "field_one" => 1, "field_two" => -1 }}
-              )
-            end
-
-            it_behaves_like "a cloning option"
-          end
-        end
-
-        context "when provided values" do
-
-          context "when the values are arrays" do
-
-            context "when the values have integer directions" do
-
-              let(:selection) do
-                query.send("#{method}", [ :field_one, 1 ],[ :field_two, -1 ])
-              end
-
-              it "adds the sorting criteria" do
-                expect(selection.options).to eq(
-                  { sort: { "field_one" => 1, "field_two" => -1 }}
-                )
-              end
-
-              it_behaves_like "a cloning option"
-            end
-
-            context "when the values have symbol directions" do
-
-              let(:selection) do
-                query.send("#{method}", [ :field_one, :asc ],[ :field_two, :desc ])
-              end
-
-              it "adds the sorting criteria" do
-                expect(selection.options).to eq(
-                  { sort: { "field_one" => 1, "field_two" => -1 }}
-                )
-              end
-
-              it_behaves_like "a cloning option"
-            end
-
-            context "when the values have string directions" do
-
-              let(:selection) do
-                query.send("#{method}", [ :field_one, "asc" ],[ :field_two, "desc" ])
-              end
-
-              it "adds the sorting criteria" do
-                expect(selection.options).to eq(
-                  { sort: { "field_one" => 1, "field_two" => -1 }}
-                )
-              end
-
-              it_behaves_like "a cloning option"
-            end
-          end
-
-          context "when the values are selectable keys" do
-
-            let(:selection) do
-              query.send("#{method}", :field_one.asc, :field_two.desc)
-            end
-
-            it "adds the sorting criteria" do
-              expect(selection.options).to eq(
-                { sort: { "field_one" => 1, "field_two" => -1 }}
-              )
-            end
-
-            it_behaves_like "a cloning option"
-          end
-        end
-
-        context "when provided a string" do
-
-          context "when the direction is lowercase" do
-
-            context "when abbreviated" do
-
-              let(:selection) do
-                query.send("#{method}", "field_one asc, field_two desc")
-              end
-
-              it "adds the sorting criteria" do
-                expect(selection.options).to eq(
-                  { sort: { "field_one" => 1, "field_two" => -1 }}
-                )
-              end
-
-              it_behaves_like "a cloning option"
-            end
-
-            context "when spelled out" do
-
-              let(:selection) do
-                query.send("#{method}", "field_one ascending, field_two descending")
-              end
-
-              it "adds the sorting criteria" do
-                expect(selection.options).to eq(
-                  { sort: { "field_one" => 1, "field_two" => -1 }}
-                )
-              end
-
-              it_behaves_like "a cloning option"
-            end
-          end
-
-          context "when the direction is uppercase" do
-
-            context "when abbreviated" do
-
-              let(:selection) do
-                query.send("#{method}", "field_one ASC, field_two DESC")
-              end
-
-              it "adds the sorting criteria" do
-                expect(selection.options).to eq(
-                  { sort: { "field_one" => 1, "field_two" => -1 }}
-                )
-              end
-
-              it_behaves_like "a cloning option"
-            end
-
-            context "when spelled out" do
-
-              let(:selection) do
-                query.send("#{method}", "field_one ASCENDING, field_two DESCENDING")
-              end
-
-              it "adds the sorting criteria" do
-                expect(selection.options).to eq(
-                  { sort: { "field_one" => 1, "field_two" => -1 }}
-                )
-              end
-
-              it_behaves_like "a cloning option"
-            end
-          end
-        end
-
-        context "when provided no options" do
-
-          let(:selection) do
-            query.order_by
-          end
-
-          it "returns the query" do
-            expect(selection).to eq(query)
-          end
-
-          it_behaves_like "a cloning option"
-        end
-
-        context "when provided nil" do
-
-          let(:selection) do
-            query.send("#{method}", nil)
-          end
-
-          it "returns the query" do
-            expect(selection).to eq(query)
-          end
-
-          it_behaves_like "a cloning option"
-        end
-      end
-
-      context "when using the mongo-1.x driver syntax" do
-
-        let(:query) do
-          Mongoid::Query.new({}, {}, :mongo1x)
-        end
-
-        context "when provided a hash" do
-
-          context "when the hash has integer values" do
-
-            let(:selection) do
-              query.send("#{method}", field_one: 1, field_two: -1)
-            end
-
-            it "adds the sorting criteria" do
-              expect(selection.options).to eq(
-                { sort: [[ :field_one, 1 ], [ :field_two, -1 ]]}
-              )
-            end
-
-            it_behaves_like "a cloning option"
-          end
 
-          context "when the hash has symbol values" do
+          context "when the hash has hash values" do
 
             let(:selection) do
-              query.send("#{method}", field_one: :asc, field_two: :desc)
+              query.send("#{method}", score: { "$meta" => "textScore"})
             end
 
             it "adds the sorting criteria" do
               expect(selection.options).to eq(
-                { sort: [[ :field_one, 1 ], [ :field_two, -1 ]]}
-              )
-            end
-
-            it_behaves_like "a cloning option"
-          end
-
-          context "when the hash has string values" do
-
-            let(:selection) do
-              query.send("#{method}", field_one: "asc", field_two: "desc")
-            end
-
-            it "adds the sorting criteria" do
-              expect(selection.options).to eq(
-                { sort: [[ :field_one, 1 ], [ :field_two, -1 ]]}
+                { sort: { "score" => { "$meta" => "textScore" } }}
               )
             end
 
@@ -1239,7 +770,7 @@ describe Mongoid::Criteria::Queryable::Optional do
 
               it "adds the sorting criteria" do
                 expect(selection.options).to eq(
-                  { sort: [[ :field_one, 1 ], [ :field_two, -1 ]]}
+                  { sort: { "field_one" => 1, "field_two" => -1 }}
                 )
               end
 
@@ -1254,7 +785,7 @@ describe Mongoid::Criteria::Queryable::Optional do
 
               it "adds the sorting criteria" do
                 expect(selection.options).to eq(
-                  { sort: [[ :field_one, 1 ], [ :field_two, -1 ]]}
+                  { sort: { "field_one" => 1, "field_two" => -1 }}
                 )
               end
 
@@ -1269,7 +800,7 @@ describe Mongoid::Criteria::Queryable::Optional do
 
               it "adds the sorting criteria" do
                 expect(selection.options).to eq(
-                  { sort: [[ :field_one, 1 ], [ :field_two, -1 ]]}
+                  { sort: { "field_one" => 1, "field_two" => -1 }}
                 )
               end
 
@@ -1285,7 +816,7 @@ describe Mongoid::Criteria::Queryable::Optional do
 
             it "adds the sorting criteria" do
               expect(selection.options).to eq(
-                { sort: [[ :field_one, 1 ], [ :field_two, -1 ]]}
+                { sort: { "field_one" => 1, "field_two" => -1 }}
               )
             end
 
@@ -1305,7 +836,7 @@ describe Mongoid::Criteria::Queryable::Optional do
 
               it "adds the sorting criteria" do
                 expect(selection.options).to eq(
-                  { sort: [[ :field_one, 1 ], [ :field_two, -1 ]]}
+                  { sort: { "field_one" => 1, "field_two" => -1 }}
                 )
               end
 
@@ -1320,7 +851,7 @@ describe Mongoid::Criteria::Queryable::Optional do
 
               it "adds the sorting criteria" do
                 expect(selection.options).to eq(
-                  { sort: [[ :field_one, 1 ], [ :field_two, -1 ]]}
+                  { sort: { "field_one" => 1, "field_two" => -1 }}
                 )
               end
 
@@ -1335,7 +866,7 @@ describe Mongoid::Criteria::Queryable::Optional do
 
               it "adds the sorting criteria" do
                 expect(selection.options).to eq(
-                  { sort: [[ :field_one, 1 ], [ :field_two, -1 ]]}
+                  { sort: { "field_one" => 1, "field_two" => -1 }}
                 )
               end
 
@@ -1351,7 +882,7 @@ describe Mongoid::Criteria::Queryable::Optional do
 
             it "adds the sorting criteria" do
               expect(selection.options).to eq(
-                { sort: [[ :field_one, 1 ], [ :field_two, -1 ]]}
+                { sort: { "field_one" => 1, "field_two" => -1 }}
               )
             end
 
@@ -1371,7 +902,7 @@ describe Mongoid::Criteria::Queryable::Optional do
 
               it "adds the sorting criteria" do
                 expect(selection.options).to eq(
-                  { sort: [[ :field_one, 1 ], [ :field_two, -1 ]]}
+                  { sort: { "field_one" => 1, "field_two" => -1 }}
                 )
               end
 
@@ -1386,7 +917,7 @@ describe Mongoid::Criteria::Queryable::Optional do
 
               it "adds the sorting criteria" do
                 expect(selection.options).to eq(
-                  { sort: [[ :field_one, 1 ], [ :field_two, -1 ]]}
+                  { sort: { "field_one" => 1, "field_two" => -1 }}
                 )
               end
 
@@ -1404,7 +935,7 @@ describe Mongoid::Criteria::Queryable::Optional do
 
               it "adds the sorting criteria" do
                 expect(selection.options).to eq(
-                  { sort: [[ :field_one, 1 ], [ :field_two, -1 ]]}
+                  { sort: { "field_one" => 1, "field_two" => -1 }}
                 )
               end
 
@@ -1419,7 +950,7 @@ describe Mongoid::Criteria::Queryable::Optional do
 
               it "adds the sorting criteria" do
                 expect(selection.options).to eq(
-                  { sort: [[ :field_one, 1 ], [ :field_two, -1 ]]}
+                  { sort: { "field_one" => 1, "field_two" => -1 }}
                 )
               end
 

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

@@ -221,6 +221,7 @@ describe Mongoid::Criteria::Queryable::Options do
         end
 
         context "when the serializer is localized" do
+          with_default_i18n_configs
 
           before(:all) do
             class Field
@@ -232,7 +233,6 @@ describe Mongoid::Criteria::Queryable::Options do
 
           after(:all) do
             Object.send(:remove_const, :Field)
-            ::I18n.locale = :en
           end
 
           let(:options) do