mongoid 7.0.13 → 7.1.0.rc0

data/spec/mongoid/config_spec.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Config do
@@ -309,6 +311,10 @@ describe Mongoid::Config do
       it "sets the use utc option" do
         expect(described_class.use_utc).to be false
       end
+
+      it "sets the join_contexts default option" do
+        expect(described_class.join_contexts).to be false
+      end
     end
 
     context "when the rack environment is set" do
@@ -355,6 +361,10 @@ describe Mongoid::Config do
         it "sets the use utc option" do
           expect(described_class.use_utc).to be false
         end
+
+        it "sets the join_contexts default option" do
+          expect(described_class.join_contexts).to be false
+        end
       end
 
       context "when client configurations are provided" do
@@ -478,4 +488,33 @@ describe Mongoid::Config do
       end
     end
   end
+
+  describe '.log_level=' do
+    around do |example|
+      saved_log_level = Mongoid::Config.log_level
+      begin
+        example.run
+      ensure
+        Mongoid::Config.log_level = saved_log_level
+      end
+    end
+
+    it 'accepts a string' do
+      Mongoid::Config.log_level = 'info'
+      expect(Mongoid::Config.log_level).to eq(1)
+
+      # set twice to ensure value changes from default, whatever the default is
+      Mongoid::Config.log_level = 'warn'
+      expect(Mongoid::Config.log_level).to eq(2)
+    end
+
+    it 'accepts an integer' do
+      Mongoid::Config.log_level = 1
+      expect(Mongoid::Config.log_level).to eq(1)
+
+      # set twice to ensure value changes from default, whatever the default is
+      Mongoid::Config.log_level = 2
+      expect(Mongoid::Config.log_level).to eq(2)
+    end
+  end
 end

data/spec/mongoid/contextual/aggregable/memory_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Contextual::Aggregable::Memory do

data/spec/mongoid/contextual/aggregable/mongo_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Contextual::Aggregable::Mongo do

data/spec/mongoid/contextual/atomic_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Contextual::Atomic do
@@ -74,8 +77,7 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation' do
-      min_server_version '3.4'
+    context 'when the criteria has a collation', if: collation_supported? do
 
       let(:criteria) do
         Band.where(members: [ "DAVE" ]).collation(locale: 'en_US', strength: 2)
@@ -99,6 +101,102 @@ describe Mongoid::Contextual::Atomic do
     end
   end
 
+  describe "#add_each_to_set" do
+
+    let!(:depeche_mode) do
+      Band.create(members: [ "Dave" ])
+    end
+
+    let!(:new_order) do
+      Band.create(members: [ "Peter" ])
+    end
+
+    let!(:smiths) do
+      Band.create
+    end
+
+    context "when the criteria has no sorting" do
+
+      let(:criteria) do
+        Band.all
+      end
+
+      let(:context) do
+        Mongoid::Contextual::Mongo.new(criteria)
+      end
+
+      before do
+        context.add_each_to_set(members: [ "Dave", "Joe" ])
+      end
+
+      it "does not add duplicates" do
+        expect(depeche_mode.reload.members).to eq([ "Dave", "Joe" ])
+      end
+
+      it "adds unique values" do
+        expect(new_order.reload.members).to eq([ "Peter", "Dave", "Joe" ])
+      end
+
+      it "adds to non initialized fields" do
+        expect(smiths.reload.members).to eq([ "Dave", "Joe" ])
+      end
+    end
+
+    context "when the criteria has sorting" do
+
+      let(:criteria) do
+        Band.asc(:name)
+      end
+
+      let(:context) do
+        Mongoid::Contextual::Mongo.new(criteria)
+      end
+
+      before do
+        context.add_each_to_set(members: [ "Dave", "Joe" ], genres: "Electro")
+      end
+
+      it "does not add duplicates" do
+        expect(depeche_mode.reload.members).to eq([ "Dave", "Joe" ])
+      end
+
+      it "adds multiple operations" do
+        expect(depeche_mode.reload.genres).to eq([ "Electro" ])
+      end
+
+      it "adds unique values" do
+        expect(new_order.reload.members).to eq([ "Peter", "Dave", "Joe" ])
+      end
+
+      it "adds to non initialized fields" do
+        expect(smiths.reload.members).to eq([ "Dave", "Joe" ])
+      end
+    end
+
+    context 'when the criteria has a collation', if: collation_supported? do
+
+      let(:criteria) do
+        Band.where(members: [ "DAVE" ]).collation(locale: 'en_US', strength: 2)
+      end
+
+      let(:context) do
+        Mongoid::Contextual::Mongo.new(criteria)
+      end
+
+      before do
+        context.add_each_to_set(members: [ "Dave", "Joe" ], genres: "Electro")
+      end
+
+      it "does not add duplicates" do
+        expect(depeche_mode.reload.members).to eq([ "Dave", "Joe" ])
+      end
+
+      it "adds multiple operations" do
+        expect(depeche_mode.reload.genres).to eq([ "Electro" ])
+      end
+    end
+  end
+
   describe "#bit" do
 
     let!(:depeche_mode) do
