mongoid 6.4.4 → 7.3.2

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
@@ -946,6 +949,29 @@ describe Mongoid::Changeable do
       end
     end
 
+    context 'when habtm association changes' do
+
+      let(:person) do
+        Person.create!(title: "Grand Poobah")
+      end
+
+      let(:user_account) do
+        UserAccount.create!
+      end
+
+      before do
+        person.user_accounts << user_account
+      end
+
+      it 'returns a hash of changes' do
+        pending 'https://jira.mongodb.org/browse/MONGOID-4843'
+
+        person.changes.should == {
+          user_account_ids: [[], [user_account.id]]
+        }
+      end
+    end
+
     context "when the document has not changed" do
 
       let(:acolyte) 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
@@ -12,13 +40,14 @@ describe Mongoid::Clients::Factory do
 
           let(:config) do
             {
-              default: { hosts: [ "127.0.0.1:27017" ], database: database_id },
-              secondary: { hosts: [ "127.0.0.1:27017" ], database: database_id }
+              default: { hosts: SpecConfig.instance.addresses, database: database_id },
+              analytics: { hosts: SpecConfig.instance.addresses, database: database_id }
             }
           end
 
           before do
             Mongoid::Config.send(:clients=, config)
+            # TODO: We should restore overwritten configuration in after block
           end
 
           after do
@@ -26,7 +55,7 @@ describe Mongoid::Clients::Factory do
           end
 
           let(:client) do
-            described_class.create(:secondary)
+            described_class.create(:analytics)
           end
 
           let(:cluster) do
@@ -37,13 +66,52 @@ 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("127.0.0.1:27017")
+          it 'does not produce driver warnings' do
+            Mongo::Logger.logger.should_not receive(:warn)
+            client
           end
 
+          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
+
+          context 'driver 2.13+' do
+            min_driver_version '2.13'
+
+            it 'sets Mongoid as a wrapping library' do
+              client.options[:wrapping_libraries].should == [BSON::Document.new(
+                Mongoid::Clients::Factory::MONGOID_WRAPPING_LIBRARY)]
+            end
+
+            context 'when configuration specifies a wrapping library' do
+
+              let(:config) do
+                {
+                  default: { hosts: SpecConfig.instance.addresses, database: database_id },
+                  analytics: {
+                    hosts: SpecConfig.instance.addresses,
+                    database: database_id,
+                    options: {
+                      wrapping_libraries: [{name: 'Foo'}],
+                    },
+                  }
+                }
+              end
+
+              it 'adds Mongoid as another wrapping library' do
+                client.options[:wrapping_libraries].should == [
+                  BSON::Document.new(Mongoid::Clients::Factory::MONGOID_WRAPPING_LIBRARY),
+                  {'name' => 'Foo'},
+                ]
+              end
+            end
+          end
         end
 
         context "when the configuration has no ports" do
@@ -51,12 +119,13 @@ describe Mongoid::Clients::Factory do
           let(:config) do
             {
               default: { hosts: [ "127.0.0.1" ], database: database_id },
-              secondary: { hosts: [ "127.0.0.1" ], database: database_id }
+              analytics: { hosts: [ "127.0.0.1" ], database: database_id }
             }
           end
 
           before do
             Mongoid::Config.send(:clients=, config)
+            # TODO: We should restore overwritten configuration in after block
           end
 
           after do
@@ -64,7 +133,7 @@ describe Mongoid::Clients::Factory do
           end
 
           let(:client) do
-            described_class.create(:secondary)
+            described_class.create(:analytics)
           end
 
           let(:default) do
@@ -80,11 +149,11 @@ describe Mongoid::Clients::Factory do
           end
 
           it "sets the cluster's seed ports to 27017" do
