mongoid 8.0.11 → 8.1.0

data/spec/mongoid/traversable_spec.rb

@@ -531,9 +531,9 @@ describe Mongoid::Traversable do
         end
 
         context "before class creation" do
-          before do
-            Mongoid.discriminator_key = "test"
+          config_override :discriminator_key, "test"
 
+          before do
             class PreGlobalDiscriminatorParent
               include Mongoid::Document
             end
@@ -542,10 +542,6 @@ describe Mongoid::Traversable do
             end
           end
 
-          after do
-            Mongoid.discriminator_key = "_type"
-          end
-
           it "creates a field with new discriminator key in the parent" do
             expect(PreGlobalDiscriminatorParent.fields.keys).to include("test")
           end
@@ -677,9 +673,9 @@ describe Mongoid::Traversable do
         end
 
         context "before class creation" do
-          before do
-            Mongoid.discriminator_key = :test
+          config_override :discriminator_key, :test
 
+          before do
             class PreGlobalSymDiscriminatorParent
               include Mongoid::Document
             end
@@ -688,10 +684,6 @@ describe Mongoid::Traversable do
             end
           end
 
-          after do
-            Mongoid.discriminator_key = "_type"
-          end
-
           it "creates a field with new discriminator key as a string in the parent" do
             expect(PreGlobalSymDiscriminatorParent.fields.keys).to include("test")
           end
@@ -829,8 +821,9 @@ describe Mongoid::Traversable do
     end
 
     context "when setting a field equal to discriminator key and duplicate_fields_exception is true" do
+      config_override :duplicate_fields_exception, true
+
       before do
-        Mongoid.duplicate_fields_exception = true
 
         class DuplicateDiscriminatorKeyParent
           include Mongoid::Document
@@ -841,10 +834,6 @@ describe Mongoid::Traversable do
         end
       end
 
-      after do
-        Mongoid.duplicate_fields_exception = false
-      end
-
       it "does not raise an error" do
         expect do
           DuplicateDiscriminatorKeyParent.discriminator_key = "dkey"
@@ -871,9 +860,10 @@ describe Mongoid::Traversable do
     end
 
     context "when setting a field equal to global discriminator key and duplicate_fields_exception is true" do
+      config_override :duplicate_fields_exception, true
+      config_override :discriminator_key, "dkey"
+
       before do
-        Mongoid.duplicate_fields_exception = true
-        Mongoid.discriminator_key = "dkey"
 
         class GlobalDuplicateDiscriminatorKeyParent
           include Mongoid::Document
@@ -883,11 +873,6 @@ describe Mongoid::Traversable do
         end
       end
 
-      after do
-        Mongoid.duplicate_fields_exception = false
-        Mongoid.discriminator_key = "_type"
-      end
-
       it "raises an error" do
         expect do
           GlobalDuplicateDiscriminatorKeyParent.class_eval do

data/spec/mongoid/validatable/associated_spec.rb

@@ -37,18 +37,12 @@ describe Mongoid::Validatable::AssociatedValidator do
           User.new(name: "test")
         end
 
-        let(:description1) do
-          Description.new
-        end
-
-        let(:description2) do
+        let(:description) do
           Description.new
         end
 
         before do
-          user.descriptions << description1
-          user.descriptions << description2
-          user.valid?
+          user.descriptions << description
         end
 
         it "only validates the parent once" do
@@ -56,16 +50,12 @@ describe Mongoid::Validatable::AssociatedValidator do
         end
 
         it "adds the errors from the relation" do
+          user.valid?
           expect(user.errors[:descriptions]).to_not be_nil
         end
 
-        it 'reports all failed validations' do
-          errors = user.descriptions.flat_map { |d| d.errors[:details] }
-          expect(errors.length).to be == 2
-        end
-
         it "only validates the child once" do
-          expect(description1).to_not be_valid
+          expect(description).to_not be_valid
         end
       end
 
@@ -85,6 +75,7 @@ describe Mongoid::Validatable::AssociatedValidator do
         end
 
         it "does not run validation on them" do
