mongoid 7.1.0.rc0 → 7.2.0.rc1

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"
@@ -31,6 +31,7 @@ end
 
 require 'support/authorization'
 require 'support/expectations'
+require 'support/helpers'
 require 'support/macros'
 require 'support/cluster_config'
 require 'support/constraints'
@@ -76,43 +77,12 @@ CONFIG = {
   }
 }
 
-def non_legacy_server?
-  Mongoid::Clients.default.cluster.servers.first.features.write_command_enabled?
-end
-
-def testing_replica_set?
-  Mongoid::Clients.default.cluster.replica_set?
-end
-
-def collation_supported?
-  Mongoid::Clients.default.cluster.next_primary.features.collation_enabled?
-end
-alias :decimal128_supported? :collation_supported?
-
-def array_filters_supported?
-  Mongoid::Clients.default.cluster.next_primary.features.array_filters_enabled?
-end
-alias :sessions_supported? :array_filters_supported?
-
-def transactions_supported?
-  features = Mongoid::Clients.default.cluster.next_primary.features
-  features.respond_to?(:transactions_enabled?) && features.transactions_enabled?
-end
-
-def testing_transactions?
-  transactions_supported? && if Gem::Version.new(ClusterConfig.instance.fcv_ish) >= Gem::Version.new('4.2')
-    %i(replica_set sharded).include?(ClusterConfig.instance.topology)
-  else
-    ClusterConfig.instance.topology == :replica_set
-  end
-end
-
 # Set the database that the spec suite connects to.
 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
@@ -156,6 +126,7 @@ end
 
 RSpec.configure do |config|
   config.raise_errors_for_deprecations!
+  config.include(Helpers)
   config.include(Mongoid::Expectations)
   config.extend(Constraints)
   config.extend(Mongoid::Macros)

data/spec/support/child_process_helper.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+gem 'childprocess'
+require 'childprocess'
+require 'tempfile'
+
+module ChildProcessHelper
+  class SpawnError < StandardError; end
+
+  module_function def call(cmd, env: nil, cwd: nil)
+    process = ChildProcess.new(*cmd)
+    process.io.inherit!
+    if cwd
+      process.cwd = cwd
+    end
+    if env
+      env.each do |k, v|
+        process.environment[k.to_s] = v
+      end
+    end
+    process.start
+    process.wait
+    process
+  end
+
+  module_function def check_call(cmd, env: nil, cwd: nil)
+    process = call(cmd, env: env, cwd: cwd)
+    unless process.exit_code == 0
+      raise "Failed to execute: #{cmd}"
+    end
+  end
+
+  module_function def get_output(cmd, env: nil, cwd: nil)
+    process = ChildProcess.new(*cmd)
+    process.io.inherit!
+    if cwd
+      process.cwd = cwd
+    end
+    if env
+      env.each do |k, v|
+        process.environment[k.to_s] = v
+      end
+    end
+
+    output = ''
+    r, w = IO.pipe
+
+    begin
+      process.io.stdout = w
+      process.start
+      w.close
+
+      thread = Thread.new do
+        begin
+          loop do
+            output << r.readpartial(16384)
+          end
+        rescue EOFError
+        end
+      end
+
+      process.wait
+      thread.join
+    ensure
+      r.close
+    end
+
+    [process, output]
+  end
+
+  module_function def check_output(*args)
+    process, output = get_output(*args)
+    unless process.exit_code == 0
+      raise "Failed to execute: #{args}"
+    end
+    output
+  end
+end

data/spec/support/cluster_config.rb

@@ -99,7 +99,7 @@ class ClusterConfig
         if topology == :sharded
           shards = client.use(:admin).command(listShards: 1).first
           shard = shards['shards'].first