-            expect(cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
+            expect(%w(127.0.0.1:27017 localhost:27017)).to include(cluster.addresses.first.to_s)
           end
 
           it "sets ips with no ports to 27017" do
-            expect(default.cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
+            expect(%w(127.0.0.1:27017 localhost:27017)).to include(cluster.addresses.first.to_s)
           end
         end
 
@@ -95,12 +164,13 @@ describe Mongoid::Clients::Factory do
             let(:config) do
               {
                 default: { hosts: [ "127.0.0.1:27017" ], database: database_id },
-                secondary: { uri: "mongodb://127.0.0.1:27017/mongoid_test" }
+                analytics: { uri: "mongodb://127.0.0.1:27017/mongoid_test" }
               }
             end
 
             before do
               Mongoid::Config.send(:clients=, config)
+              # TODO: We should restore overwritten configuration in after block
             end
 
             after do
@@ -108,7 +178,7 @@ describe Mongoid::Clients::Factory do
             end
 
             let(:client) do
-              described_class.create(:secondary)
+              described_class.create(:analytics)
             end
 
             let(:cluster) do
@@ -120,7 +190,7 @@ describe Mongoid::Clients::Factory do
             end
 
             it "sets the cluster's seeds" do
-              expect(cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
+              expect(%w(127.0.0.1:27017 localhost:27017)).to include(cluster.addresses.first.to_s)
             end
 
             it "sets the database" do
@@ -132,13 +202,14 @@ describe Mongoid::Clients::Factory do
 
             let(:config) do
               {
-                default: { hosts: [ "127.0.0.1:1234" ], database: database_id },
-                secondary: { uri: "mongodb://127.0.0.1:1234,127.0.0.1:5678/mongoid_test" }
+                default: { hosts: [ "127.0.0.1:1234" ], database: database_id, server_selection_timeout: 1 },
+                analytics: { uri: "mongodb://127.0.0.1:1234,127.0.0.1:5678/mongoid_test?serverSelectionTimeoutMS=1000" }
               }
             end
 
             before do
               Mongoid::Config.send(:clients=, config)
+              # TODO: We should restore overwritten configuration in after block
             end
 
             after do
@@ -146,7 +217,7 @@ describe Mongoid::Clients::Factory do
             end
 
             let(:client) do
-              described_class.create(:secondary)
+              described_class.create(:analytics)
             end
 
             let(:cluster) do
@@ -181,11 +252,12 @@ describe Mongoid::Clients::Factory do
     context "when no name is provided" do
 
       let(:config) do
-        { default: { hosts: ["127.0.0.1:27017"], database: database_id }}
+        { default: { hosts: SpecConfig.instance.addresses, database: database_id }}
       end
 
       before do
         Mongoid::Config.send(:clients=, config)
+        # TODO: We should restore overwritten configuration in after block
       end
 
       after do
@@ -200,17 +272,15 @@ describe Mongoid::Clients::Factory do
         client.cluster
       end
 
-      let(:seeds) do
-        cluster.addresses.map{ |address| address.to_s }
+      let(:cluster_addresses) do
+        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 seeds" do
-        expect(seeds).to eq([ "127.0.0.1:27017" ])
-      end
+      it_behaves_like 'includes seed address'
     end
 
     context "when nil is provided and no default config" do
@@ -219,6 +289,7 @@ describe Mongoid::Clients::Factory do
 
       before do
         Mongoid.clients[:default] = nil
+        # TODO: We should restore overwritten configuration in after block
       end
 
       it "raises NoClientsConfig error" do
@@ -230,11 +301,12 @@ describe Mongoid::Clients::Factory do
   describe ".default" do
 
     let(:config) do
-      { default: { hosts: ["127.0.0.1:27017"], database: database_id }}
+      { default: { hosts: SpecConfig.instance.addresses, database: database_id }}
     end
 
     before do
       Mongoid::Config.send(:clients=, config)
+      # TODO: We should restore overwritten configuration in after block
     end
 
     after do
@@ -249,17 +321,15 @@ describe Mongoid::Clients::Factory do
       client.cluster
     end
 
-    let(:seeds) do
-      cluster.addresses.map{ |address| address.to_s }
+    let(:cluster_addresses) do
+      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 seeds" do
-      expect(seeds).to eq([ "127.0.0.1:27017" ])
-    end
+    it_behaves_like 'includes seed address'
   end
 
   context "when options are provided with string keys" do
@@ -267,7 +337,7 @@ describe Mongoid::Clients::Factory do
     let(:config) do
       {
         default: {
-          hosts: [ "127.0.0.1:27017" ],
+          hosts: SpecConfig.instance.addresses,
           database: database_id,
           options: {
             "server_selection_timeout" => 10,
@@ -279,6 +349,7 @@ describe Mongoid::Clients::Factory do
 
     before do
       Mongoid::Config.send(:clients=, config)
+      # TODO: We should restore overwritten configuration in after block
     end
 
     after do
@@ -293,17 +364,15 @@ describe Mongoid::Clients::Factory do
       client.cluster
     end
 
-    let(:seeds) do
-      cluster.addresses.map{ |address| address.to_s }
+    let(:cluster_addresses) do
+      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 seeds" do
-      expect(seeds).to eq([ "127.0.0.1:27017" ])
-    end
+    it_behaves_like 'includes seed address'
 
     it "sets the server selection timeout" do
       expect(cluster.options[:server_selection_timeout]).to eq(10)
@@ -317,4 +386,44 @@ describe Mongoid::Clients::Factory do
       expect(client.options[:platform]).to eq(Mongoid::PLATFORM_DETAILS)
     end
   end
+
+  context "unexpected config options" do
+    let(:unknown_opts) do
+      {
+        bad_one: 1,
+        another_one: "here"
+      }
+    end
+
+    let(:config) do
+      {
+        default: { hosts: SpecConfig.instance.addresses, database: database_id },
+        good_one: { hosts: [ "127.0.0.1:1234" ], database: database_id},
+        bad_one: { hosts: [ "127.0.0.1:1234" ], database: database_id}.merge(unknown_opts),
+        good_two: { uri: "mongodb://127.0.0.1:1234,127.0.0.1:5678/#{database_id}" },
+        bad_two: { uri: "mongodb://127.0.0.1:1234,127.0.0.1:5678/#{database_id}" }.merge(unknown_opts)
+      }
+    end
+
+    around(:each) do |example|
+      old_config = Mongoid::Config.clients
+      Mongoid::Config.send(:clients=, config)
+      example.run
+      Mongoid::Config.send(:clients=, old_config)
+    end
+
+    [:bad_one, :bad_two].each do |env|
+      it 'does not log a warning if none' do
+        expect(described_class.send(:default_logger)).not_to receive(:warn)
+        described_class.create(env).close
+      end
+    end
+
+    [:bad_one, :bad_two].each do |env|
+      it 'logs a warning if some' do
+        expect(described_class.send(:default_logger)).not_to receive(:warn)
+        described_class.create(env).close
+      end
+    end
+  end
 end

data/spec/mongoid/clients/options_spec.rb

@@ -1,13 +1,25 @@
+# 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,
+    # to make these assertions work in jruby we cannot have connections
+    # bleeding from one test to another and this includes background SDAM
+    # threads in the driver
+    Mongoid.disconnect_clients
+    Mongoid::Clients.clients.clear
+  end
 
-  describe '#with', if: non_legacy_server? do
+  describe '#with' do
 
     context 'when passing some options' do
 
       let(:persistence_context) do
-        Band.with(options) do |klass|
+        Minim.with(options) do |klass|
           klass.persistence_context
         end
       end
@@ -19,13 +31,13 @@ describe Mongoid::Clients::Options do
       end
 
       it 'does not set the options on class level' do
-        expect(Band.persistence_context.client.options['database']).to eq('mongoid_test')
+        expect(Minim.persistence_context.client.options['database']).to eq('mongoid_test')
       end
 
       context 'when the options are not valid mongo client options' do
 
         let(:persistence_context) do
-          Band.with(invalid_options) do |klass|
+          Minim.with(invalid_options) do |klass|
             klass.persistence_context
           end
         end
@@ -40,7 +52,7 @@ describe Mongoid::Clients::Options do
 
         it 'clears the persistence context' do
           begin; persistence_context; rescue Mongoid::Errors::InvalidPersistenceOption; end
-          expect(Band.persistence_context).to eq(Mongoid::PersistenceContext.new(Band))
+          expect(Minim.persistence_context).to eq(Mongoid::PersistenceContext.new(Minim))
         end
       end
 
@@ -63,17 +75,17 @@ describe Mongoid::Clients::Options do
         end
       end
 
-      context 'when passing a block', if: testing_locally? do
+      context 'when passing a block' do
 
         let!(:connections_before) do
-          Band.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+          Minim.mongo_client.database.command(serverStatus: 1).first['connections']['current']
         end
 
         let!(:connections_and_cluster_during) do
           connections = nil
-          cluster = Band.with(options) do |klass|
+          cluster = Minim.with(options) do |klass|
             klass.where(name: 'emily').to_a
-            connections = Band.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+            connections = Minim.mongo_client.database.command(serverStatus: 1).first['connections']['current']
           end
           [ connections, cluster ]
         end
@@ -87,18 +99,20 @@ describe Mongoid::Clients::Options do
         end
 
         let(:connections_after) do
-          Band.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+          Minim.mongo_client.database.command(serverStatus: 1).first['connections']['current']
         end
 
         let!(:cluster_before) do
-          Band.persistence_context.cluster
+          Minim.persistence_context.cluster
         end
 
         let(:cluster_after) do
-          Band.persistence_context.cluster
+          Minim.persistence_context.cluster
         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 }
@@ -115,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' }
@@ -125,6 +141,8 @@ describe Mongoid::Clients::Options do
           end
 
           it 'does not disconnect the original cluster' do
+            skip 'https://jira.mongodb.org/browse/MONGOID-5130'
+
             expect(connections_after).to eq(connections_before)
             expect(cluster_before).to be(cluster_after)
           end
@@ -134,8 +152,8 @@ describe Mongoid::Clients::Options do
 
           let(:config) do
             {
-                default: { hosts: [ "127.0.0.1:27017" ], database: database_id },
-                secondary: { uri: "mongodb://127.0.0.1:27017/secondary-db?connectTimeoutMS=3000" }
+                default: { hosts: SpecConfig.instance.addresses, database: database_id },
+                analytics: { uri: "mongodb://#{SpecConfig.instance.addresses.first}/analytics-db?connectTimeoutMS=3000" }
             }
           end
 
@@ -148,14 +166,14 @@ describe Mongoid::Clients::Options do
           end
 
           let(:persistence_context) do
-            Band.with(client: :secondary) do |klass|
+            Minim.with(client: :analytics) do |klass|
               klass.persistence_context
             end
           end
 
           it 'uses the database specified in the uri' do
-            expect(persistence_context.database_name).to eq('secondary-db')
-            expect(persistence_context.client.database.name).to eq('secondary-db')
+            expect(persistence_context.database_name).to eq('analytics-db')
+            expect(persistence_context.client.database.name).to eq('analytics-db')
           end
 
           it 'uses the options specified in the uri' do
@@ -181,7 +199,7 @@ describe Mongoid::Clients::Options do
 
           let(:context_and_criteria) do
             collection = nil
-            cxt = Band.with(read_secondary_option) do |klass|
+            cxt = Minim.with(read_secondary_option) do |klass|
               collection = klass.all.collection
               klass.persistence_context
             end
@@ -221,11 +239,11 @@ describe Mongoid::Clients::Options do
           100.times do |i|
             threads << Thread.new do
               if i % 2 == 0
-                Band.with(collection: 'British') do |klass|
+                NameOnly.with(collection: 'British') do |klass|
                   klass.create(name: 'realised')
                 end
               else
-                Band.with(collection: 'American') do |klass|
+                NameOnly.with(collection: 'American') do |klass|
                   klass.create(name: 'realized')
                 end
               end
@@ -235,13 +253,13 @@ describe Mongoid::Clients::Options do
         end
 
         let(:british_count) do
-          Band.with(collection: 'British') do |klass|
+          NameOnly.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
 
         let(:american_count) do
-          Band.with(collection: 'American') do |klass|
+          NameOnly.with(collection: 'American') do |klass|
             klass.all.count
           end
         end
@@ -256,7 +274,7 @@ describe Mongoid::Clients::Options do
     context 'when passing a persistence context' do
 
       let(:instance) do
-        Band.new
+        Minim.new
       end
 
       let(:persistence_context) do
@@ -268,14 +286,14 @@ describe Mongoid::Clients::Options do
       let(:options) { { database: 'other' } }
 
       it 'sets the persistence context on the object' do
-        Band.new.with(persistence_context) do |band_instance|
-          expect(band_instance.persistence_context.options).to eq(persistence_context.options)
+        Minim.new.with(persistence_context) do |model_instance|
+          expect(model_instance.persistence_context.options).to eq(persistence_context.options)
         end
       end
     end
   end
 
-  describe '.with', if: non_legacy_server? do
+  describe '.with' do
 
     context 'when passing some options' do
 
@@ -283,12 +301,12 @@ describe Mongoid::Clients::Options do
         { database: 'other' }
       end
 
-      let(:band) do
-        Band.create
+      let(:test_model) do
+        Minim.create
       end
 
       let(:persistence_context) do
-        band.with(options) do |object|
+        test_model.with(options) do |object|
           object.persistence_context
         end
       end
@@ -298,13 +316,13 @@ describe Mongoid::Clients::Options do
       end
 
       it 'does not set the options on instance level' do
-        expect(band.persistence_context.client.database.name).to eq('mongoid_test')
+        expect(test_model.persistence_context.client.database.name).to eq('mongoid_test')
       end
 
       context 'when the options are not valid mongo client options' do
 
         let(:persistence_context) do
-          band.with(invalid_options) do |object|
+          test_model.with(invalid_options) do |object|
             object.persistence_context
           end
         end
@@ -319,7 +337,7 @@ describe Mongoid::Clients::Options do
 
         it 'clears the persistence context' do
           begin; persistence_context; rescue Mongoid::Errors::InvalidPersistenceOption; end
-          expect(band.persistence_context).to eq(Mongoid::PersistenceContext.new(band))
+          expect(test_model.persistence_context).to eq(Mongoid::PersistenceContext.new(test_model))
         end
       end
 
@@ -327,8 +345,13 @@ describe Mongoid::Clients::Options do
 
         let(:config) do
           {
-              default: { hosts: [ "127.0.0.1:27017" ], database: database_id },
-              secondary: { uri: "mongodb://127.0.0.1:27017/secondary-db" }
+              default: { hosts: SpecConfig.instance.addresses, database: database_id },
+              analytics: {
+                uri: "mongodb://#{SpecConfig.instance.addresses.first}/analytics-db",
+                options: {
+                  server_selection_timeout: 0.5,
+                },
+              }
           }
         end
 
@@ -337,28 +360,28 @@ describe Mongoid::Clients::Options do
         end
 
         let(:persistence_context) do
-          band.with(client: :secondary) do |object|
+          test_model.with(client: :analytics) do |object|
             object.persistence_context
           end
         end
 
         it 'uses the database specified in the uri' do
-          expect(persistence_context.database_name).to eq('secondary-db')
-          expect(persistence_context.client.database.name).to eq('secondary-db')
+          expect(persistence_context.database_name).to eq('analytics-db')
+          expect(persistence_context.client.database.name).to eq('analytics-db')
         end
       end
 
-      context 'when passing a block', if: testing_locally? do
+      context 'when passing a block' do
 
         let!(:connections_before) do
-          band.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+          test_model.mongo_client.database.command(serverStatus: 1).first['connections']['current']
         end
 
         let!(:connections_and_cluster_during) do
           connections = nil
-          cluster = band.with(options) do |b|
+          cluster = test_model.with(options) do |b|
             b.reload
-            connections = band.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+            connections = test_model.mongo_client.database.command(serverStatus: 1).first['connections']['current']
             b.persistence_context.cluster
           end
           [ connections, cluster ]
@@ -373,34 +396,38 @@ describe Mongoid::Clients::Options do
         end
 
         let(:connections_after) do
-          band.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+          test_model.mongo_client.database.command(serverStatus: 1).first['connections']['current']
         end
 
         let!(:cluster_before) do
-          band.persistence_context.cluster
+          test_model.persistence_context.cluster
         end
 
         let(:cluster_after) do
-          band.persistence_context.cluster
+          test_model.persistence_context.cluster
         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 } }
 
@@ -431,15 +458,15 @@ describe Mongoid::Clients::Options do
         before do
           threads = []
           100.times do |i|
-            band = Band.create
+            test_model = NameOnly.create
             threads << Thread.new do
               if i % 2 == 0
-                band.with(collection: 'British') do |b|
+                test_model.with(collection: 'British') do |b|
                   b.name = 'realised'
                   b.upsert
                 end
               else
-                band.with(collection: 'American') do |b|
+                test_model.with(collection: 'American') do |b|
                   b.name = 'realized'
                   b.upsert
                 end
@@ -450,13 +477,13 @@ describe Mongoid::Clients::Options do
         end
 
         let(:british_count) do
-          Band.with(collection: 'British') do |klass|
+          NameOnly.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
 
         let(:american_count) do
-          Band.with(collection: 'British') do |klass|
+          NameOnly.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
@@ -471,7 +498,7 @@ describe Mongoid::Clients::Options do
     context 'when passing a persistence context' do
 
       let(:persistence_context) do
-        Band.with(options) do |klass|
+        Minim.with(options) do |klass|
           klass.persistence_context
         end
       end
@@ -479,8 +506,8 @@ describe Mongoid::Clients::Options do
       let(:options) { { database: 'other' } }
 
       it 'sets the persistence context on the object' do
-        Band.with(persistence_context) do |band_class|
-          expect(band_class.persistence_context.options).to eq(persistence_context.options)
+        Minim.with(persistence_context) do |test_model_class|
+          expect(test_model_class.persistence_context.options).to eq(persistence_context.options)
         end
       end
     end