mongoid 7.6.2 → 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/cluster_config.rb

@@ -45,16 +45,23 @@ module Mrss
     end
 
     # Per https://jira.mongodb.org/browse/SERVER-39052, working with FCV
-    # in sharded topologies is annoying. This method returns FCV when in single
+    # in sharded topologies is annoying. Also, FCV doesn't exist in servers
+    # less than 3.4. This method returns FCV on 3.4+ servers when in single
     # or RS topologies, and otherwise returns the major.minor server version.
     def fcv_ish
       if server_version.nil?
         raise "Deployment server version not known - check that connection to deployment succeeded"
       end
 
-      return fcv unless sharded_ish?
-
-      short_server_version
+      if server_version >= '3.4' && !sharded_ish?
+        fcv
+      else
+        if short_server_version == '4.1'
+          '4.2'
+        else
+          short_server_version
+        end
+      end
     end
 
     # @return [ Mongo::Address ] The address of the primary in the deployment.
@@ -106,6 +113,34 @@ module Mrss
       @topology
     end
 
+    def storage_engine
+      @storage_engine ||= begin
+        # 2.6 does not have wired tiger
+        if short_server_version == '2.6'
+          :mmapv1
+        else
+          client = ClientRegistry.instance.global_client('root_authorized')
+          if sharded_ish?
+            shards = client.use(:admin).command(listShards: 1).first
+            if shards['shards'].empty?
+              raise 'Shards are empty'
+            end
+            shard = shards['shards'].first
+            address_str = shard['host'].sub(/^.*\//, '').sub(/,.*/, '')
+            client = ClusterTools.instance.direct_client(address_str,
+              SpecConfig.instance.test_options.merge(SpecConfig.instance.auth_options).merge(connect: :direct))
+          end
+          rv = client.use(:admin).command(serverStatus: 1).first
+          rv = rv['storageEngine']['name']
+          rv_map = {
+            'wiredTiger' => :wired_tiger,
+            'mmapv1' => :mmapv1,
+          }
+          rv_map[rv] || rv
+        end
+      end
+    end
+
     # This method returns an alternate address for connecting to the configured
     # deployment. For example, if the replica set is configured with nodes at
     # of localhost:27017 and so on, this method will return 127.0.0.:27017.
@@ -181,7 +216,7 @@ module Mrss
         {}
       end
 
-      unless sharded_ish?
+      if !sharded_ish? && short_server_version >= '3.4'
         rv = @server_parameters['featureCompatibilityVersion']
         @fcv = rv['version'] || rv
       end

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

@@ -69,15 +69,22 @@ module Mrss
       before(:all) do
         case ClusterConfig.instance.topology
         when :single
-          skip 'Transactions tests require a replica set or a sharded cluster'
-        when :replica_set, :sharded, :load_balanced
+          skip 'Transactions tests require a replica set (4.0+) or a sharded cluster (4.2+)'
+        when :replica_set
+          unless ClusterConfig.instance.server_version >= '4.0'
+            skip 'Transactions tests in a replica set topology require server 4.0+'
+          end
+        when :sharded, :load_balanced
+          unless ClusterConfig.instance.server_version >= '4.2'
+            skip 'Transactions tests in a sharded cluster topology require server 4.2+'
+          end
         else
-          raise NotImplementedError, "Unknown topology #{ClusterConfig.instance.topology}"
+          raise NotImplementedError
         end
       end
     end
 
-    # Fail command fail point requires transactions to be supported
+    # Fail command fail point was added to mongod in 4.0 and to mongos in 4.2.
     def require_fail_command
       require_transaction_support
     end
@@ -232,11 +239,13 @@ module Mrss
     end
 
     # Can the driver specify a write concern that won't be overridden?
-    # (mongos overrides the write concern)
+    # (mongos 4.0+ overrides the write concern)
     def require_set_write_concern
       before(:all) do
-        if %i(sharded load_balanced).include?(ClusterConfig.instance.topology)
-          skip "mongos overrides write concern"
+        if %i(sharded load_balanced).include?(ClusterConfig.instance.topology) &&
+          ClusterConfig.instance.short_server_version >= '4.0'
+        then
+          skip "mongos 4.0+ overrides write concern"
         end
       end
     end
@@ -274,6 +283,36 @@ module Mrss
 
     alias :require_no_multi_shard :require_no_multi_mongos
 
+    def require_wired_tiger
+      before(:all) do
+        # Storage detection fails for serverless instances. However, it is safe to
+        # assume that a serverless instance uses WiredTiger Storage Engine.
+        if !SpecConfig.instance.serverless? && ClusterConfig.instance.storage_engine != :wired_tiger
+          skip 'Test requires WiredTiger storage engine'
+        end
+      end
+    end
+
+    def require_wired_tiger_on_36
+      before(:all) do
+        if ClusterConfig.instance.short_server_version >= '3.6'
+          # Storage detection fails for serverless instances. However, it is safe to
+          # assume that a serverless instance uses WiredTiger Storage Engine.
+          if !SpecConfig.instance.serverless? && ClusterConfig.instance.storage_engine != :wired_tiger
+            skip 'Test requires WiredTiger storage engine on 3.6+ servers'
+          end
+        end
+      end
+    end
+
+    def require_mmapv1
+      before(:all) do
+        if SpecConfig.instance.serverless? || ClusterConfig.instance.storage_engine != :mmapv1
+          skip 'Test requires MMAPv1 storage engine'
+        end
+      end
+    end
+
     def require_enterprise
       before(:all) do
         unless ClusterConfig.instance.enterprise?

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

@@ -84,12 +84,12 @@ module Mrss
         arg.split('=', 2)
       end]
 
