mongoid 7.0.13 → 7.1.0.rc0

data/spec/mongoid/cacheable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Cacheable do

data/spec/mongoid/changeable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Changeable do

data/spec/mongoid/clients/factory_spec.rb

@@ -1,7 +1,35 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Clients::Factory do
 
+  shared_examples_for 'includes seed address' do
+    let(:configured_address) do
+      address = SpecConfig.instance.addresses.first
+      unless address.include?(':')
+        address = "#{address}:27017"
+      end
+      address
+    end
+
+    let(:expected_addresses) do
+      [
+        configured_address,
+        configured_address.sub(/\Alocalhost:/, '127.0.0.1:'),
+        configured_address.sub(/\A127\.0\.0\.1:/, 'localhost:'),
+      ].uniq
+    end
+
+    it 'includes seed address' do
+      ok = cluster_addresses.any? do |address|
+        expected_addresses.include?(address)
+      end
+      expect(ok).to be true
+    end
+  end
+
   describe ".create" do
 
     context "when provided a name" do
@@ -37,10 +65,12 @@ describe Mongoid::Clients::Factory do
             expect(client).to be_a(Mongo::Client)
           end
 
-          it "sets the cluster's seeds" do
-            expect(cluster.addresses.first.to_s).to eq(SpecConfig.instance.addresses.first)
+          let(:cluster_addresses) do
+            cluster.addresses.map(&:to_s)
           end
 
+          it_behaves_like 'includes seed address'
+
           it "sets the platform to Mongoid's platform constant" do
             expect(client.options[:platform]).to eq(Mongoid::PLATFORM_DETAILS)
           end
@@ -201,18 +231,14 @@ describe Mongoid::Clients::Factory do
       end
 
       let(:cluster_addresses) do
-        cluster.addresses.map{ |address| address.to_s }
+        cluster.addresses.map(&:to_s)
       end
 
       it "returns the default client" do
         expect(client).to be_a(Mongo::Client)
       end
 
-      it "sets the cluster's addresses" do
-        SpecConfig.instance.addresses.each do |address|
-          expect(cluster_addresses).to include(address)
-        end
-      end
+      it_behaves_like 'includes seed address'
     end
 
     context "when nil is provided and no default config" do
@@ -252,18 +278,14 @@ describe Mongoid::Clients::Factory do
     end
 
     let(:cluster_addresses) do
-      cluster.addresses.map{ |address| address.to_s }
+      cluster.addresses.map(&:to_s)
     end
 
     it "returns the default client" do
       expect(client).to be_a(Mongo::Client)
     end
 
-    it "sets the cluster's addresses" do
-      SpecConfig.instance.addresses.each do |address|
-        expect(cluster_addresses).to include(address)
-      end
-    end
+    it_behaves_like 'includes seed address'
   end
 
   context "when options are provided with string keys" do
@@ -298,18 +320,14 @@ describe Mongoid::Clients::Factory do
     end
 
     let(:cluster_addresses) do
-      cluster.addresses.map{ |address| address.to_s }
+      cluster.addresses.map(&:to_s)
     end
 
     it "returns the default client" do
       expect(client).to be_a(Mongo::Client)
     end
 
-    it "sets the cluster's addresses" do
-      SpecConfig.instance.addresses.each do |address|
-        expect(cluster_addresses).to include(address)
-      end
-    end
+    it_behaves_like 'includes seed address'
 
     it "sets the server selection timeout" do
       expect(cluster.options[:server_selection_timeout]).to eq(10)

data/spec/mongoid/clients/options_spec.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
-describe Mongoid::Clients::Options do
+describe Mongoid::Clients::Options, retry: 3 do
 
   before do
     # This test asserts on numbers of open connections,
@@ -11,7 +14,7 @@ describe Mongoid::Clients::Options do
     Mongoid::Clients.clients.clear
   end
 
-  describe '#with' do
+  describe '#with', if: non_legacy_server? do
 
     context 'when passing some options' do
 
@@ -108,6 +111,8 @@ describe Mongoid::Clients::Options do
         end
 
         context 'when the options create a new cluster' do