@@ -146,8 +244,7 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation' do
-      min_server_version '3.4'
+    context 'when the criteria has a collation', if: collation_supported? do
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ], likes: 60)
@@ -226,8 +323,7 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation' do
-      min_server_version '3.4'
+    context 'when the criteria has a collation', if: collation_supported? do
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -299,8 +395,7 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation' do
-      min_server_version '3.4'
+    context 'when the criteria has a collation', if: collation_supported? do
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -354,8 +449,7 @@ describe Mongoid::Contextual::Atomic do
       expect(smiths.reload.members).to be_nil
     end
 
-    context 'when the criteria has a collation' do
-      min_server_version '3.4'
+    context 'when the criteria has a collation', if: collation_supported? do
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -412,8 +506,7 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation' do
-      min_server_version '3.4'
+    context 'when the criteria has a collation', if: collation_supported? do
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave", "Alan", "Fletch" ])
@@ -470,8 +563,7 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation' do
-      min_server_version '3.4'
+    context 'when the criteria has a collation', if: collation_supported? do
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -536,8 +628,7 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation' do
-      min_server_version '3.4'
+    context 'when the criteria has a collation', if: collation_supported? do
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -598,8 +689,7 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation' do
-      min_server_version '3.4'
+    context 'when the criteria has a collation', if: collation_supported? do
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -653,25 +743,12 @@ describe Mongoid::Contextual::Atomic do
       context.set(name: "Recoil")
     end
 
-    shared_examples 'writes as expected' do
-      it "sets existing fields" do
-        expect(depeche_mode.reload.name).to eq("Recoil")
-      end
-
-      it "sets non existent fields" do
-        expect(smiths.reload.name).to eq("Recoil")
-      end
+    it "sets existing fields" do
+      expect(depeche_mode.reload.name).to eq("Recoil")
     end
 
-    include_examples 'writes as expected'
-
-    context 'when fields being set have been projected out' do
-
-      let(:criteria) do
-        Band.only(:genres)
-      end
-
-      include_examples 'writes as expected'
+    it "sets non existent fields" do
+      expect(smiths.reload.name).to eq("Recoil")
     end
   end
 
@@ -771,8 +848,7 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation' do
-      min_server_version '3.4'
+    context 'when the criteria has a collation', if: collation_supported? do
 
       let!(:depeche_mode) do
         Band.create(name: "Depeche Mode", years: 10)

data/spec/mongoid/contextual/geo_near_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Contextual::GeoNear do
@@ -46,17 +49,8 @@ describe Mongoid::Contextual::GeoNear do
         described_class.new(collection, criteria, [ 52, 13 ])
       end
 
