mongoid 7.1.11 → 7.2.0

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

@@ -52,7 +52,7 @@ module Mrss
     end
 
     def require_topology(*topologies)
-      invalid_topologies = topologies - [:single, :replica_set, :sharded, :load_balanced]
+      invalid_topologies = topologies - [:single, :replica_set, :sharded]
 
       unless invalid_topologies.empty?
         raise ArgumentError, "Invalid topologies requested: #{invalid_topologies.join(', ')}"
@@ -82,7 +82,7 @@ module Mrss
           unless ClusterConfig.instance.server_version >= '4.0'
             skip 'Transactions tests in a replica set topology require server 4.0+'
           end
-        when :sharded, :load_balanced
+        when :sharded
           unless ClusterConfig.instance.server_version >= '4.2'
             skip 'Transactions tests in a sharded cluster topology require server 4.2+'
           end
@@ -113,14 +113,6 @@ module Mrss
       end
     end
 
-    def require_retry_writes
-      before(:all) do
-        unless SpecConfig.instance.retry_writes?
-          skip "Retry writes is disabled"
-        end
-      end
-    end
-
     def require_no_retry_writes
       before(:all) do
         if SpecConfig.instance.retry_writes?
@@ -155,33 +147,6 @@ module Mrss
       end
     end
 
-    def require_no_snappy_compression
-      before(:all) do
-        compressors = SpecConfig.instance.compressors
-        if compressors && compressors.include?('snappy')
-          skip "Snappy compression is enabled"
-        end
-      end
-    end
-
-    def require_zstd_compression
-      before(:all) do
-        compressors = SpecConfig.instance.compressors
-        unless compressors && compressors.include?('zstd')
-          skip "Zstd compression is not enabled"
-        end
-      end
-    end
-
-    def require_no_zstd_compression
-      before(:all) do
-        compressors = SpecConfig.instance.compressors
-        if compressors && compressors.include?('zstd')
-          skip "Zstd compression is enabled"
-        end
-      end
-    end
-
     def require_no_compression
       before(:all) do
         if SpecConfig.instance.compressors
@@ -249,52 +214,31 @@ module Mrss
     # (mongos 4.0+ overrides the write concern)
     def require_set_write_concern
       before(:all) do
-        if %i(sharded load_balanced).include?(ClusterConfig.instance.topology) &&
-          ClusterConfig.instance.short_server_version >= '4.0'
-        then
+        if ClusterConfig.instance.topology == :sharded && ClusterConfig.instance.short_server_version >= '4.0'
           skip "mongos 4.0+ overrides write concern"
         end
       end
     end
 
-    def require_multi_mongos
+    def require_multi_shard
       before(:all) do
         if ClusterConfig.instance.topology == :sharded && SpecConfig.instance.addresses.length == 1
-          skip 'Test requires a minimum of two mongoses if run in sharded topology'
-        end
-
-        if ClusterConfig.instance.topology == :load_balanced && SpecConfig.instance.single_mongos?
-          skip 'Test requires a minimum of two mongoses if run in load-balanced topology'
+          skip 'Test requires a minimum of two shards if run in sharded topology'
         end
       end
     end
 
-    # In sharded topology operations are distributed to the mongoses.
-    # When we set fail points, the fail point may be set on one mongos and
-    # operation may be executed on another mongos, causing failures.
-    # Tests that are not setting targeted fail points should utilize this
-    # method to restrict themselves to single mongos.
-    #
-    # In load-balanced topology, the same problem can happen when there is
-    # more than one mongos behind the load balancer.
-    def require_no_multi_mongos
+    def require_no_multi_shard
       before(:all) do
         if ClusterConfig.instance.topology == :sharded && SpecConfig.instance.addresses.length > 1
-          skip 'Test requires a single mongos if run in sharded topology'
-        end
-        if ClusterConfig.instance.topology == :load_balanced && !SpecConfig.instance.single_mongos?
-          skip 'Test requires a single mongos, as indicated by SINGLE_MONGOS=1 environment variable, if run in load-balanced topology'
+          skip 'Test requires a single shard if run in sharded topology'
         end
       end
     end
 
-    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
+        if ClusterConfig.instance.storage_engine != :wired_tiger
           skip 'Test requires WiredTiger storage engine'
         end
       end
@@ -303,9 +247,7 @@ module Mrss
     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
+          if ClusterConfig.instance.storage_engine != :wired_tiger
             skip 'Test requires WiredTiger storage engine on 3.6+ servers'
           end
         end