+          # This test fails on sharded topologies in Evergreen but not locally
+          require_topology :single, :replica_set
 
           let(:options) do
             { connect_timeout: 2 }
@@ -124,6 +129,8 @@ describe Mongoid::Clients::Options do
         end
 
         context 'when the options do not create a new cluster' do
+          # This test fails on sharded topologies in Evergreen but not locally
+          require_topology :single, :replica_set
 
           let(:options) do
             { database: 'same-cluster' }
@@ -230,11 +237,11 @@ describe Mongoid::Clients::Options do
           100.times do |i|
             threads << Thread.new do
               if i % 2 == 0
-                Minim.with(collection: 'British') do |klass|
+                NameOnly.with(collection: 'British') do |klass|
                   klass.create(name: 'realised')
                 end
               else
-                Minim.with(collection: 'American') do |klass|
+                NameOnly.with(collection: 'American') do |klass|
                   klass.create(name: 'realized')
                 end
               end
@@ -244,13 +251,13 @@ describe Mongoid::Clients::Options do
         end
 
         let(:british_count) do
-          Minim.with(collection: 'British') do |klass|
+          NameOnly.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
 
         let(:american_count) do
-          Minim.with(collection: 'American') do |klass|
+          NameOnly.with(collection: 'American') do |klass|
             klass.all.count
           end
         end
@@ -284,7 +291,7 @@ describe Mongoid::Clients::Options do
     end
   end
 
-  describe '.with' do
+  describe '.with', if: non_legacy_server? do
 
     context 'when passing some options' do
 
@@ -399,22 +406,26 @@ describe Mongoid::Clients::Options do
         end
 
         context 'when the options create a new cluster' do
+          # This test fails on sharded topologies in Evergreen but not locally
+          require_topology :single, :replica_set
 
           let(:options) do
             { connect_timeout: 2 }
           end
 
           it 'creates a new cluster' do
-            expect(connections_before).to be <(connections_during)
-            expect(cluster_before).not_to be(cluster_during)
+            expect(connections_during).to be > connections_before
+            expect(cluster_during).not_to be(cluster_before)
           end
 
           it 'disconnects the new cluster when the block exits' do
-            expect(connections_before).to eq(connections_after)
+            expect(connections_after).to eq(connections_before)
           end
         end
 
         context 'when the options do not create a new cluster' do
+          # This test fails on sharded topologies in Evergreen but not locally
+          require_topology :single, :replica_set
 
           let(:options) { { read: :secondary } }
 
@@ -445,7 +456,7 @@ describe Mongoid::Clients::Options do
         before do
           threads = []
           100.times do |i|
-            test_model = Minim.create
+            test_model = NameOnly.create
             threads << Thread.new do
               if i % 2 == 0
                 test_model.with(collection: 'British') do |b|
@@ -464,13 +475,13 @@ describe Mongoid::Clients::Options do
         end
 
         let(:british_count) do
-          Minim.with(collection: 'British') do |klass|
+          NameOnly.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
 
         let(:american_count) do
-          Minim.with(collection: 'British') do |klass|
+          NameOnly.with(collection: 'British') do |klass|
             klass.all.count
           end
         end

data/spec/mongoid/clients/sessions_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Clients::Sessions do
@@ -40,8 +43,7 @@ describe Mongoid::Clients::Sessions do
 
   context 'when a session is used on a model class' do
 
-    context 'when sessions are supported' do
-      min_server_version '3.6'
+    context 'when sessions are supported', if: sessions_supported? do
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -170,8 +172,7 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when sessions are not supported' do
-      max_server_version '3.4'
+    context 'when sessions are not supported', unless: sessions_supported? do
 
       let!(:error) do
         e = nil
@@ -198,8 +199,7 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when sessions are supported' do
-      min_server_version '3.6'
+    context 'when sessions are supported', if: sessions_supported? do
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -316,8 +316,7 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when sessions are not supported' do
-      max_server_version '3.4'
+    context 'when sessions are not supported', unless: sessions_supported? do
 
       let!(:error) do
         e = nil