-      @env['RVM_RUBY'] ||= 'ruby-3.2'
+      @env['RVM_RUBY'] ||= 'ruby-2.7'
       unless ruby =~ /^j?ruby-/
         raise "RVM_RUBY option is not in expected format: #{ruby}"
       end
 
-      @env['MONGODB_VERSION'] ||= '8.0'
+      @env['MONGODB_VERSION'] ||= '4.4'
     end
 
     def create_dockerfile
@@ -178,10 +178,12 @@ module Mrss
 
     def distro
       @options[:distro] || if app_tests?
-          'ubuntu2004'
+        'ubuntu2004'
         else
           case server_version
-          when '4.2'
+          when '3.6'
+            'debian9'
+          when '4.0', '4.2'
             'ubuntu1804'
           else
             'ubuntu2004'
@@ -190,11 +192,15 @@ module Mrss
     end
 
     BASE_IMAGES = {
-      'debian11' => 'debian:bullseye',
+      'debian81' => 'debian:jessie',
+      'debian92' => 'debian:stretch',
+      'debian10' => 'debian:buster',
+      'ubuntu1404' => 'ubuntu:trusty',
+      'ubuntu1604' => 'ubuntu:xenial',
       'ubuntu1804' => 'ubuntu:bionic',
       'ubuntu2004' => 'ubuntu:focal',
-      'ubuntu2204' => 'ubuntu:jammy',
-      'ubuntu2404' => 'ubuntu:noble',
+      'rhel62' => 'centos:6',
+      'rhel70' => 'centos:7',
     }.freeze
 
     def base_image
@@ -225,10 +231,6 @@ module Mrss
       distro =~ /debian|ubuntu/
     end
 
-    def ubuntu?
-      distro=~ /ubuntu/
-    end
-
     def preload?
       !!@options[:preload]
     end
@@ -247,12 +249,14 @@ module Mrss
 
     def libmongocrypt_path
       case distro
-      when /ubuntu..04/
-        "./#{distro}-64/nocrypto/lib64/libmongocrypt.so"
-      when /debian../
-        "./#{distro}/nocrypto/lib64/libmongocrypt.so"
+      when /ubuntu1604/
+        "./ubuntu1604/nocrypto/lib64/libmongocrypt.so"
+      when /ubuntu1804/
+        "./ubuntu1804-64/nocrypto/lib64/libmongocrypt.so"
+      when /debian92/
+        "./debian92/nocrypto/lib64/libmongocrypt.so"
       else
-        raise "This script does not support running FLE tests on #{distro}."
+        raise "This script does not support running FLE tests on #{distro}. Use ubuntu1604, ubuntu1804 or debian92 instead"
       end
     end
 
@@ -271,7 +275,7 @@ module Mrss
 
     def num_exposed_ports
       case @env['TOPOLOGY'] || 'standalone'
-      when 'standalone', 'replica-set-single-node'
+      when 'standalone'
         1
       when 'replica-set'
         3