mongoid 6.4.2 → 7.0.3

data/spec/mongoid/validatable/presence_spec.rb

@@ -211,13 +211,14 @@ describe Mongoid::Validatable::PresenceValidator do
 
     context "when the relation is a has one" do
 
-      before do
+      around do |example|
+        original_relations = Person.relations
+        Person.has_one :game, autosave: true
         Person.validates :game, presence: true
-      end
-
-      after do
+        example.run
         Person.reset_callbacks(:save)
         Person.reset_callbacks(:validate)
+        Person.relations = original_relations
       end
 
       context "when the relation is new" do
@@ -249,7 +250,7 @@ describe Mongoid::Validatable::PresenceValidator do
     context "when the relation is a has one and autosave is false" do
 
       before do
-        Person.relations["game"][:autosave] = false
+        Person.relations["game"].options[:autosave] = false
         Person.validates :game, presence: true
       end
 
@@ -258,7 +259,7 @@ describe Mongoid::Validatable::PresenceValidator do
       end
 
       it "does not change autosave on the relation" do
-        expect(Person.relations["game"][:autosave]).to be false
+        expect(Person.relations["game"].autosave?).to be false
       end
 
       context "when the relation is new" do

data/spec/mongoid/validatable_spec.rb

@@ -34,7 +34,7 @@ describe Mongoid::Validatable do
       end
 
       let(:documents) do
-        Mongoid::Relations::Targets::Enumerable.new([ address ])
+        Mongoid::Association::Referenced::HasMany::Targets::Enumerable.new([ address ])
       end
 
       before do

data/spec/rails/controller_extension/controller_runtime_spec.rb

@@ -0,0 +1,110 @@
+require "spec_helper"
+require "mongoid/railties/controller_runtime"
+
+describe "Mongoid::Railties::ControllerRuntime" do
+  controller_runtime = Mongoid::Railties::ControllerRuntime
+  collector = controller_runtime::Collector
+
+  def set_metric value
+    Thread.current["Mongoid.controller_runtime"] = value
+  end
+
+  def clear_metric!
+    set_metric 0
+  end
+
+  describe "Collector" do
+
+    it "stores the metric in thread-safe manner" do
+      clear_metric!
+      expect(collector.runtime).to eq(0)
+      set_metric 42
+      expect(collector.runtime).to eq(42)
+    end
+
+    it "sets metric on both succeeded and failed" do
+      instance = collector.new
+      event_payload = OpenStruct.new duration: 42
+
+      clear_metric!
+      instance.succeeded event_payload
+      expect(collector.runtime).to eq(42)
+
+      clear_metric!
+      instance.failed event_payload
+      expect(collector.runtime).to eq(42)
+    end
+
+    it "resets the metric and returns the value" do
+      clear_metric!
+      expect(collector.reset_runtime).to eq(0)
+      set_metric 42
+      expect(collector.reset_runtime).to eq(42)
+      expect(collector.runtime).to eq(0)
+    end
+
+  end
+
+  reference_controller_class = Class.new do
+    def process_action *_
+      @process_action = true
+    end
+
+    def cleanup_view_runtime *_
+      @cleanup_view_runtime.call
+    end
+
+    def append_info_to_payload *_
+      @append_info_to_payload = true
+    end
+
+    def self.log_process_action *_
+      @log_process_action.call
+    end
+  end
+
+  controller_class = Class.new reference_controller_class do
+    include controller_runtime::ControllerExtension
+  end
+
+  let(:controller){ controller_class.new }
+
+  it "resets the metric before each action" do
+    set_metric 42
+    controller.send(:process_action, 'foo')
+    expect(collector.runtime).to be(0)
+    expect(controller.instance_variable_get "@process_action").to be(true)
+  end
+
+  it "strips the metric of other sources of the runtime" do
+    set_metric 1
+    controller.instance_variable_set "@cleanup_view_runtime", ->{
+      controller.instance_variable_set "@cleanup_view_runtime", true
+      set_metric 13
+      42
+    }
+    returned = controller.send :cleanup_view_runtime
+    expect(controller.instance_variable_get "@cleanup_view_runtime").to be(true)
+    expect(controller.mongoid_runtime).to eq(14)
+    expect(returned).to be(29)
+  end
+
+  it "appends the metric to payload" do
+    payload = {}
+    set_metric 42
+    controller.send :append_info_to_payload, payload
+    expect(controller.instance_variable_get "@append_info_to_payload").to be(true)
+    expect(payload[:mongoid_runtime]).to eq(42)
+  end
+
+  it "adds metric to log message" do
+    controller_class.instance_variable_set "@log_process_action", ->{
+      controller_class.instance_variable_set "@log_process_action", true
+      []
+    }
+    messages = controller_class.log_process_action mongoid_runtime: 42.101
+    expect(controller_class.instance_variable_get "@log_process_action").to be(true)
+    expect(messages).to eq(["MongoDB: 42.1ms"])
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,24 +1,20 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+# frozen_string_literal: true
+
+require 'lite_spec_helper'
 
 MODELS = File.join(File.dirname(__FILE__), "app/models")
 $LOAD_PATH.unshift(MODELS)
 
 require "action_controller"
-require "mongoid"
-require "rspec"
-
-# These environment variables can be set if wanting to test against a database
-# that is not on the local machine.
-ENV["MONGOID_SPEC_HOST"] ||= "127.0.0.1"
-ENV["MONGOID_SPEC_PORT"] ||= "27017"
-
-# These are used when creating any connection in the test suite.
-HOST = ENV["MONGOID_SPEC_HOST"]
-PORT = ENV["MONGOID_SPEC_PORT"].to_i
+require 'rspec/retry'
 
