mongoid 7.5.4 → 8.0.1

data/spec/mongoid/validatable/uniqueness_spec.rb

@@ -120,7 +120,7 @@ describe Mongoid::Validatable::UniquenessValidator do
             it "adds the uniqueness error to the aliased field name" do
               dictionary.valid?
               expect(dictionary.errors).to have_key(:language)
-              expect(dictionary.errors[:language]).to eq([ "is already taken" ])
+              expect(dictionary.errors[:language]).to eq([ "has already been taken" ])
             end
           end
 
@@ -137,7 +137,7 @@ describe Mongoid::Validatable::UniquenessValidator do
             it "adds the uniqueness error to the underlying field name" do
               dictionary.valid?
               expect(dictionary.errors).to have_key(:l)
-              expect(dictionary.errors[:l]).to eq([ "is already taken" ])
+              expect(dictionary.errors[:l]).to eq([ "has already been taken" ])
             end
           end
         end
@@ -239,7 +239,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
                     it "adds the uniqueness error" do
                       dictionary.valid?
-                      expect(dictionary.errors[:description]).to eq([ "is already taken" ])
+                      expect(dictionary.errors[:description]).to eq([ "has already been taken" ])
                     end
                   end
 
@@ -260,7 +260,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
                     it "adds the uniqueness error" do
                       dictionary.valid?
-                      expect(dictionary.errors[:description]).to eq([ "is already taken" ])
+                      expect(dictionary.errors[:description]).to eq([ "has already been taken" ])
                     end
                   end
                 end
@@ -330,7 +330,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
                     it "adds the uniqueness error" do
                       dictionary.valid?
-                      expect(dictionary.errors[:description]).to eq([ "is already taken" ])
+                      expect(dictionary.errors[:description]).to eq([ "has already been taken" ])
                     end
                   end
 
@@ -351,7 +351,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
                     it "adds the uniqueness error" do
                       dictionary.valid?
-                      expect(dictionary.errors[:description]).to eq([ "is already taken" ])
+                      expect(dictionary.errors[:description]).to eq([ "has already been taken" ])
                     end
                   end
                 end
@@ -399,7 +399,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
                 it "adds the uniqueness error" do
                   dictionary.valid?
-                  expect(dictionary.errors[:description]).to eq([ "is already taken" ])
+                  expect(dictionary.errors[:description]).to eq([ "has already been taken" ])
                 end
               end
             end
@@ -460,7 +460,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
               it "adds the uniqueness error" do
                 dictionary.valid?
-                expect(dictionary.errors[:name]).to eq([ "is already taken" ])
+                expect(dictionary.errors[:name]).to eq([ "has already been taken" ])
               end
             end
 
@@ -623,7 +623,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
               it "adds the uniqueness errors" do
                 dictionary.valid?
-                expect(dictionary.errors[:name]).to eq([ "is already taken" ])
+                expect(dictionary.errors[:name]).to eq([ "has already been taken" ])
               end
             end
 
@@ -701,7 +701,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
             it "should set an error for associated object not being unique" do
               item.update_attributes(folder_id: personal_folder.id)
-              expect(item.errors.messages[:name].first).to eq("is already taken")
+              expect(item.errors.messages[:name].first).to eq("has already been taken")
             end
           end
 
@@ -753,7 +753,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
               it "adds the uniqueness errors" do
                 dictionary.valid?
-                expect(dictionary.errors[:name]).to eq([ "is already taken" ])
+                expect(dictionary.errors[:name]).to eq([ "has already been taken" ])
               end
             end
 
@@ -792,7 +792,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
               it "adds the uniqueness errors" do
                 dictionary.valid?
-                expect(dictionary.errors[:name]).to eq([ "is already taken" ])
+                expect(dictionary.errors[:name]).to eq([ "has already been taken" ])
               end
             end
           end
@@ -815,7 +815,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
               expect do
                 Dictionary.create!(name: "French-English", year: 1960)
-              end.to raise_error(Mongoid::Errors::Validations, /Name is already taken/)
+              end.to raise_error(Mongoid::Errors::Validations, /Name has already been taken/)
 
               expect(Dictionary.all.size).to eq(1)
             end
@@ -954,7 +954,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
               it "adds the uniqueness errors" do
                 dictionary.valid?
-                expect(dictionary.errors[:name]).to eq([ "is already taken" ])
+                expect(dictionary.errors[:name]).to eq([ "has already been taken" ])
               end
             end
 