@@ -314,7 +256,7 @@ module Mrss
 
     def require_mmapv1
       before(:all) do
-        if SpecConfig.instance.serverless? || ClusterConfig.instance.storage_engine != :mmapv1
+        if ClusterConfig.instance.storage_engine != :mmapv1
           skip 'Test requires MMAPv1 storage engine'
         end
       end
@@ -357,29 +299,5 @@ module Mrss
         end
       end
     end
-
-    def require_required_api_version
-      before(:all) do
-        unless ENV['API_VERSION_REQUIRED'] == '1'
-          skip 'Set API_VERSION_REQUIRED=1 to run this test'
-        end
-      end
-    end
-
-    def require_no_required_api_version
-      before(:all) do
-        if ENV['API_VERSION_REQUIRED'] == '1'
-          skip 'Cannot have API_VERSION_REQUIRED=1 to run this test'
-        end
-      end
-    end
-
-    def require_unix_socket
-      before(:all) do
-        if ENV['TOPOLOGY'] == 'load-balanced'
-          skip 'Load balancer does not listen on Unix sockets'
-        end
-      end
-    end
   end
 end

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

@@ -171,21 +171,5 @@ module Mrss
         end
       end
     end
-
-    def require_active_support
-      before(:all) do
-        if !SpecConfig.instance.active_support?
-          skip 'This test requires ActiveSupport; set WITH_ACTIVE_SUPPORT=1 in environment'
-        end
-      end
-    end
-
-    def no_active_support
-      before(:all) do
-        if SpecConfig.instance.active_support?
-          skip 'This test requires no ActiveSupport; unset WITH_ACTIVE_SUPPORT in environment'
-        end
-      end
-    end
   end
 end

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

@@ -1,6 +1,3 @@
-# frozen_string_literal: true
-# encoding: utf-8
-
 autoload :JSON, 'json'
 autoload :FileUtils, 'fileutils'
 autoload :Find, 'find'
@@ -25,28 +22,18 @@ module Mrss
     end
 
     def initialize(root: nil, classifiers:, priority_order:,
-      spec_root: nil, rspec_json_path: nil, rspec_all_json_path: nil,
-      randomize: false
+      spec_root: nil, rspec_json_path: nil, rspec_all_json_path: nil
     )
       @spec_root = spec_root || File.join(root, 'spec')
       @classifiers = classifiers
       @priority_order = priority_order
       @rspec_json_path = rspec_json_path || File.join(root, 'tmp/rspec.json')
       @rspec_all_json_path = rspec_all_json_path || File.join(root, 'tmp/rspec-all.json')
-      @randomize = !!randomize
     end
 
     attr_reader :spec_root, :classifiers, :priority_order
     attr_reader :rspec_json_path, :rspec_all_json_path
 
-    def randomize?
-      @randomize
-    end
-
-    def seed
-      @seed ||= (rand * 100_000).to_i
-    end
-
     def buckets
       @buckets ||= {}.tap do |buckets|
         Find.find(spec_root) do |path|
@@ -91,20 +78,10 @@ module Mrss
     end
 
     def run
-      run_buckets(*buckets.keys)
-    end
-
-    def run_buckets(*buckets)
       FileUtils.rm_f(rspec_all_json_path)
 
-      buckets.each do |bucket|
-        if bucket && !self.buckets[bucket]
-          raise "Unknown bucket #{bucket}"
-        end
-      end
-      buckets = Hash[self.buckets.select { |k, v| buckets.include?(k) }]
-
       failed = []
+      buckets = self.buckets.dup
 
       priority_order.each do |category|
         if files = buckets.delete(category)
@@ -132,12 +109,8 @@ module Mrss
       puts "Running #{category.to_s.gsub('_', ' ')} tests"
       FileUtils.rm_f(rspec_json_path)
       cmd = %w(rspec) + paths
