mongoid 6.4.8 → 7.0.13

data/spec/support/constraints.rb

@@ -1,100 +1,45 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 module Constraints
   RAILS_VERSION = ActiveSupport.version.to_s.split('.')[0..1].join('.').freeze
 
-  def min_rails_version(version)
-    unless version =~ /^\d+\.\d+$/
-      raise ArgumentError, "Version can only be major.minor: #{version}"
-    end
-
-    before do
-      if version > RAILS_VERSION
-        skip "Rails version #{version} or higher required, we have #{RAILS_VERSION}"
+  def require_driver_query_cache
+    before(:all) do
+      if !defined?(Mongo::QueryCache)
+        skip "Driver version #{Mongo::VERSION} does not support query cache"
       end
     end
   end
 
-  def max_rails_version(version)
-    unless version =~ /^\d+\.\d+$/
-      raise ArgumentError, "Version can only be major.minor: #{version}"
-    end
-
-    before do
-      if version < RAILS_VERSION
-        skip "Rails version #{version} or lower required, we have #{RAILS_VERSION}"
+  def require_mongoid_query_cache
+    before (:all) do
+      if defined?(Mongo::QueryCache)
+        skip "Mongoid uses the driver query cache in driver versions that support it"
       end
     end
   end
 
-  def min_server_version(version)
-    unless version =~ /^\d+\.\d+$/
+  def min_rails_version(version)
+    unless version =~ /\A\d+\.\d+\z/
       raise ArgumentError, "Version can only be major.minor: #{version}"
     end
 
-    before do
-      if version > ClusterConfig.instance.server_version
-        skip "Server version #{version} or higher required, we have #{ClusterConfig.instance.server_version}"
+    before(:all) do
+      if version > RAILS_VERSION
+        skip "Rails version #{version} or higher required, we have #{RAILS_VERSION}"
       end
     end
   end
 
-  def max_server_version(version)
-    unless version =~ /^\d+\.\d+$/
+  def max_rails_version(version)
+    unless version =~ /\A\d+\.\d+\z/
       raise ArgumentError, "Version can only be major.minor: #{version}"
     end
 
-    before do
-      if version < ClusterConfig.instance.short_server_version
-        skip "Server version #{version} or lower required, we have #{ClusterConfig.instance.server_version}"
-      end
-    end
-  end
-
-  def require_topology(*topologies)
-    topologies = topologies.map { |t| t.to_s }
-    invalid_topologies = topologies - %w(single replica_set sharded)
-    unless invalid_topologies.empty?
-      raise ArgumentError, "Invalid topologies requested: #{invalid_topologies.join(', ')}"
-    end
-    before do
-      topology = Mongoid.default_client.cluster.topology.class.name.sub(/.*::/, '')
-      topology = topology.gsub(/([A-Z])/) { |match| '_' + match.downcase }.sub(/^_/, '')
-      if topology =~ /^replica_set/
-        topology = 'replica_set'
-      end
-      unless topologies.include?(topology)
-        skip "Topology #{topologies.join(' or ')} required, we have #{topology}"
-      end
-    end
-  end
-
-  def max_example_run_time(timeout)
-    around do |example|
-      TimeoutInterrupt.timeout(timeout) do
-        example.run
-      end
-    end
-  end
-
-  def require_transaction_support
-    min_server_version '4.0'
-    require_topology :replica_set
-  end
-
-  def require_scram_sha_256_support
-    before do
-      $mongo_server_features ||= begin
-        scanned_client_server!.features
-      end
-      unless $mongo_server_features.scram_sha_256_enabled?
-        skip "SCRAM SHA 256 is not enabled on the server"
-      end
-    end
-  end
-
-  def require_ssl
-    before do
-      unless SpecConfig.instance.ssl?
-        skip "SSL not enabled"
+    before(:all) do
+      if version < RAILS_VERSION
+        skip "Rails version #{version} or lower required, we have #{RAILS_VERSION}"
       end
     end
   end

data/spec/support/expectations.rb

@@ -1,10 +1,24 @@
 module Mongoid
   module Expectations
 
+    def connection_class
+      if defined?(Mongo::Server::ConnectionBase)
+        Mongo::Server::ConnectionBase
+      else
+        # Pre-2.8 drivers
+        Mongo::Server::Connection
+      end
+    end
+
     def expect_query(number)
-      # There are both start and complete events for each query.
-      expect(Mongo::Logger.logger).to receive(:debug?).exactly(number * 2).times.and_call_original
-      yield
+      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
+      end
     end
 
     def expect_no_queries(&block)

data/spec/support/spec_config.rb

@@ -1,6 +1,3 @@
-# frozen_string_literal: true
-# encoding: utf-8
-
 require 'singleton'
 
 class SpecConfig
@@ -8,13 +5,17 @@ class SpecConfig
 
   def initialize
     if ENV['MONGODB_URI']
-      @mongodb_uri = Mongo::URI.new(ENV['MONGODB_URI'])
+      @uri_str = ENV['MONGODB_URI']
+      @uri = Mongo::URI.new(@uri_str)
     end
   end
 
+  attr_reader :uri_str
+  attr_reader :uri
+
   def addresses
-    if @mongodb_uri
-      @mongodb_uri.servers
+    if @uri
+      @uri.servers
     else
       ['127.0.0.1']
     end
@@ -33,10 +34,22 @@ class SpecConfig
   end
 
   def client_debug?
-    %w(1 true yes).include?((ENV['CLIENT_DEBUG'] || '').downcase)
+    %w(1 true yes).include?(ENV['CLIENT_DEBUG'] && ENV['CLIENT_DEBUG'].downcase)
+  end
+
+  def app_tests?
+    %w(1 true yes).include?(ENV['APP_TESTS'] && ENV['APP_TESTS'].downcase)
   end
 
   def ci?
     !!ENV['CI']
   end
+
+  def rails_version
+    v = ENV['RAILS']
+    if v == ''
+      v = nil
+    end
+    v || '6.1'
+  end
 end