data/spec/mongoid/clients/transactions_spec.rb

@@ -1,14 +1,17 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Clients::Sessions do
   before(:all) do
-    unless Mongo::VERSION >= '2.6'
+    if Gem::Version.new(Mongo::VERSION) < Gem::Version.new('2.6')
       skip 'Driver does not support transactions'
     end
   end
 
   before(:all) do
-    if Mongo::VERSION >= '2.6'
+    if Gem::Version.new(Mongo::VERSION) >= Gem::Version.new('2.6')
       CONFIG[:clients][:other] = CONFIG[:clients][:default].dup
       CONFIG[:clients][:other][:database] = 'other'
       Mongoid::Clients.clients.values.each(&:close)
@@ -18,7 +21,7 @@ describe Mongoid::Clients::Sessions do
   end
 
   after(:all) do
-    if Mongo::VERSION >= '2.6'
+    if Gem::Version.new(Mongo::VERSION) >= Gem::Version.new('2.6')
       Mongoid::Clients.with_name(:other).close
       Mongoid::Clients.clients.delete(:other)
     end
@@ -52,8 +55,7 @@ describe Mongoid::Clients::Sessions do
 
   context 'when a transaction is used on a model class' do
 
-    context 'when transactions are supported' do
-      require_transaction_support
+    context 'when transactions are supported', if: testing_transactions? do
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -189,10 +191,7 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when sessions are supported but transactions are not' do
-      min_server_version '3.6'
-      # Could also test 4.0 in sharded cluster
-      max_server_version '3.6'
+    context 'when sessions are supported but transactions are not', if: sessions_supported? && !testing_transactions? do
 
       let!(:error) do
         e = nil
@@ -223,8 +222,7 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when transactions are supported' do
-      require_transaction_support
+    context 'when transactions are supported', if: testing_transactions? do
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -347,23 +345,16 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when sessions are supported but transactions are not' do
-      min_server_version '3.6'
-      # Could also test 4.0 in sharded cluster
-      max_server_version '3.6'
+    context 'when sessions are supported but transactions are not', if: sessions_supported? && !testing_transactions? do
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
         Mongoid::Clients.with_name(:other).command(create: :people)
-
-        begin
-          subscriber.clear_events!
-          person.with(client: :other) do
-            example.run
-          end
-        ensure
-          Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
+        subscriber.clear_events!
+        person.with(client: :other) do
+          example.run
         end
+        Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
       end
 
       let!(:error) do

data/spec/mongoid/clients_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Clients do
@@ -725,7 +728,7 @@ describe Mongoid::Clients do
     end
   end
 
-  describe ".store_in" do
+  describe ".store_in", if: non_legacy_server? do
 
     context "when provided a non hash" do
 
@@ -762,7 +765,7 @@ describe Mongoid::Clients do
     end
   end
 
-  describe ".with" do
+  describe ".with", if: non_legacy_server? do
 
     context "when changing write concern options" do
 

data/spec/mongoid/composable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Composable do

data/spec/mongoid/config/environment_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Config::Environment do

data/spec/mongoid/config/options_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Config::Options do
@@ -18,7 +21,7 @@ describe Mongoid::Config::Options do
     context "when a default is provided" do
 
       after do
-        config.preload_models = false
+        config.reset
       end
 
       it "defines a getter" do
@@ -26,11 +29,28 @@ describe Mongoid::Config::Options do
       end
 
       it "defines a setter" do
-        (config.preload_models = expect(true)).to be true
+        expect(config.preload_models = true).to be true
+        expect(config.preload_models).to be true
       end
 
       it "defines a presence check" do
-        expect(config).to_not be_preload_models
+        expect(config.preload_models?).to be false
+      end
+    end
+
+    context 'when option is not a boolean' do
+      before do
+        config.app_name = 'foo'
+      end
+
+      after do
+        config.reset
+      end
+
+      context 'presence check' do
+        it 'is a boolean' do
+          expect(config.app_name?).to be true
+        end
       end
     end
   end