mongoid 7.1.1 → 7.1.2

data/spec/mongoid/criteria_spec.rb

@@ -2337,7 +2337,7 @@ describe Mongoid::Criteria do
       end
 
       it "returns the map/reduce results" do
-        expect(map_reduce).to eq([
+        expect(map_reduce.sort_by { |doc| doc['_id'] }).to eq([
           { "_id" => "Depeche Mode", "value" => { "likes" => 200 }},
           { "_id" => "Tool", "value" => { "likes" => 100 }}
         ])
@@ -3534,7 +3534,8 @@ describe Mongoid::Criteria do
         end
       end
 
-      context "when querying on a BSON::Decimal128", if: decimal128_supported? do
+      context "when querying on a BSON::Decimal128" do
+        min_server_version '3.4'
 
         let(:decimal) do
           BSON::Decimal128.new("0.0005")
@@ -3622,6 +3623,7 @@ describe Mongoid::Criteria do
     end
 
     context "when the code has scope" do
+      max_server_version '4.2'
 
       let(:criteria) do
         Band.for_js("this.name == param", param: "Depeche Mode")

data/spec/mongoid/document_persistence_context_spec.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require "spec_helper"
+
+describe Mongoid::Document do
+
+  let(:klass) do
+    Person
+  end
+
+  let(:person) do
+    Person.new
+  end
+
+  describe '.client_name' do
+    it 'returns client name' do
+      Person.client_name.should == :default
+    end
+  end
+
+  describe '.database_name' do
+    it 'returns database name' do
+      Person.database_name.should == 'mongoid_test'
+    end
+  end
+
+  describe '.collection_name' do
+    it 'returns collection name' do
+      Person.collection_name.should == :people
+    end
+  end
+end

data/spec/mongoid/indexable_spec.rb

@@ -48,7 +48,7 @@ describe Mongoid::Indexable do
       end
     end
 
-    context "when database specific options exist", if: non_legacy_server? do
+    context "when database specific options exist" do
 
       let(:klass) do
         Class.new do
@@ -98,7 +98,7 @@ describe Mongoid::Indexable do
       end
     end
 
-    context "when database options are specified", if: non_legacy_server? do
+    context "when database options are specified" do
 
       let(:klass) do
         Class.new do
@@ -136,7 +136,8 @@ describe Mongoid::Indexable do
       end
     end
 
-    context "when a collation option is specified", if: collation_supported? do
+    context "when a collation option is specified" do
+      min_server_version '3.4'
 
       let(:klass) do
         Class.new do
@@ -311,7 +312,8 @@ describe Mongoid::Indexable do
       end
     end
 
-    context "when providing a collation option", if: collation_supported? do
+    context "when providing a collation option" do
+      min_server_version '3.4'
 
       before do
         klass.index({ name: 1 }, collation: { locale: 'en_US', strength: 2 })

data/spec/mongoid/matchable/default_spec.rb

@@ -71,7 +71,7 @@ describe Mongoid::Matchable::Default do
         context "when the value is a regexp" do
 
           it "returns true" do
-            expect(matcher._matches?(/^Test[3-5]$/)).to be true
+            expect(matcher._matches?(/\ATest[3-5]\z/)).to be true
           end
         end
       end

data/spec/mongoid/matchable/regexp_spec.rb

@@ -18,7 +18,7 @@ describe Mongoid::Matchable::Regexp do
     context 'when a BSON::Regexp::Raw object is passed' do
 
       let(:regexp) do
-        BSON::Regexp::Raw.new('^Em')
+        BSON::Regexp::Raw.new("\\AEm")
       end
 
       it 'compiles the regexp object to a native regexp for the matching' do
@@ -40,7 +40,7 @@ describe Mongoid::Matchable::Regexp do
     context 'when a native Regexp object is passed' do
 
       let(:regexp) do
-        /^Em/
+        /\AEm/
       end
 
       it 'calls super with the native regexp' do

data/spec/mongoid/matchable_spec.rb

@@ -296,7 +296,7 @@ describe Mongoid::Matchable do
       context 'when a BSON::Regexp::Raw object is used' do
 
         let(:selector) do
-          { street: BSON::Regexp::Raw.new("^Clarkenwell") }
+          { street: BSON::Regexp::Raw.new("\\AClarkenwell") }
         end
 
         it "returns true" do
@@ -307,7 +307,7 @@ describe Mongoid::Matchable do
       context 'when a native Regexp object is used' do
 
         let(:selector) do
-          { street: /^Clarkenwell/ }
+          { street: /\AClarkenwell/ }
         end
 
         it "returns true" do

data/spec/mongoid/query_cache_spec.rb

@@ -183,7 +183,8 @@ describe Mongoid::QueryCache do
         end
       end
 
-      context 'when the first query has a collation', if: collation_supported? do
+      context 'when the first query has a collation' do
+        min_server_version '3.4'
 
         before do
           Band.where(name: 'DEPECHE MODE').collation(locale: 'en_US', strength: 2).to_a

data/spec/mongoid/relations/proxy_spec.rb

@@ -5,7 +5,7 @@
 #
 # describe Mongoid::Relations::Proxy do
 #
-#   describe '#with', if: non_legacy_server? do
+#   describe '#with' do
 #
 #     let(:circus) do
 #       Circus.new

data/spec/mongoid/scopable_spec.rb

@@ -230,7 +230,8 @@ describe Mongoid::Scopable do
 
     context "when provided a criteria" do
 
-      context 'when a collation is defined on the criteria', if: collation_supported? do
+      context 'when a collation is defined on the criteria' do
+        min_server_version '3.4'
 
         before do
           Band.scope(:tests, ->{ Band.where(name: 'TESTING').collation(locale: 'en_US', strength: 2) })

data/spec/mongoid/shardable_models.rb

@@ -19,7 +19,7 @@ class SmActor
 
   # This is not a usable shard configuration for the server.
   # We just have it for unit tests.
-  shard_key age: 1, 'gender' => :hashed
+  shard_key age: 1, 'gender' => :hashed, 'hello' => :hashed
 end
 
 class SmAssistant

data/spec/mongoid/shardable_spec.rb

@@ -48,12 +48,12 @@ describe Mongoid::Shardable do
 
       context 'with string value' do
         it 'sets shard key fields to symbol value' do
-          SmActor.shard_key_fields.should == %i(age gender)
+          SmActor.shard_key_fields.should == %i(age gender hello)
         end
 
         it 'sets shard config' do
           SmActor.shard_config.should == {
-            key: {age: 1, gender: 'hashed'},
+            key: {age: 1, gender: 'hashed', hello: 'hashed'},
             options: {},
           }
         end

data/spec/mongoid/tasks/database_rake_spec.rb

@@ -48,7 +48,7 @@ shared_context "rails rake task" do
   end
 end
 
-describe "db:drop", if: non_legacy_server? do
+describe "db:drop" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -61,7 +61,7 @@ describe "db:drop", if: non_legacy_server? do
   end
 end
 
-describe "db:purge", if: non_legacy_server? do
+describe "db:purge" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -74,7 +74,7 @@ describe "db:purge", if: non_legacy_server? do
   end
 end
 
-describe "db:seed", if: non_legacy_server? do
+describe "db:seed" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -88,7 +88,7 @@ describe "db:seed", if: non_legacy_server? do
   end
 end
 
-describe "db:setup", if: non_legacy_server? do
+describe "db:setup" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -120,7 +120,7 @@ describe "db:setup", if: non_legacy_server? do
   end
 end
 
-describe "db:reset", if: non_legacy_server? do
+describe "db:reset" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -138,7 +138,7 @@ describe "db:reset", if: non_legacy_server? do
   end
 end
 
-describe "db:create", if: non_legacy_server? do
+describe "db:create" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -147,7 +147,7 @@ describe "db:create", if: non_legacy_server? do
   end
 end
 
-describe "db:migrate", if: non_legacy_server? do
+describe "db:migrate" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -156,7 +156,7 @@ describe "db:migrate", if: non_legacy_server? do
   end
 end
 
-describe "db:test:prepare", if: non_legacy_server? do
+describe "db:test:prepare" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -177,7 +177,7 @@ describe "db:test:prepare", if: non_legacy_server? do
   end
 end
 
-describe "db:mongoid:create_indexes", if: non_legacy_server? do
+describe "db:mongoid:create_indexes" do
   include_context "rake task"
 
   it_behaves_like "create_indexes"
@@ -201,7 +201,7 @@ describe "db:mongoid:create_indexes", if: non_legacy_server? do
   end
 end
 
-describe "db:mongoid:remove_undefined_indexes", if: non_legacy_server? do
+describe "db:mongoid:remove_undefined_indexes" do
   include_context "rake task"
 
   it "receives remove_undefined_indexes" do
@@ -227,7 +227,7 @@ describe "db:mongoid:remove_undefined_indexes", if: non_legacy_server? do
   end
 end
 
-describe "db:mongoid:remove_indexes", if: non_legacy_server? do
+describe "db:mongoid:remove_indexes" do
   include_context "rake task"
 
   it "receives remove_indexes" do
@@ -253,7 +253,7 @@ describe "db:mongoid:remove_indexes", if: non_legacy_server? do
   end
 end
 
-describe "db:mongoid:drop", if: non_legacy_server? do
+describe "db:mongoid:drop" do
   include_context "rake task"
 
   it "works" do
@@ -269,7 +269,7 @@ describe "db:mongoid:drop", if: non_legacy_server? do
   end
 end
 
-describe "db:mongoid:purge", if: non_legacy_server? do
+describe "db:mongoid:purge" do
   include_context "rake task"
 
   it "receives a purge" do

data/spec/mongoid/tasks/database_spec.rb

@@ -136,7 +136,7 @@ describe "Mongoid::Tasks::Database" do
       expect(removed_indexes).to be_empty
     end
 
-    context 'when the index is a text index', if: non_legacy_server? do
+    context 'when the index is a text index' do
 
       before do
         class Band

data/spec/spec_helper.rb

@@ -77,37 +77,6 @@ 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)

data/spec/support/child_process_helper.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+autoload :ChildProcess, 'childprocess'
+autoload :Tempfile, 'tempfile'
+
+module ChildProcessHelper
+  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