+          expect(description).to receive(:valid?).never
           expect(user).to be_valid
         end
 
@@ -93,14 +84,14 @@ describe Mongoid::Validatable::AssociatedValidator do
     end
   end
 
-  describe "#validate" do
+  describe "#validate_each" do
 
     let(:person) do
       Person.new
     end
 
     let(:validator) do
-      described_class.new(attributes: person.relations.keys)
+      described_class.new(attributes: person.attributes)
     end
 
     context "when the association is a one to one" do
@@ -108,7 +99,7 @@ describe Mongoid::Validatable::AssociatedValidator do
       context "when the association is nil" do
 
         before do
-          validator.validate(person)
+          validator.validate_each(person, :name, nil)
         end
 
         it "adds no errors" do
@@ -117,9 +108,14 @@ describe Mongoid::Validatable::AssociatedValidator do
       end
 
       context "when the association is valid" do
+
+        let(:associated) do
+          double(valid?: true, flagged_for_destroy?: false)
+        end
+
         before do
-          person.name = Name.new(first_name: 'A', last_name: 'B')
-          validator.validate(person)
+          expect(associated).to receive(:validated?).and_return(false)
+          validator.validate_each(person, :name, associated)
         end
 
         it "adds no errors" do
@@ -129,9 +125,13 @@ describe Mongoid::Validatable::AssociatedValidator do
 
       context "when the association is invalid" do
 
+        let(:associated) do
+          double(valid?: false, flagged_for_destroy?: false)
+        end
+
         before do
-          person.name = Name.new(first_name: 'Jamis', last_name: 'Buck')
-          validator.validate(person)
+          expect(associated).to receive(:validated?).and_return(false)
+          validator.validate_each(person, :name, associated)
         end
 
         it "adds errors to the parent document" do
@@ -149,7 +149,7 @@ describe Mongoid::Validatable::AssociatedValidator do
       context "when the association is empty" do
 
         before do
-          validator.validate(person)
+          validator.validate_each(person, :addresses, [])
         end
 
         it "adds no errors" do
@@ -159,9 +159,13 @@ describe Mongoid::Validatable::AssociatedValidator do
 
       context "when the association has invalid documents" do
 
+        let(:associated) do
+          double(valid?: false, flagged_for_destroy?: false)
+        end
+
         before do
-          person.addresses << Address.new(street: '123')
-          validator.validate(person)
+          expect(associated).to receive(:validated?).and_return(false)
+          validator.validate_each(person, :addresses, [ associated ])
         end
 
         it "adds errors to the parent document" do
@@ -171,10 +175,13 @@ describe Mongoid::Validatable::AssociatedValidator do
 
       context "when the association has all valid documents" do
 
+        let(:associated) do
+          double(valid?: true, flagged_for_destroy?: false)
+        end
+
         before do
-          person.addresses << Address.new(street: '123 First St')
-          person.addresses << Address.new(street: '456 Second St')
-          validator.validate(person)
+          expect(associated).to receive(:validated?).and_return(false)
+          validator.validate_each(person, :addresses, [ associated ])
         end
 
         it "adds no errors" do

data/spec/mongoid/validatable/numericality_spec.rb

@@ -28,21 +28,5 @@ describe ActiveModel::Validations::NumericalityValidator do
         expect(model).to_not be_valid
       end
     end
-
-    context 'when the value is numeric' do
-      let(:model) { TestModel.new(amount: '15.0') }
-
-      it 'returns true' do
-        expect(model).to be_valid
-      end
-    end
-
-    context 'when the value is a BSON::Decimal128' do
-      let(:model) { TestModel.new(amount: BSON::Decimal128.new('15.0')) }
-
-      it 'returns true' do
-        expect(model).to be_valid
-      end
-    end
   end
 end

data/spec/mongoid/validatable/uniqueness_spec.rb

@@ -2476,11 +2476,10 @@ describe Mongoid::Validatable::UniquenessValidator do
   describe "i18n" do
 
     context 'when using a different locale' do