@@ -1018,7 +1018,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
               it "adds the uniqueness error" do
                 dictionary.valid?
-                expect(dictionary.errors[:name]).to eq([ "is already taken" ])
+                expect(dictionary.errors[:name]).to eq([ "has already been taken" ])
               end
             end
 
@@ -1096,7 +1096,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
               it "adds the uniqueness error" do
                 dictionary.valid?
-                expect(dictionary.errors[:name]).to eq([ "is already taken" ])
+                expect(dictionary.errors[:name]).to eq([ "has already been taken" ])
               end
             end
 
@@ -1218,7 +1218,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
               it "adds the uniqueness error" do
                 login.valid?
-                expect(login.errors[:username]).to eq([ "is already taken" ])
+                expect(login.errors[:username]).to eq([ "has already been taken" ])
               end
             end
 
@@ -1323,7 +1323,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
               it "adds the uniqueness errors" do
                 login.valid?
-                expect(login.errors[:username]).to eq([ "is already taken" ])
+                expect(login.errors[:username]).to eq([ "has already been taken" ])
               end
             end
 
@@ -1383,7 +1383,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
               it "adds the uniqueness error" do
                 login.valid?
-                expect(login.errors[:username]).to eq([ "is already taken" ])
+                expect(login.errors[:username]).to eq([ "has already been taken" ])
               end
             end
 
@@ -1461,7 +1461,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
               it "adds the uniqueness error" do
                 login.valid?
-                expect(login.errors[:username]).to eq([ "is already taken" ])
+                expect(login.errors[:username]).to eq([ "has already been taken" ])
               end
             end
 
@@ -1710,7 +1710,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
               it "adds the uniqueness error" do
                 definition.valid?
-                expect(definition.errors[:description]).to eq([ "is already taken" ])
+                expect(definition.errors[:description]).to eq([ "has already been taken" ])
               end
             end
 
@@ -1838,7 +1838,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
               it "adds the uniqueness errors" do
                 definition.valid?
-                expect(definition.errors[:description]).to eq([ "is already taken" ])
+                expect(definition.errors[:description]).to eq([ "has already been taken" ])
               end
             end
 
@@ -1976,7 +1976,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
               it "adds the uniqueness errors" do
                 definition.valid?
-                expect(definition.errors[:description]).to eq([ "is already taken" ])
+                expect(definition.errors[:description]).to eq([ "has already been taken" ])
               end
             end
 
@@ -2040,7 +2040,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
               it "adds the uniqueness error" do
                 definition.valid?
-                expect(definition.errors[:description]).to eq([ "is already taken" ])
+                expect(definition.errors[:description]).to eq([ "has already been taken" ])
               end
             end
 
@@ -2118,7 +2118,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
               it "adds the uniqueness error" do
                 definition.valid?
-                expect(definition.errors[:description]).to eq([ "is already taken" ])
+                expect(definition.errors[:description]).to eq([ "has already been taken" ])
               end
             end
 
@@ -2214,7 +2214,7 @@ describe Mongoid::Validatable::UniquenessValidator do
             it "adds the uniqueness error to the aliased field name" do
               definition.valid?
               expect(definition.errors).to have_key(:part)
-              expect(definition.errors[:part]).to eq([ "is already taken" ])
+              expect(definition.errors[:part]).to eq([ "has already been taken" ])
             end
           end
 
@@ -2231,7 +2231,7 @@ describe Mongoid::Validatable::UniquenessValidator do
             it "adds the uniqueness error to the underlying field name" do
               definition.valid?
               expect(definition.errors).to have_key(:p)
-              expect(definition.errors[:p]).to eq([ "is already taken" ])
+              expect(definition.errors[:p]).to eq([ "has already been taken" ])
             end
           end
 
@@ -2250,7 +2250,7 @@ describe Mongoid::Validatable::UniquenessValidator do
               it "adds the uniqueness error to the aliased field name" do
                 definition.valid?
                 expect(definition.errors).to have_key(:synonyms)
-                expect(definition.errors[:synonyms]).to eq([ "is already taken" ])
+                expect(definition.errors[:synonyms]).to eq([ "has already been taken" ])
               end
             end
 
@@ -2267,7 +2267,7 @@ describe Mongoid::Validatable::UniquenessValidator do
               it "adds the uniqueness error to the aliased field name" do
                 definition.valid?
                 expect(definition.errors).to have_key(:syn)
-                expect(definition.errors[:syn]).to eq([ "is already taken" ])
+                expect(definition.errors[:syn]).to eq([ "has already been taken" ])
               end
             end
           end
