mongoid 7.4.3 → 8.0.7

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,32 @@ 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

@@ -52,7 +52,7 @@ describe Mongoid do
 
     it "disconnects from all active clients" do
       clients.each do |client|
-        expect(client.cluster).to receive(:disconnect!).and_call_original
+        expect(client).to receive(:close).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/docker_runner.rb

@@ -195,12 +195,15 @@ module Mrss
       'debian81' => 'debian:jessie',
       'debian92' => 'debian:stretch',
       'debian10' => 'debian:buster',
+      'debian11' => 'debian:bullseye',
       'ubuntu1404' => 'ubuntu:trusty',
       'ubuntu1604' => 'ubuntu:xenial',
       'ubuntu1804' => 'ubuntu:bionic',
       'ubuntu2004' => 'ubuntu:focal',
+      'ubuntu2204' => 'ubuntu:jammy',
       'rhel62' => 'centos:6',
       'rhel70' => 'centos:7',
+      'rhel80' => 'rockylinux:8',
     }.freeze
 
     def base_image
@@ -231,6 +234,10 @@ module Mrss
       distro =~ /debian|ubuntu/
     end
 
+    def ubuntu?
+      distro=~ /ubuntu/
+    end
+
     def preload?
       !!@options[:preload]
     end

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

@@ -98,8 +98,8 @@ module Mrss
     def min_libmongocrypt_version(version)
       require_libmongocrypt
       before(:all) do
-        actual_version = Gem::Version.new(Mongo::Crypt::Binding.mongocrypt_version(nil))
-        min_version = Gem::Version.new(version)
+        actual_version = Utils.parse_version(Mongo::Crypt::Binding.mongocrypt_version(nil))
+        min_version = Utils.parse_version(version)
         unless actual_version >= min_version
           skip "libmongocrypt version #{min_version} required, but version #{actual_version} is available"
         end
@@ -209,6 +209,14 @@ 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/lib/mrss/server_version_registry.rb

@@ -24,6 +24,21 @@ module Mrss
 
     attr_reader :desired_version, :arch
 
+    def target_arch
+      # can't use RbConfig::CONFIG["arch"] because JRuby doesn't
+      # return anything meaningful there.
+      #
+      # also, need to use `uname -a` instead of (e.g.) `uname -p`
+      # because debian (at least) does not return anything meaningful
+      # for `uname -p`.
+      uname = `uname -a`.strip
+      @target_arch ||= case uname
+        when /aarch/ then "aarch64"
+        when /x86/   then "x86_64"
+        else raise "unsupported architecture #{uname.inspect}"
+        end
+    end
+
     def download_url
       @download_url ||= begin
         version, version_ok = detect_version(current_catalog)
@@ -40,35 +55,13 @@ module Mrss
         end
         dl = version['downloads'].detect do |dl|
           dl['archive']['url'].index("enterprise-#{arch}") &&
-          dl['arch'] == 'x86_64'
+          dl['arch'] == target_arch
         end
         unless dl
           raise MissingDownloadUrl, "No download for #{arch} for #{version['version']}"
         end
         url = dl['archive']['url']
       end
-    rescue MissingDownloadUrl
-      if %w(2.6 3.0).include?(desired_version) && arch == 'ubuntu1604'
-        # 2.6 and 3.0 are only available for ubuntu1204 and ubuntu1404.
-        # Those ubuntus have ancient Pythons that don't work due to not
-        # implementing recent TLS protocols.
-        # Because of this we test on ubuntu1604 which has a newer Python.
-        # But we still need to retrieve ubuntu1404-targeting builds.
-        url = self.class.new('3.2', arch).download_url
-        unless url.include?('3.2.')
-          raise 'URL not in expected format'
-        end
-        url = case desired_version
-        when '2.6'
-          url.sub(/\b3\.2\.\d+/, '2.6.12')
-        when '3.0'
-          url.sub(/\b3\.2\.\d+/, '3.0.15')
-        else
-          raise NotImplementedError
-        end.sub('ubuntu1604', 'ubuntu1404')
-      else
-        raise
-      end
     end
 
     private

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

@@ -3,13 +3,35 @@
 
 module Mrss
   module Utils
+    extend self
 
-    module_function def print_backtrace(dest=STDERR)
-      begin
-        hello world
-      rescue => e
-        dest.puts e.backtrace.join("\n")
-      end
+    def print_backtrace(dest=STDERR)
+      raise
+    rescue => e
+      dest.puts e.backtrace.join("\n")
+    end
+
+    # Parses the given version string, accounting for suffix information that
+    # Gem::Version cannot successfully parse.
+    #
+    # @param [ String ] version the version to parse
+    #
+    # @return [ Gem::Version ] the parsed version
+    #
+    # @raise [ ArgumentError ] if the string cannot be parsed.
+    def parse_version(version)
+      Gem::Version.new(version)
+    rescue ArgumentError
+      match = version.match(/\A(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)?(-[A-Za-z\+\d]+)?\z/)
+      raise ArgumentError.new("Malformed version number string #{version}") if match.nil?
+
+      Gem::Version.new(
+        [
+          match[:major],
+          match[:minor],
+          match[:patch]
+        ].join('.')
+      )
     end
   end
 end