-      let(:expected_value) do
-        if ClusterConfig.instance.fcv_ish == '4.0' && ClusterConfig.instance.topology == :sharded
-          # https://jira.mongodb.org/browse/SERVER-50074
-          0.0
-        else
-          nil
-        end
-      end
-
-      it "is nil except for 4.0 sharded when it is 0" do
-        expect(geo_near.average_distance).to be expected_value
+      it "returns 0.0" do
+        expect(geo_near.average_distance).to be_nil
       end
     end
   end

data/spec/mongoid/contextual/map_reduce_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Contextual::MapReduce do
@@ -75,7 +78,6 @@ describe Mongoid::Contextual::MapReduce do
   end
 
   describe "#counts" do
-    max_server_version '4.2'
 
     let(:criteria) do
       Band.all
@@ -104,8 +106,7 @@ describe Mongoid::Contextual::MapReduce do
       end
 
       it "iterates over the results" do
-        ordered_results = results.entries.sort_by { |doc| doc['_id'] }
-        expect(ordered_results.entries).to eq([
+        expect(results.entries).to eq([
           { "_id" => "Depeche Mode", "value" => { "likes" => 200 }},
           { "_id" => "Tool", "value" => { "likes" => 100 }}
         ])
@@ -126,8 +127,7 @@ describe Mongoid::Contextual::MapReduce do
       end
 
       it "iterates over the results" do
-        ordered_results = results.entries.sort_by { |doc| doc['_id'] }
-        expect(ordered_results).to eq(expected_results)
+        expect(results.entries).to eq(expected_results)
       end
 
       it 'outputs to the collection' do
@@ -147,7 +147,6 @@ describe Mongoid::Contextual::MapReduce do
       end
 
       context "when the statstics are requested" do
-        max_server_version '4.2'
 
         it "raises an error" do
           expect {
@@ -192,16 +191,14 @@ describe Mongoid::Contextual::MapReduce do
         Band.where(name: 'DEPECHE MODE').collation(locale: 'en_US', strength: 2)
       end
 
-      context 'when the server supports collations' do
-        min_server_version '3.4'
+      context 'when the server supports collations', if: collation_supported? do
 
         it 'applies the collation' do
           expect(map_reduce.out(inline: 1).count).to eq(1)
         end
       end
 
-      context 'when the server does not support collations' do
-        max_server_version '3.2'
+      context 'when the server does not support collations', unless: collation_supported? do
 
         it 'raises an exception' do
           expect {
@@ -213,7 +210,6 @@ describe Mongoid::Contextual::MapReduce do
   end
 
   describe "#emitted" do
-    max_server_version '4.2'
 
     let(:emitted) do
       map_reduce.out(inline: 1).emitted
@@ -265,7 +261,6 @@ describe Mongoid::Contextual::MapReduce do
   end
 
   describe "#input" do
-    max_server_version '4.2'
 
     let(:input) do
       map_reduce.out(inline: 1).input
@@ -316,7 +311,6 @@ describe Mongoid::Contextual::MapReduce do
   end
 
   describe "#output" do
-    max_server_version '4.2'
 
     let(:output) do
       map_reduce.out(inline: 1).output
@@ -349,16 +343,12 @@ describe Mongoid::Contextual::MapReduce do
       end
 
       context 'when a read preference is defined' do
-        require_topology :replica_set
-        # On 4.4 it seems the server inserts on the primary, not on the server
-        # that executed the map/reduce.
-        max_server_version '4.2'
 
         let(:criteria) do
           Band.all.read(mode: :secondary)
         end
 
-        it "uses the read preference" do
+        it "uses the read preference", if: testing_replica_set? do
 
           expect {
             replace_map_reduce.raw
@@ -369,7 +359,6 @@ describe Mongoid::Contextual::MapReduce do
   end
 
   describe "#reduced" do
-    max_server_version '4.2'
 
     let(:reduced) do
       map_reduce.out(inline: 1).reduced
@@ -400,7 +389,6 @@ describe Mongoid::Contextual::MapReduce do
   end
 
   describe "#time" do
-    max_server_version '4.2'
 
     let(:time) do
       map_reduce.out(inline: 1).time