@@ -2319,7 +2319,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
               it "adds the uniqueness error" do
                 word_origin.valid?
-                expect(word_origin.errors[:origin_id]).to eq([ "is already taken" ])
+                expect(word_origin.errors[:origin_id]).to eq([ "has already been taken" ])
               end
             end
 
@@ -2444,7 +2444,7 @@ describe Mongoid::Validatable::UniquenessValidator do
     it "should be invalid" do
       subclass_document_with_duplicated_name.tap do |d|
         expect(d).to be_invalid
-        expect(d.errors[:name]).to eq([ "is already taken" ])
+        expect(d.errors[:name]).to eq([ "has already been taken" ])
       end
     end
   end
@@ -2472,4 +2472,33 @@ describe Mongoid::Validatable::UniquenessValidator do
       }.to raise_error(Mongo::Error::OperationFailure)
     end
   end
+
+  describe "i18n" do
+
+    context 'when using a different locale' do
+
+      around do |example|
+        I18n.with_locale(:fr) { example.run }
+      end
+
+      before do
+        # Translation key location is as per rails-i18n gem.
+        # See: https://github.com/svenfuchs/rails-i18n/blob/master/rails/locale/en.yml
+        I18n.backend.store_translations(:fr, { errors: { messages: { taken: 'est déjà utilisé(e)' } } })
+      end
+
+      after do
+        # i18n 1.0 requires +send+ because +translations+ aren't public.
+        # Newer i18n versions have it as public.
+        I18n.backend.send(:translations).delete(:fr)
+      end
+
+      it "correctly translates the error message" do
+        Circus.create!(slogan: 'The Greatest Show on Mars')
+        dict = Circus.new(slogan: 'The Greatest Show on Mars')
+        dict.valid?
+        expect(dict.errors.messages[:slogan]).to eq(["est déjà utilisé(e)"])
+      end
+    end
+  end
 end

data/spec/mongoid/warnings_spec.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Mongoid::Warnings do
+
+  describe ".warn_*" do
+
+    context "when calling a warn_* method" do
+
+      let(:id) { :geo_haystack_deprecated }
+      let(:message) do
+        'The geoHaystack type is deprecated.'
+      end
+
+      before do
+        warn_id = id
+        Mongoid::Warnings.class_eval do
+          instance_variable_set("@#{warn_id}", false)
+        end
+      end
+
+      it "logs the warning" do
+        expect_any_instance_of(Logger).to receive(:warn).once.with(message)
+        Mongoid::Warnings.send("warn_#{id}")
+      end
+
+      it "logs the warning only once" do
+        expect_any_instance_of(Logger).to receive(:warn).once.with(message)
+        Mongoid::Warnings.send("warn_#{id}")
+        Mongoid::Warnings.send("warn_#{id}")
+      end
+    end
+  end
+end

data/spec/mongoid_spec.rb

@@ -51,14 +51,8 @@ describe Mongoid do
     end
 
     it "disconnects from all active clients" do
-      method_name = if Gem::Version.new(Mongo::VERSION) >= Gem::Version.new('2.19.0')
-                      :close
-                    else
-                      :disconnect!
-                    end
-
       clients.each do |client|
-        expect(client.cluster).to receive(method_name).and_call_original
+        expect(client.cluster).to receive(:disconnect!).and_call_original
       end
       Mongoid.disconnect_clients
     end

data/spec/rails/controller_extension/controller_runtime_spec.rb

@@ -30,11 +30,11 @@ describe "Mongoid::Railties::ControllerRuntime" do
 
       clear_metric!
       instance.succeeded event_payload
-      expect(collector.runtime).to eq(42)
+      expect(collector.runtime).to eq(42000)
 
       clear_metric!
       instance.failed event_payload
-      expect(collector.runtime).to eq(42)
+      expect(collector.runtime).to eq(42000)
     end
 
     it "resets the metric and returns the value" do

data/spec/rails/mongoid_spec.rb

@@ -30,6 +30,7 @@ describe "Rails::Mongoid" do
     end
 
     context "when preload models config is false" do
+      config_override :preload_models, false
 
       let(:files) do
         [
@@ -38,10 +39,6 @@ describe "Rails::Mongoid" do
         ]
       end
 