-      around do |example|
-        I18n.with_locale(:fr) { example.run }
-      end
+      with_default_i18n_configs
 
       before do
+        I18n.locale = :fr
         # 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)' } } })

data/spec/mongoid_spec.rb

@@ -13,22 +13,46 @@ describe Mongoid do
       end
     end
 
-    context "when a block is supplied" do
+    context "when a block is given" do
+      config_override :preload_models, false
 
-      before do
-        Mongoid.configure do |config|
-          config.preload_models = true
+      context "with arity 0" do
+
+        before do
+          Mongoid.configure do
+            config.preload_models = true
+          end
+        end
+
+        it "sets the values on the config instance" do
+          expect(Mongoid.preload_models).to be true
         end
       end
 
-      after do
-        Mongoid.configure do |config|
-          config.preload_models = false
+      context "with arity 1" do
+
+        before do
+          Mongoid.configure do |config|
+            config.preload_models = true
+          end
+        end
+
+        it "sets the values on the config instance" do
+          expect(Mongoid.preload_models).to be true
         end
       end
 
-      it "sets the values on the config instance" do
-        expect(Mongoid.preload_models).to be true
+      context "with arity 2" do
+
+        before do
+          Mongoid.configure do |config, _other|
+            config.preload_models = true
+          end
+        end
+
+        it "sets the values on the config instance" do
+          expect(Mongoid.preload_models).to be true
+        end
       end
     end
   end
@@ -51,8 +75,10 @@ describe Mongoid do
     end
 
     it "disconnects from all active clients" do
+      pending 'https://jira.mongodb.org/browse/MONGOID-5621'
+
       clients.each do |client|
-        expect(client).to receive(:close).and_call_original
+        expect(client.cluster).to receive(:disconnect!).and_call_original
       end
       Mongoid.disconnect_clients
     end

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

@@ -282,7 +282,7 @@ module Mrss
 
     def num_exposed_ports
       case @env['TOPOLOGY'] || 'standalone'
-      when 'standalone', 'replica-set-single-node'
+      when 'standalone'
         1
       when 'replica-set'
         3

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

@@ -19,7 +19,7 @@ module Mrss
     end
 
     def initialize(desired_version, arch)
-      @desired_version, @arch = desired_version, arch.sub(/-arm$/, '')
+      @desired_version, @arch = desired_version, arch
     end
 
     attr_reader :desired_version, :arch

data/spec/shared/share/Dockerfile.erb

@@ -1,9 +1,26 @@
+# Python toolchain as of this writing is available on rhel62, debian92 and
+# ubuntu1604.
+#
+# To run rhel62 in docker, host system must be configured to emulate syscalls:
+# https://github.com/CentOS/sig-cloud-instance-images/issues/103
+
 <%
 
+python_toolchain_url = "https://s3.amazonaws.com//mciuploads/mongo-python-driver-toolchain/#{distro}/ba92de2700c04ee2d4f82c3ffdfc33105140cb04/mongo_python_driver_toolchain_#{distro.gsub('-', '_')}_ba92de2700c04ee2d4f82c3ffdfc33105140cb04_19_11_14_15_33_33.tar.gz"
+# server_version = '4.3.3'
+server_url = "http://downloads.10gen.com/linux/mongodb-linux-x86_64-enterprise-#{distro}-#{server_version}.tgz"
+server_archive_basename = File.basename(server_url)
+server_extracted_dir = server_archive_basename.sub(/\.(tar\.gz|tgz)$/, '')
+
+# When changing, also update the hash in shlib/set_env.sh.
+TOOLCHAIN_VERSION='e8c60866f54bed7e336a37df3a97d6ae1b971b7d'
+
 def ruby_toolchain_url(ruby)
-  "http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-toolchain/library/#{distro}/#{ruby}.tar.xz"
+  "http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-driver/#{TOOLCHAIN_VERSION}/#{distro}/#{ruby}.tar.xz"
 end
 