-      if randomize?
-        cmd += %W(--order rand:#{seed})
-      end
 
       begin
-        puts "Running #{cmd.join(' ')}"
         ChildProcessHelper.check_call(cmd)
       ensure
         if File.exist?(rspec_json_path)
@@ -163,9 +136,6 @@ module Mrss
       end
       new.delete('version')
       new.delete('summary_line')
-      # The spec organizer runs all buckets with the same seed, hence
-      # we can drop the seed from new results.
-      new.delete('seed')
       unless new.empty?
         raise "Unhandled rspec results keys: #{new.keys.join(', ')}"
       end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@
 
 require 'lite_spec_helper'
 
-MODELS = File.join(File.dirname(__FILE__), "app/models")
+MODELS = File.join(File.dirname(__FILE__), "support/models")
 $LOAD_PATH.unshift(MODELS)
 
 require "action_controller"
@@ -43,7 +43,7 @@ if SpecConfig.instance.ci?
   client = Mongo::Client.new(SpecConfig.instance.addresses)
   while starting
     begin
-      client.command(ping: 1)
+      client.command(Mongo::Server::Monitor::Connection::ISMASTER)
       break
     rescue Mongo::Error::OperationFailure => e
       sleep(2)
@@ -83,7 +83,7 @@ Mongoid.configure do |config|
   config.load_configuration(CONFIG)
 end
 
-# Autoload every model for the test suite that sits in spec/app/models.
+# Autoload every model for the test suite that sits in spec/support/models.
 Dir[ File.join(MODELS, "*.rb") ].sort.each do |file|
   name = File.basename(file, ".rb")
   autoload name.camelize.to_sym, name

data/spec/support/constraints.rb

@@ -4,6 +4,30 @@
 module Constraints
   RAILS_VERSION = ActiveSupport.version.to_s.split('.')[0..1].join('.').freeze
 
+  def min_driver_version(version)
+    required_version = version.split('.').map(&:to_i)
+    actual_version = driver_version(required_version.length)
+    before(:all) do
+      if (actual_version <=> required_version) < 0
+        skip "Driver version #{version} or higher is required"
+      end
+    end
+  end
+
+  def max_driver_version(version)
+    required_version = version.split('.').map(&:to_i)
+    actual_version = driver_version(required_version.length)
+    before(:all) do
+      if (actual_version <=> required_version) > 0
+        skip "Driver version #{version} or lower is required"
+      end
+    end
+  end
+
+  def driver_version(precision)
+    Mongo::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/helpers.rb

@@ -6,6 +6,6 @@ module Helpers
     Object.class_eval do
       remove_const(name)
     end
-    load "spec/app/models/#{name.to_s.underscore}.rb"
+    load "spec/support/models/#{name.to_s.underscore}.rb"
   end
 end

data/spec/{app → support}/models/actor.rb

@@ -18,4 +18,4 @@ class Actor
   end
 end
 
-require "app/models/actress"
+require "support/models/actress"

data/spec/{app → support}/models/address.rb

@@ -78,9 +78,5 @@ class Address
     def streets
       all.map(&:street)
     end
-
-    def city_and_state(city:, state:)
-      where(city: city, state: state)
-    end
   end
 end

data/spec/support/models/armrest.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Armrest
+  include Mongoid::Document
+
+  embedded_in :seat
+
+  field :side
+end

data/spec/{app → support}/models/browser.rb

@@ -6,4 +6,4 @@ class Browser < Canvas
   def render; end
 end
 
-require "app/models/firefox"
+require "support/models/firefox"

data/spec/{app → support}/models/canvas.rb

@@ -25,4 +25,4 @@ class Canvas
   end
 end
 
-require "app/models/browser"
+require "support/models/browser"

data/spec/{app → support}/models/coding.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
-require 'app/models/coding/pull_request'
+require 'support/models/coding/pull_request'

data/spec/support/models/crate.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Crate
+  include Mongoid::Document
+
+  embedded_in :vehicle
+  embeds_many :toys
+
+  accepts_nested_attributes_for :toys
+
+  field :volume
+end

data/spec/support/models/deed.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Deed
+  include Mongoid::Document
+  field :title, type: String
+  embedded_in :owner
+end

data/spec/{app → support}/models/dictionary.rb

@@ -6,13 +6,7 @@ class Dictionary
   field :name, type: String
   field :publisher, type: String
   field :year, type: Integer
-
-  # This field must be a Time
   field :published, type: Time
-
-  # This field must be a Date
-  field :submitted_on, type: Date
-
   field :description, type: String, localize: true
   field :l, type: String, as: :language
   has_many :words, validate: false

data/spec/{app → support}/models/driver.rb

@@ -7,4 +7,4 @@ class Driver
   accepts_nested_attributes_for :vehicle
 end
 
-require "app/models/learner"
+require "support/models/learner"

data/spec/support/models/guitar.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Guitar < Instrument
+end

data/spec/support/models/idnodef.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Idnodef
+  include Mongoid::Document
+
+  field :_id, type: String, overwrite: true
+end

data/spec/support/models/instrument.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Instrument
+  include Mongoid::Document
+end
+
+require "support/models/guitar"
+require "support/models/piano"

data/spec/{app → support}/models/item.rb

@@ -8,4 +8,4 @@ class Item
   field :user_login, type: String
 end
 
-require "app/models/sub_item"
+require "support/models/sub_item"

data/spec/{app → support}/models/mop.rb

@@ -13,14 +13,4 @@ class Mop
   # transformed differently based on the type of field being queried.
   field :int_field, type: Integer
   field :array_field, type: Array
-  field :date_field, type: Date
-  field :time_field, type: Time
-  field :datetime_field, type: DateTime
-  field :big_decimal_field, type: BigDecimal
-  field :decimal128_field, type: BSON::Decimal128
-  field :symbol_field, type: Symbol
-  field :bson_symbol_field, type: BSON::Symbol::Raw
-  field :regexp_field, type: Regexp
-  field :bson_regexp_field, type: BSON::Regexp::Raw
 end
-

data/spec/support/models/order.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Order
+  include Mongoid::Document
+  field :status, type: Mongoid::StringifiedSymbol
+
+  # This is a dummy field that verifies the Mongoid::Fields::StringifiedSymbol
+  # alias.
+  field :saved_status, type: StringifiedSymbol
+end

data/spec/{app → support}/models/owner.rb

@@ -6,4 +6,6 @@ class Owner
   field :name
   has_many :events
   embeds_many :birthdays
+  embeds_many :deeds
+  embeds_one :scribe
 end

data/spec/{app → support}/models/palette.rb

@@ -7,4 +7,4 @@ class Palette
   embeds_many :tools
 end
 
-require "app/models/big_palette"
+require "support/models/big_palette"

data/spec/{app → support}/models/person.rb

@@ -136,10 +136,6 @@ class Person
   scope :without_ssn, ->{ without(:ssn) }
   scope :search, ->(query){ any_of({ title: query }) }
 
-  def self.older_than(age:)
-    where(:age.gt => age)
-  end
-
   def score_with_rescoring=(score)
     @rescored = score.to_i + 20
     self.score_without_rescoring = score
@@ -210,15 +206,10 @@ class Person
     self.map_with_default["key"] = value
   end
 
-  def set_personal_data(ssn:, age:)
-    self.ssn = ssn
-    self.age = age
-  end
-
   reset_callbacks(:validate)
   reset_callbacks(:create)
   reset_callbacks(:save)
   reset_callbacks(:destroy)
 end
 
-require "app/models/doctor"
+require "support/models/doctor"

data/spec/support/models/piano.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Piano < Instrument
+end

data/spec/support/models/profile.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Profile
+  include Mongoid::Document
+  field :name, type: String
+
+  embeds_one :profile_image
+
+  shard_key :name
+end
+
+class ProfileImage
+  include Mongoid::Document
+  field :url, type: String
+
+  embedded_in :profile
+end

data/spec/support/models/publication.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'support/models/publication/encyclopedia'
+require 'support/models/publication/review'

data/spec/{app/models/profile.rb → support/models/scribe.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
-class Profile
+class Scribe
   include Mongoid::Document
   field :name, type: String
-  shard_key :name
+  embedded_in :owner
 end

data/spec/support/models/seat.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Seat
+  include Mongoid::Document
+
+  embedded_in :vehicle
+
+  field :rating, type: Integer
+
+  embeds_many :armrests
+
+  before_create :set_rating
+  before_update :update_rating
+
+  private
+
+  def set_rating
+    self.rating ||= 100
+  end
+
+  def update_rating
+    self.rating += 1
+  end
+end

data/spec/{app → support}/models/shape.rb

@@ -11,5 +11,5 @@ class Shape
   def render; end
 end
 
-require "app/models/circle"
-require "app/models/square"
+require "support/models/circle"
+require "support/models/square"

data/spec/support/models/system_role.rb

@@ -0,0 +1,7 @@
+class SystemRole
+ include Mongoid::Document
+
+  # NOTE: this model is for test purposes only. It is not recommended that you
+  # store Mongoid documents in system collections.
+  store_in collection: "system.roles", database: "admin"
+end

data/spec/{app → support}/models/tool.rb

@@ -7,5 +7,5 @@ class Tool
   accepts_nested_attributes_for :palette
 end
 
-require "app/models/eraser"
-require "app/models/pencil"
+require "support/models/eraser"
+require "support/models/pencil"

data/spec/support/models/toy.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Toy
+  include Mongoid::Document
+
+  embedded_in :crate
+
+  field :name
+end

data/spec/{app → support}/models/truck.rb

@@ -3,4 +3,6 @@
 
 class Truck < Vehicle
   embeds_one :bed
+
+  field :capacity, type: Integer
 end