-      before(:all) do
-        Mongoid.preload_models = false
-      end
-
       it "does not load any models" do
         allow(Dir).to receive(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
         expect(Rails::Mongoid).to receive(:load_model).never
@@ -50,10 +47,7 @@ describe "Rails::Mongoid" do
     end
 
     context "when preload models config is true" do
-
-      before(:all) do
-        Mongoid.preload_models = true
-      end
+      config_override :preload_models, true
 
       context "when all models are in the models directory" do
 
@@ -112,6 +106,7 @@ describe "Rails::Mongoid" do
     end
 
     context "even when preload models config is false" do
+      config_override :preload_models, false
 
       let(:files) do
         [
@@ -120,10 +115,6 @@ describe "Rails::Mongoid" do
         ]
       end
 
-      before(:all) do
-        Mongoid.preload_models = false
-      end
-
       it "loads all models" do
         allow(Dir).to receive(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
         expect(Rails::Mongoid).to receive(:load_model).with("address")
@@ -133,6 +124,7 @@ describe "Rails::Mongoid" do
     end
 
     context "when list of models to load was configured" do
+      config_override :preload_models, %w(user AddressNumber)
 
       let(:files) do
         [
@@ -141,10 +133,6 @@ describe "Rails::Mongoid" do
         ]
       end
 
-      before(:all) do
-        Mongoid.preload_models = ["user", "AddressNumber"]
-      end
-
       it "loads selected models only" do
         allow(Dir).to receive(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
         expect(Rails::Mongoid).to receive(:load_model).with("user")

data/spec/shared/lib/mrss/event_subscriber.rb

@@ -84,32 +84,22 @@ module Mrss
 
     # Locates command stated events for the specified command name,
     # asserts that there is exactly one such event, and returns it.
-    def single_command_started_event(command_name, include_auth: false, database_name: nil)
+    def single_command_started_event(command_name, include_auth: false)
       events = if include_auth
                  started_events
                else
                  non_auth_command_started_events
                end
-      get_one_event(events, command_name, 'started', database_name: database_name)
-    end
-
-    # Locates command succeeded events for the specified command name,
-    # asserts that there is exactly one such event, and returns it.
-    def single_command_succeeded_event(command_name, database_name: nil)
-      get_one_event(succeeded_events, command_name, 'succeeded', database_name: database_name)
-    end
-
-    def get_one_event(events, command_name, kind, database_name: nil)
-      events = events.select do |event|
-        event.command_name == command_name and
-        database_name.nil? || database_name == event.database_name
+      events.select! do |event|
+        event.command[command_name]
       end
       if events.length != 1
-        raise "Expected a single '#{command_name}' #{kind} event#{database_name ? " for '#{database_name}'" : ''} but we have #{events.length}"
+        raise "Expected a single #{command_name} event but we have #{events.length}"
       end
       events.first
     end
 
+
     # Get the first succeeded event published for the name, and then delete it.
     #
     # @param [ String ] name The event name.

data/spec/shared/lib/mrss/lite_constraints.rb

@@ -209,14 +209,6 @@ module Mrss
       end
     end
 
-    def require_no_fallbacks
-      before(:all) do
-        if %w(yes true 1).include?((ENV['TEST_I18N_FALLBACKS'] || '').downcase)
-          skip 'Set TEST_I18N_FALLBACKS=0 environment variable to run these tests'
-        end
-      end
-    end
-
     # This is a macro for retrying flaky tests on CI that occasionally fail.
     # Note that the tests will only be retried on CI.
     #

data/spec/shared/shlib/server.sh

@@ -71,12 +71,12 @@ prepare_server_from_url() {
   export PATH="$BINDIR":$PATH
 }
 
-install_mlaunch_venv() {
+install_mlaunch_virtualenv() {
   python3 -V || true
-  if ! python3 -m venv -h >/dev/null; then
+  if ! python3 -m virtualenv -h >/dev/null; then
     # Current virtualenv fails with
     # https://github.com/pypa/virtualenv/issues/1630
-    python3 -m pip install venv --user
+    python3 -m pip install 'virtualenv<20' --user
   fi
   if test "$USE_SYSTEM_PYTHON_PACKAGES" = 1 &&
     python3 -m pip list |grep mtools
@@ -85,13 +85,13 @@ install_mlaunch_venv() {
     :
   else
     venvpath="$MONGO_ORCHESTRATION_HOME"/venv
-    python3 -m venv $venvpath
+    python3 -m virtualenv -p python3 $venvpath
     . $venvpath/bin/activate
     # [mlaunch] does not work:
     # https://github.com/rueckstiess/mtools/issues/856
     # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
     #pip install 'mtools==1.7' 'pymongo==4.1' python-dateutil psutil
-
+    
     # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
     pip install 'mtools-legacy[mlaunch]' 'pymongo<4' python-dateutil
   fi

data/spec/support/constraints.rb

@@ -27,6 +27,30 @@ module Constraints
     Mongo::VERSION.split('.')[0...precision].map(&:to_i)
   end
 
+  def min_bson_version(version)
+    required_version = version.split('.').map(&:to_i)
+    actual_version = bson_version(required_version.length)
+    before(:all) do
+      if (actual_version <=> required_version) < 0
+        skip "bson-ruby version #{version} or higher is required"
+      end
+    end
+  end
+
+  def max_bson_version(version)
+    required_version = version.split('.').map(&:to_i)
+    actual_version = bson_version(required_version.length)
+    before(:all) do
+      if (actual_version <=> required_version) > 0
+        skip "bson-ruby version #{version} or lower is required"
+      end
+    end
+  end
+
+  def bson_version(precision)
+    BSON::VERSION.split('.')[0...precision].map(&:to_i)
+  end
+
   def min_rails_version(version)
     unless version =~ /\A\d+\.\d+\z/
       raise ArgumentError, "Version can only be major.minor: #{version}"

data/spec/support/macros.rb

@@ -39,6 +39,28 @@ module Mongoid
       end
     end
 
+    def driver_config_override(key, value)
+      around do |example|
+        existing = Mongo.send(key)
+
+        Mongo.send("#{key}=", value)
+
+        example.run
+
+        Mongo.send("#{key}=", existing)
+      end
+    end
+
+    def with_driver_config_values(key, *values, &block)
+      values.each do |value|
+        context "when #{key} is #{value}" do
+          driver_config_override key, value
+
+          class_exec(value, &block)
+        end
+      end
+    end
+
     def restore_config_clients
       around do |example|
         # Duplicate the config because some tests mutate it.
@@ -47,5 +69,13 @@ module Mongoid
         Mongoid::Config.send(:clients=, old_config)
       end
     end
+
+    def query_cache_enabled
+      around do |example|
+        Mongoid::QueryCache.cache do
+          example.run
+        end
+      end
+    end
   end
 end

data/spec/support/models/augmentation.rb

@@ -10,4 +10,16 @@ class Augmentation
   after_build do
     self.name = "Infolink (#{player.frags})"
   end
+
+  field :after_find_player
+  field :after_initialize_player
+  field :after_default_player, default: ->{ self.player&._id }
+
+  after_find do |doc|
+    doc.after_find_player = player&._id
+  end
+
+  after_initialize do |doc|
+    doc.after_initialize_player = player&._id
+  end
 end

data/spec/support/models/band.rb

@@ -20,10 +20,13 @@ class Band
   field :y, as: :years, type: Integer
   field :founded, type: Date
   field :deleted, type: Boolean
+  field :mojo, type: Object
+  field :fans
 
   embeds_many :records, cascade_callbacks: true
   embeds_many :notes, as: :noteable, cascade_callbacks: true, validate: false
   embeds_many :labels
+  embeds_many :fanatics
   embeds_one :label, cascade_callbacks: true
 
   scope :highly_rated, -> { gte(rating: 7) }

data/spec/support/models/catalog.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class Catalog
+  include Mongoid::Document
+
+  field :array_field, type: Array
+  field :big_decimal_field, type: BigDecimal
+  field :boolean_field, type: Boolean
+  field :date_field, type: Date
+  field :date_time_field, type: DateTime
+  field :float_field, type: Float
+  field :hash_field, type: Hash
+  field :integer_field, type: Integer
+  field :object_id_field, type: BSON::ObjectId
+  field :binary_field, type: BSON::Binary
+  field :range_field, type: Range
+  field :regexp_field, type: Regexp
+  field :set_field, type: Set
+  field :string_field, type: String
+  field :stringified_symbol_field, type: StringifiedSymbol
+  field :symbol_field, type: Symbol
+  field :time_field, type: Time
+  field :time_with_zone_field, type: ActiveSupport::TimeWithZone
+end

data/spec/support/models/circus.rb

@@ -4,6 +4,9 @@ class Circus
   include Mongoid::Document
 
   field :name
+  field :slogan
+
+  validates_uniqueness_of :slogan, allow_blank: true
 
   embeds_many :animals
 end

data/spec/support/models/fanatic.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class Fanatic
+  include Mongoid::Document
+  field :age, type: Integer
+
+  embedded_in :band
+end