+#ruby_toolchain_url = "https://s3.amazonaws.com//mciuploads/mongo-ruby-toolchain/#{distro}/#{TOOLCHAIN_VERSION}/mongo_ruby_driver_toolchain_#{distro.gsub('-', '_')}_patch_#{TOOLCHAIN_VERSION}_#{toolchain_lower}.tar.gz"
+
 %>
 
 FROM <%= base_image %>
@@ -20,6 +37,18 @@ ENV DOCKER=1
 
 <% end %>
 
+<% if ruby_head? %>
+
+  # To use current versions of mlaunch, Python 3.7+ is required.
+  # Many distros ship with older Pythons, therefore we need to install
+  # a newer Python from somewhere. This section installs the Python
+  # toolchain which comes with recent Pythons.
+
+  #RUN curl --retry 3 -fL <%= python_toolchain_url %> -o python-toolchain.tar.gz
+  #RUN tar -xC /opt -zf python-toolchain.tar.gz
+
+<% end %>
+
 <% if debian? %>
 
   # zsh is not required for any scripts but it is a better interactive shell
@@ -27,7 +56,7 @@ ENV DOCKER=1
   # Ruby runtime dependencies: libyaml-0-2
   # Compiling ruby libraries: gcc make
   # Compiling python packages: python3-dev
-  # JRuby: openjdk-17-jdk-headless
+  # JRuby: openjdk-8-jdk-headless
   # Server dependencies: libsnmp30 libcurl3/libcurl4
   # Determining OS we are running on: lsb-release
   # Load balancer testing: haproxy
@@ -49,11 +78,11 @@ ENV DOCKER=1
 
   <% packages = %w(
     procps lsb-release bzip2 curl wget gpg zsh
-    git make gcc g++ libyaml-dev libgmp-dev zlib1g-dev libsnappy-dev
+    git make gcc libyaml-0-2 libgmp-dev zlib1g-dev libsnappy-dev
     krb5-user krb5-kdc krb5-admin-server libsasl2-dev libsasl2-modules-gssapi-mit
-    haproxy libcurl4
-    tzdata shared-mime-info software-properties-common xz-utils nodejs npm
-    openjdk-17-jdk-headless
+    haproxy
+    python3-pip
+    tzdata shared-mime-info software-properties-common
   ) %>
 
   <% if distro =~ /ubuntu2004/ %>
@@ -72,6 +101,26 @@ ENV DOCKER=1
     <% packages << 'python3-venv' %>
   <% end %>
 
+  <% if distro =~ /debian10|ubuntu2204|debian11/ %>
+    <% packages << 'openjdk-11-jdk-headless' %>
+  <% elsif distro =~ /ubuntu1404/ %>
+    # Ubuntu 14.04 only has openjdk 7, this is too old to be useful
+  <% else %>
+    <% packages << 'openjdk-8-jdk-headless' %>
+  <% end %>
+
+  # ubuntu1404, ubuntu1604: libcurl3
+  # ubuntu1804, ubuntu2004, debian10: libcurl4
+  <% if distro =~ /ubuntu1804|ubuntu2004|ubuntu2204|debian10|debian11/ %>
+    <% packages << 'libcurl4' %>
+  <% else %>
+    <% packages << 'libcurl3' %>
+  <% end %>
+
+  <% if distro =~ /ubuntu1804|ubuntu2004|ubuntu2204/ %>
+    <% packages << 'nodejs' %>
+  <% end %>
+
   <% if distro =~ /ubuntu2004|ubuntu2204/ %>
     <% packages += %w(ruby bundler) %>
   <% end %>
@@ -82,11 +131,33 @@ ENV DOCKER=1
     RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
     RUN echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null
   <% end %>
-  RUN apt-add-repository ppa:deadsnakes/ppa -y
-  RUN apt-get update && apt-get install -y cmake python3.10 python3.10-dev python3.10-venv
-  RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.10 1
+  RUN apt-get update && apt-get install -y cmake
+
 <% else %>
 