-Mongo::Logger.logger.level = Logger::INFO
-# Mongoid.logger.level = Logger::DEBUG
+if SpecConfig.instance.client_debug?
+  Mongoid.logger.level = Logger::DEBUG
+  Mongo::Logger.logger.level = Logger::DEBUG
+else
+  Mongoid.logger.level = Logger::INFO
+  Mongo::Logger.logger.level = Logger::INFO
+end
 
 # When testing locally we use the database named mongoid_test. However when
 # tests are running in parallel on Travis we need to use different database
@@ -34,11 +30,13 @@ end
 
 require 'support/authorization'
 require 'support/expectations'
+require 'support/macros'
+require 'support/constraints'
 
 # Give MongoDB time to start up on the travis ci environment.
 if (ENV['CI'] == 'travis' || ENV['CI'] == 'evergreen')
   starting = true
-  client = Mongo::Client.new(['127.0.0.1:27017'])
+  client = Mongo::Client.new(SpecConfig.instance.addresses)
   while starting
     begin
       client.command(Mongo::Server::Monitor::Connection::ISMASTER)
@@ -54,9 +52,10 @@ CONFIG = {
   clients: {
     default: {
       database: database_id,
-      hosts: [ "#{HOST}:#{PORT}" ],
+      hosts: SpecConfig.instance.addresses,
       options: {
-        server_selection_timeout: 0.5,
+        server_selection_timeout: 3.42,
+        wait_queue_timeout: 1,
         max_pool_size: 5,
         heartbeat_frequency: 180,
         user: MONGOID_ROOT_USER.name,
@@ -66,7 +65,12 @@ CONFIG = {
     }
   },
   options: {
-    belongs_to_required_by_default: false
+    belongs_to_required_by_default: false,
+    log_level: if SpecConfig.instance.client_debug?
+      :debug
+    else
+      :info
+    end,
   }
 }
 
@@ -83,15 +87,29 @@ def collation_supported?
 end
 alias :decimal128_supported? :collation_supported?
 
-def testing_locally?
-  !(ENV['CI'] == 'travis')
-end
-
 def array_filters_supported?
   Mongoid::Clients.default.cluster.next_primary.features.array_filters_enabled?
 end
 alias :sessions_supported? :array_filters_supported?
 
+def testing_geo_near?
+  $geo_near_enabled ||= (Mongoid::Clients.default
+                             .command(serverStatus: 1)
+                             .first['version'] < '4.1')
+end
+
+def transactions_supported?
+  Mongoid::Clients.default.cluster.next_primary.features.transactions_enabled?
+end
+
+def testing_transactions?
+  transactions_supported? && testing_replica_set?
+end
+
+def testing_locally?
+  !(ENV['CI'] == 'travis')
+end
+
 # Set the database that the spec suite connects to.
 Mongoid.configure do |config|
   config.load_configuration(CONFIG)
@@ -129,9 +147,11 @@ I18n.config.enforce_available_locales = false
 RSpec.configure do |config|
   config.raise_errors_for_deprecations!
   config.include(Mongoid::Expectations)
+  config.extend(Constraints)
+  config.extend(Mongoid::Macros)
 
   config.before(:suite) do
-    client = Mongo::Client.new(["#{HOST}:#{PORT}"])
+    client = Mongo::Client.new(SpecConfig.instance.addresses, server_selection_timeout: 3.03)
     begin
       # Create the root user administrator as the first user to be added to the
       # database. This user will need to be authenticated in order to add any
@@ -139,11 +159,17 @@ RSpec.configure do |config|
       client.database.users.create(MONGOID_ROOT_USER)
     rescue Exception => e
     end
+    Mongoid.purge!
   end
 
   # Drop all collections and clear the identity map before each spec.
   config.before(:each) do
-    Mongoid.purge!
+    unless Mongoid.default_client.cluster.connected?
+      Mongoid.default_client.reconnect
+    end
+    Mongoid.default_client.collections.each do |coll|
+      coll.delete_many
+    end
   end
 end
 

data/spec/support/constraints.rb

@@ -0,0 +1,101 @@
+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}"
+      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}"
+      end
+    end
+  end
+
+  def min_server_version(version)
+    unless version =~ /^\d+\.\d+$/
+      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}"
+      end
+    end
+  end
+
+  def max_server_version(version)
+    unless version =~ /^\d+\.\d+$/
+      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"
+      end
+    end
+  end
+end

data/spec/support/macros.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Mongoid
+  module Macros
+    def use_spec_mongoid_config
+      around do |example|
+        config_path = File.join(File.dirname(__FILE__), "..", "config", "mongoid.yml")
+
+        Mongoid::Clients.clear
+        Mongoid.load!(config_path, :test)
+
+        begin
+          example.run
+        ensure
+          Mongoid::Config.reset
+        end
+      end
+    end
+  end
+end

data/spec/support/spec_config.rb

@@ -0,0 +1,39 @@
+require 'singleton'
+
+class SpecConfig
+  include Singleton
+
+  def initialize
+    if ENV['MONGODB_URI']
+      @mongodb_uri = Mongo::URI.new(ENV['MONGODB_URI'])
+    end
+  end
+
+  def addresses
+    if @mongodb_uri
+      @mongodb_uri.servers
+    else
+      ['127.0.0.1']
+    end
+  end
+
+  def mri?
+    !jruby?
+  end
+
+  def jruby?
+    RUBY_PLATFORM =~ /\bjava\b/
+  end
+
+  def platform
+    RUBY_PLATFORM
+  end
+
+  def client_debug?
+    %w(1 true yes).include?((ENV['CLIENT_DEBUG'] || '').downcase)
+  end
+
+  def ci?
+    !!ENV['CI']
+  end
+end