-          address_str = shard['host'].sub(/^.*\//, '').sub(/,.*/, '')
+          address_str = shard['host'].sub(/\A.*\//, '').sub(/,.*/, '')
           client = ClusterTools.instance.direct_client(address_str,
             SpecConfig.instance.test_options.merge(SpecConfig.instance.auth_options).merge(connect: :direct))
         end
@@ -133,8 +133,8 @@ class ClusterConfig
 
     @topology ||= begin
       topology = client.cluster.topology.class.name.sub(/.*::/, '')
-      topology = topology.gsub(/([A-Z])/) { |match| '_' + match.downcase }.sub(/^_/, '')
-      if topology =~ /^replica_set/
+      topology = topology.gsub(/([A-Z])/) { |match| '_' + match.downcase }.sub(/\A_/, '')
+      if topology =~ /\Areplica_set/
         topology = 'replica_set'
       end
       topology.to_sym

data/spec/support/constraints.rb

@@ -4,12 +4,36 @@
 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 =~ /^\d+\.\d+$/
+    unless version =~ /\A\d+\.\d+\z/
       raise ArgumentError, "Version can only be major.minor: #{version}"
     end
 
-    before do
+    before(:all) do
       if version > RAILS_VERSION
         skip "Rails version #{version} or higher required, we have #{RAILS_VERSION}"
       end
@@ -17,11 +41,11 @@ module Constraints
   end
 
   def max_rails_version(version)
-    unless version =~ /^\d+\.\d+$/
+    unless version =~ /\A\d+\.\d+\z/
       raise ArgumentError, "Version can only be major.minor: #{version}"
     end
 
-    before do
+    before(:all) do
       if version < RAILS_VERSION
         skip "Rails version #{version} or lower required, we have #{RAILS_VERSION}"
       end
@@ -29,11 +53,11 @@ module Constraints
   end
 
   def min_server_version(version)
-    unless version =~ /^\d+\.\d+$/
+    unless version =~ /\A\d+\.\d+\z/
       raise ArgumentError, "Version can only be major.minor: #{version}"
     end
 
-    before do
+    before(:all) do
       if version > ClusterConfig.instance.server_version
         skip "Server version #{version} or higher required, we have #{ClusterConfig.instance.server_version}"
       end
@@ -41,11 +65,11 @@ module Constraints
   end
 
   def max_server_version(version)
-    unless version =~ /^\d+\.\d+$/
+    unless version =~ /\A\d+\.\d+\z/
       raise ArgumentError, "Version can only be major.minor: #{version}"
     end
 
-    before do
+    before(:all) do
       if version < ClusterConfig.instance.short_server_version
         skip "Server version #{version} or lower required, we have #{ClusterConfig.instance.server_version}"
       end
@@ -54,9 +78,11 @@ module Constraints
 
   def require_topology(*topologies)
     invalid_topologies = topologies - [:single, :replica_set, :sharded]
+
     unless invalid_topologies.empty?
       raise ArgumentError, "Invalid topologies requested: #{invalid_topologies.join(', ')}"
     end
+
     before(:all) do
       unless topologies.include?(topology = ClusterConfig.instance.topology)
         skip "Topology #{topologies.join(' or ')} required, we have #{topology}"
@@ -73,8 +99,22 @@ module Constraints
   end
 
   def require_transaction_support
-    min_server_fcv '4.0'
-    require_topology :replica_set
+    before(:all) do
+      case ClusterConfig.instance.topology
+      when :single
+        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
+        unless ClusterConfig.instance.server_version >= '4.2'
+          skip 'Transactions tests in a sharded cluster topology require server 4.2+'
+        end
+      else
+        raise NotImplementedError
+      end
+    end
   end
 
   def require_tls

data/spec/support/expectations.rb

@@ -14,14 +14,16 @@ module Mongoid
     end
 
     def expect_query(number)
+      rv = nil
       RSpec::Mocks.with_temporary_scope do
         if number > 0
           expect_any_instance_of(connection_class).to receive(:command_started).exactly(number).times.and_call_original
         else
           expect_any_instance_of(connection_class).not_to receive(:command_started)
         end
-        yield
+        rv = yield
       end
+      rv
     end
 
     def expect_no_queries(&block)

data/spec/support/helpers.rb

@@ -0,0 +1,11 @@
+module Helpers
+  # Reloads the specified model class.
+  #
+  # @param [ String | Symbol ] name Class name to reload.
+  def reload_model(name)
+    Object.class_eval do
+      remove_const(name)
+    end
+    load "spec/support/models/#{name.to_s.underscore}.rb"
+  end
+end

data/spec/support/lite_constraints.rb

@@ -0,0 +1,22 @@
+module LiteConstraints
+  # Constrain tests that use TimeoutInterrupt to MRI (and Unix)
+  def only_mri
+    before do
+      unless SpecConfig.instance.mri?
+        skip "MRI required, we have #{SpecConfig.instance.platform}"
+      end
+    end
+  end
+
+  # This is for marking tests that fail on jruby that should
+  # in principle work (as opposed to being fundamentally incompatible
+  # with jruby).
+  # Often times these failures happen only in Evergreen.
+  def fails_on_jruby
+    before do
+      unless SpecConfig.instance.mri?
+        skip "Fails on jruby"
+      end
+    end
+  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/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"