+  <% if distro =~ /rhel6/ %>
+
+    # CentOS 6 is dead - to use it retrieve the packages from vault:
+    # https://stackoverflow.com/questions/53562691/error-cannot-retrieve-repository-metadata-repomd-xml-for-repository-base-pl
+
+    <%
+
+      cfg = <<-CFG
+[base]
+name=CentOS-$releasever - Base
+#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os
+#baseurl=http://mirror.centos.org/centos/$releasever/os/$basearch/
+baseurl=http://vault.centos.org/6.10/os/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
+CFG
+
+    %>
+
+    RUN printf "<%= cfg.gsub("\n", "\\n") %>" >/etc/yum.repos.d/CentOS-Base.repo
+
+  <% end %>
+
   # Enterprise server: net-snmp
   # lsb_release: redhat-lsb-core
   # our runner scripts: which
@@ -95,15 +166,15 @@ ENV DOCKER=1
   # Kerberos tests: krb5-workstation + cyrus-sasl-devel to build the
   # mongo_kerberos gem + cyrus-sasl-gssapi for authentication to work
   # Local Kerberos server: krb5-server
-  # JRuby: java-17-openjdk
+  # JRuby: java-1.8.0-openjdk
   #
   # Note: lacking cyrus-sasl-gssapi produces a cryptic message
   # "SASL(-4): no mechanism available: No worthy mechs found"
   # https://github.com/farorm/python-ad/issues/10
 
-  RUN yum --enablerepo=powertools install -y redhat-lsb-core which git gcc gcc-c++ libyaml-devel krb5-server \
-    krb5-workstation cyrus-sasl-devel cyrus-sasl-gssapi java-17-openjdk \
-    net-snmp python38 python38-devel cmake nodejs npm xz
+  RUN yum install -y redhat-lsb-core which git gcc libyaml krb5-server \
+    krb5-workstation cyrus-sasl-devel cyrus-sasl-gssapi java-1.8.0-openjdk \
+    net-snmp python38 python38-devel cmake nodejs
 
 <% end %>
 
@@ -177,6 +248,7 @@ ENV DOCKER=1
     RUN curl --retry 3 -fL <%= ruby_toolchain_url(ruby) %> |tar -xC /opt -Jf -
     ENV PATH=/opt/rubies/<%= ruby %>/bin:$PATH \
       USE_OPT_TOOLCHAIN=1
+    #ENV PATH=/opt/rubies/python/3/bin:$PATH
 
   <% end %>
 
@@ -219,8 +291,6 @@ WORKDIR /app
   ENV DOCKER_PRELOAD=1
 <% end %>
 
-RUN npm install --global yarn
-
 ENV MONGO_ORCHESTRATION_HOME=/tmpfs \
   PROJECT_DIRECTORY=/app \
   <%= @env.map { |k, v| %Q`#{k}="#{v.gsub('$', "\\$").gsub('"', "\\\"")}"` }.join(" \\\n  ") %>

data/spec/shared/shlib/distro.sh

