mongoid 7.0.6 → 7.1.2

data/spec/mongoid/clients/transactions_spec.rb

@@ -1,14 +1,17 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Clients::Sessions do
   before(:all) do
-    unless Mongo::VERSION >= '2.6'
+    if Gem::Version.new(Mongo::VERSION) < Gem::Version.new('2.6')
       skip 'Driver does not support transactions'
     end
   end
 
   before(:all) do
-    if Mongo::VERSION >= '2.6'
+    if Gem::Version.new(Mongo::VERSION) >= Gem::Version.new('2.6')
       CONFIG[:clients][:other] = CONFIG[:clients][:default].dup
       CONFIG[:clients][:other][:database] = 'other'
       Mongoid::Clients.clients.values.each(&:close)
@@ -18,7 +21,7 @@ describe Mongoid::Clients::Sessions do
   end
 
   after(:all) do
-    if Mongo::VERSION >= '2.6'
+    if Gem::Version.new(Mongo::VERSION) >= Gem::Version.new('2.6')
       Mongoid::Clients.with_name(:other).close
       Mongoid::Clients.clients.delete(:other)
     end
@@ -52,7 +55,8 @@ describe Mongoid::Clients::Sessions do
 
   context 'when a transaction is used on a model class' do
 
-    context 'when transactions are supported', if: testing_transactions? do
+    context 'when transactions are supported' do
+      require_transaction_support
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -188,7 +192,10 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when sessions are supported but transactions are not', if: sessions_supported? && !testing_transactions? do
+    context 'when sessions are supported but transactions are not' do
+      min_server_version '3.6'
+      # Could also test 4.0 in sharded cluster
+      max_server_version '3.6'
 
       let!(:error) do
         e = nil
@@ -219,7 +226,8 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when transactions are supported', if: testing_transactions? do
+    context 'when transactions are supported' do
+      require_transaction_support
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -342,16 +350,23 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when sessions are supported but transactions are not', if: sessions_supported? && !testing_transactions? do
+    context 'when sessions are supported but transactions are not' do
+      min_server_version '3.6'
+      # Could also test 4.0 in sharded cluster
+      max_server_version '3.6'
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
         Mongoid::Clients.with_name(:other).command(create: :people)
-        subscriber.clear_events!
-        person.with(client: :other) do
-          example.run
+
+        begin
+          subscriber.clear_events!
+          person.with(client: :other) do
+            example.run
+          end
+        ensure
+          Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
         end
-        Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
       end
 
       let!(:error) do

data/spec/mongoid/clients_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Clients do
@@ -725,7 +728,7 @@ describe Mongoid::Clients do
     end
   end
 
-  describe ".store_in", if: non_legacy_server? do
+  describe ".store_in" do
 
     context "when provided a non hash" do
 
@@ -762,7 +765,7 @@ describe Mongoid::Clients do
     end
   end
 
-  describe ".with", if: non_legacy_server? do
+  describe ".with" do
 
     context "when changing write concern options" do
 

data/spec/mongoid/composable_spec.rb

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

data/spec/mongoid/config/environment_spec.rb

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

data/spec/mongoid/config/options_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Config::Options do
@@ -18,7 +21,7 @@ describe Mongoid::Config::Options do
     context "when a default is provided" do
 
       after do
-        config.preload_models = false
+        config.reset
       end
 
       it "defines a getter" do
@@ -26,11 +29,28 @@ describe Mongoid::Config::Options do
       end
 
       it "defines a setter" do
-        (config.preload_models = expect(true)).to be true
+        expect(config.preload_models = true).to be true
+        expect(config.preload_models).to be true
       end
 
       it "defines a presence check" do
-        expect(config).to_not be_preload_models
+        expect(config.preload_models?).to be false
+      end
+    end
+
+    context 'when option is not a boolean' do
+      before do
+        config.app_name = 'foo'
+      end
+
+      after do
+        config.reset
+      end
+
+      context 'presence check' do
+        it 'is a boolean' do
+          expect(config.app_name?).to be true
+        end
       end
     end
   end

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,7 +77,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let(:criteria) do
         Band.where(members: [ "DAVE" ]).collation(locale: 'en_US', strength: 2)
@@ -98,6 +102,103 @@ 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' do
+      min_server_version '3.4'
+
+      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
@@ -145,7 +246,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ], likes: 60)
@@ -224,7 +326,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -296,7 +399,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -350,7 +454,8 @@ describe Mongoid::Contextual::Atomic do
       expect(smiths.reload.members).to be_nil
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -407,7 +512,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave", "Alan", "Fletch" ])
@@ -464,7 +570,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -529,7 +636,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -590,7 +698,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -749,7 +858,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(name: "Depeche Mode", years: 10)