mongoid 7.1.1 → 7.1.2

data/spec/support/constraints.rb

@@ -5,11 +5,11 @@ module Constraints
   RAILS_VERSION = ActiveSupport.version.to_s.split('.')[0..1].join('.').freeze
 
   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 +17,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 +29,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 +41,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 +54,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 +75,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/spec_config.rb

@@ -8,13 +8,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,7 +37,11 @@ class SpecConfig
   end
 
   def client_debug?
-    %w(1 true yes).include?((ENV['CLIENT_DEBUG'] || '').downcase)
+    %w(1 true yes).include?(ENV['CLIENT_DEBUG']&.downcase)
+  end
+
+  def app_tests?
+    %w(1 true yes).include?(ENV['APP_TESTS']&.downcase)
   end
 
   def ci?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.1.2
 platform: ruby
 authors:
 - Durran Jordan
@@ -29,7 +29,7 @@ cert_chain:
   gpvfPNWMwyBDlHaNS3GfO6cRRxBOvEG05GUCsvtTY4Bpe8yjE64wg1ymb47LMOnv
   Qb1lGORmf/opg45mluKUYl7pQNZHD0d3
   -----END CERTIFICATE-----
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -616,6 +616,7 @@ files:
 - spec/app/models/word_origin.rb
 - spec/app/models/writer.rb
 - spec/config/mongoid.yml
+- spec/integration/app_spec.rb
 - spec/integration/associations/belongs_to_spec.rb
 - spec/integration/associations/embedded_spec.rb
 - spec/integration/associations/foreign_key_spec.rb
@@ -767,6 +768,7 @@ files:
 - spec/mongoid/criteria/scopable_spec.rb
 - spec/mongoid/criteria_spec.rb
 - spec/mongoid/document_fields_spec.rb
+- spec/mongoid/document_persistence_context_spec.rb
 - spec/mongoid/document_query_spec.rb
 - spec/mongoid/document_spec.rb
 - spec/mongoid/equality_spec.rb
@@ -916,6 +918,7 @@ files:
 - spec/rails/mongoid_spec.rb
 - spec/spec_helper.rb
 - spec/support/authorization.rb
+- spec/support/child_process_helper.rb
 - spec/support/cluster_config.rb
 - spec/support/constraints.rb
 - spec/support/expectations.rb
@@ -1437,6 +1440,7 @@ test_files:
 - spec/mongoid/loggable_spec.rb
 - spec/mongoid/document_query_spec.rb
 - spec/mongoid/traversable_spec.rb
+- spec/mongoid/document_persistence_context_spec.rb
 - spec/mongoid/criteria_spec.rb
 - spec/mongoid/query_cache_spec.rb
 - spec/mongoid/matchable_spec.rb
@@ -1467,11 +1471,13 @@ test_files:
 - spec/support/lite_constraints.rb
 - spec/support/constraints.rb
 - spec/support/spec_config.rb
+- spec/support/child_process_helper.rb
 - spec/mongoid_spec.rb
 - spec/config/mongoid.yml
 - spec/rails/controller_extension/controller_runtime_spec.rb
 - spec/rails/mongoid_spec.rb
 - spec/spec_helper.rb
+- spec/integration/app_spec.rb
 - spec/integration/i18n_fallbacks_spec.rb
 - spec/integration/associations/foreign_key_spec_models.rb
 - spec/integration/associations/foreign_key_spec.rb