@@ -64,16 +64,6 @@ _detect_distro() {
       release=`echo $release |sed -e s/7/70/ -e s/6/62/ -e s/8/80/`
       distro=rhel$release
     fi
-  elif test -f /etc/os-release; then
-    name=`grep -o '^NAME=.*' /etc/os-release | awk -F '"' '{ print $2 }'`
-    version=`grep -o '^VERSION=.*' /etc/os-release | awk -F '"' '{ print $2 }'`
-    if test "$name" = "Amazon Linux"; then
-      distro=amazon$version
-    else
-      cat /etc/os-release
-      echo 'Unknown distro' 1>&2
-      exit 1
-    fi
   else
     lsb_release -a
     echo 'Unknown distro' 1>&2

data/spec/shared/shlib/server.sh

@@ -35,34 +35,38 @@ add_uri_option() {
 }
 
 prepare_server() {
+  arch=$1
+
   if test -n "$USE_OPT_MONGODB"; then
     export BINDIR=/opt/mongodb/bin
     export PATH=$BINDIR:$PATH
     return
   fi
 
-  . $PROJECT_DIRECTORY/.mod/drivers-evergreen-tools/.evergreen/download-mongodb.sh
+  if test "$MONGODB_VERSION" = latest; then
+    # Test on the most recent published 4.3 release.
+    # https://jira.mongodb.org/browse/RUBY-1724
 
-  get_distro
-  arch="${1:-$DISTRO}"
+    . $PROJECT_DIRECTORY/.mod/drivers-evergreen-tools/.evergreen/download-mongodb.sh
+
+    get_distro
+    get_mongodb_download_url_for "$DISTRO" "latest"
+    prepare_server_from_url $MONGODB_DOWNLOAD_URL
+  else
+    download_version="$MONGODB_VERSION"
+    url=`$(dirname $0)/get-mongodb-download-url $download_version $arch`
+    prepare_server_from_url $url
+  fi
 
-  get_mongodb_download_url_for "$arch" "$MONGODB_VERSION"
-  prepare_server_from_url "$MONGODB_DOWNLOAD_URL" "$MONGOSH_DOWNLOAD_URL"
 }
 
 prepare_server_from_url() {
-  server_url=$1
-  mongosh_url=$2
+  url=$1
 
-  dirname=`basename $server_url |sed -e s/.tgz//`
+  dirname=`basename $url |sed -e s/.tgz//`
   mongodb_dir="$MONGO_ORCHESTRATION_HOME"/mdb/"$dirname"
   mkdir -p "$mongodb_dir"
-  curl --retry 3 $server_url | tar xz -C "$mongodb_dir" --strip-components 1 -f -
-
-  if test -n "$mongosh_url"; then
-    curl --retry 3 $mongosh_url | tar xz -C "$mongodb_dir" --strip-components 1 -f -
-  fi
-
+  curl --retry 3 $url | tar xz -C "$mongodb_dir" --strip-components 1 -f -
   BINDIR="$mongodb_dir"/bin
   export PATH="$BINDIR":$PATH
 }
@@ -100,7 +104,6 @@ install_mlaunch_venv() {
     #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 --upgrade setuptools
     pip install 'mtools-legacy[mlaunch]' 'pymongo<4' python-dateutil
   fi
 }
@@ -166,26 +169,13 @@ install_mlaunch_git() {
   fi
 }
 
-install_haproxy() {
-  if ! command -v haproxy &> /dev/null; then
-    if ! command -v apt-get &> /dev/null; then
-      # no apt-get; assume RHEL
-      sudo yum -y install haproxy
-    else
-      sudo apt-get update && sudo apt-get install --yes haproxy
-    fi
-  else
-    echo 'haproxy is present'
-  fi
-}
-
 install_cmake() {
   if ! command -v cmake &> /dev/null; then
     if ! command -v apt-get &> /dev/null; then
       # no apt-get; assume RHEL
       sudo yum -y install cmake libarchive
     else
-      sudo apt-get update && sudo apt-get install --yes cmake
+      sudo apt-get install --yes cmake
     fi
   else
     echo 'cmake is present'
@@ -218,14 +208,17 @@ calculate_server_args() {
     args="$args --setParameter acceptAPIVersion2=1"
   fi
 
-  args="$args --setParameter diagnosticDataCollectionEnabled=false"
-
+  # diagnosticDataCollectionEnabled is a mongod-only parameter on server 3.2,
+  # and mlaunch does not support specifying mongod-only parameters:
+  # https://github.com/rueckstiess/mtools/issues/696
+  # Pass it to 3.4 and newer servers where it is accepted by all daemons.
+  if test $mongo_version -ge 34; then
+    args="$args --setParameter diagnosticDataCollectionEnabled=false"
+  fi
   local uri_options=
   if test "$TOPOLOGY" = replica-set; then
     args="$args --replicaset --name test-rs --nodes 2 --arbiter"
     export HAVE_ARBITER=1
-  elif test "$TOPOLOGY" = replica-set-single-node; then
-    args="$args --replicaset --name test-rs --nodes 1"
   elif test "$TOPOLOGY" = sharded-cluster; then
     args="$args --replicaset --nodes 2 --sharded 1 --name test-rs"
     if test -z "$SINGLE_MONGOS"; then