mongoid 5.4.0 → 6.4.8

data/spec/mongoid/clients_spec.rb

@@ -6,34 +6,38 @@ describe Mongoid::Clients do
 
     shared_examples_for "an overridden collection at the class level" do
 
-      let(:band) do
-        klass.new
-      end
-
       it "returns the collection for the model" do
-        expect(band.collection).to be_a(Mongo::Collection)
+        expect(instance_collection).to be_a(Mongo::Collection)
       end
 
       it "sets the correct collection name" do
-        expect(band.collection.name).to eq("artists")
+        expect(instance_collection.name).to eq("artists")
       end
 
       context "when accessing from the class level" do
 
         it "returns the collection for the model" do
-          expect(klass.collection).to be_a(Mongo::Collection)
+          expect(class_collection).to be_a(Mongo::Collection)
         end
 
         it "sets the correct collection name" do
-          expect(klass.collection.name).to eq("artists")
+          expect(class_collection.name).to eq("artists")
         end
       end
     end
 
     context "when overriding the persistence options" do
 
-      let(:klass) do
-        Band.with(collection: "artists")
+      let(:instance_collection) do
+        Band.with(collection: "artists") do |klass|
+          klass.new.collection
+        end
+      end
+
+      let(:class_collection) do
+        Band.with(collection: "artists") do |klass|
+          klass.collection
+        end
       end
 
       it_behaves_like "an overridden collection at the class level"
@@ -41,10 +45,6 @@ describe Mongoid::Clients do
 
     context "when overriding store_in and persistence options" do
 
-      let(:klass) do
-        Band.with(collection: "artists")
-      end
-
       before do
         Band.store_in collection: "foo"
       end
@@ -53,6 +53,18 @@ describe Mongoid::Clients do
         Band.reset_storage_options!
       end
 
+      let(:instance_collection) do
+        Band.with(collection: "artists") do |klass|
+          klass.new.collection
+        end
+      end
+
+      let(:class_collection) do
+        Band.with(collection: "artists") do |klass|
+          klass.collection
+        end
+      end
+
       it_behaves_like "an overridden collection at the class level"
     end
 
@@ -77,19 +89,23 @@ describe Mongoid::Clients do
 
       context "when overriding with a proc" do
 
-        let(:klass) { Band }
-
         before do
           Band.store_in(collection: ->{ "artists" })
         end
 
+        let(:instance_collection) do
+          Band.new.collection
+        end
+
+        let(:class_collection) do
+          Band.collection
+        end
+
         it_behaves_like "an overridden collection at the class level"
       end
 
       context "when overriding with a string" do
 
-        let(:klass) { Band }
-
         before do
           Band.store_in(collection: "artists")
         end
@@ -98,19 +114,33 @@ describe Mongoid::Clients do
           Band.reset_storage_options!
         end
 
+        let(:instance_collection) do
+          Band.new.collection
+        end
+
+        let(:class_collection) do
+          Band.collection
+        end
+
         it_behaves_like "an overridden collection at the class level"
       end
 
       context "when overriding with a symbol" do
 
-        let(:klass) { Band }
-
         before do
-          klass.store_in(collection: :artists)
+          Band.store_in(collection: :artists)
         end
 
         after do
-          klass.reset_storage_options!
+          Band.reset_storage_options!
+        end
+
+        let(:instance_collection) do
+          Band.new.collection
+        end
+
+        let(:class_collection) do
+          Band.collection
         end
 
         it_behaves_like "an overridden collection at the class level"
@@ -148,29 +178,33 @@ describe Mongoid::Clients do
 
     shared_examples_for "an overridden collection name at the class level" do
 
-      let(:band) do
-        klass.new
-      end
-
       context "when accessing from the instance" do
 
         it "returns the overridden value" do
-          expect(band.collection_name).to eq(:artists)
+          expect(instance_collection_name).to eq(:artists)
         end
       end
 
       context "when accessing from the class level" do
 
         it "returns the overridden value" do
-          expect(klass.collection_name).to eq(:artists)
+          expect(class_collection_name).to eq(:artists)
         end
       end
     end
 
     context "when overriding the persistence options" do
 
-      let(:klass) do
-        Band.with(collection: "artists")
+      let(:instance_collection_name) do
+        Band.with(collection: "artists") do |klass|
+          klass.new.collection_name
+        end
+      end
+
+      let(:class_collection_name) do
+        Band.with(collection: "artists") do |klass|
+          klass.collection_name
+        end
       end
 
       it_behaves_like "an overridden collection name at the class level"
@@ -178,8 +212,16 @@ describe Mongoid::Clients do
 
     context "when overriding store_in and persistence options" do
 
-      let(:klass) do
-        Band.with(collection: "artists")
+      let(:instance_collection_name) do
+        Band.with(collection: "artists") do |klass|
+          klass.new.collection_name
+        end
+      end
+
+      let(:class_collection_name) do
+        Band.with(collection: "artists") do |klass|
+          klass.collection_name
+        end
       end
 
       before do
@@ -195,7 +237,13 @@ describe Mongoid::Clients do
 
     context "when overriding the default with store_in" do
 
-      let(:klass) { Band }
+      let(:instance_collection_name) do
+        Band.new.collection_name
+      end
+
+      let(:class_collection_name) do
+        Band.collection_name
+      end
 
       after do
         Band.reset_storage_options!
@@ -266,38 +314,51 @@ describe Mongoid::Clients do
     end
   end
 
-  describe "#database_name", if: non_legacy_server? do
+  describe "#database_name" do
 
     shared_examples_for "an overridden database name" do
 
-      let(:band) do
-        klass.new
+      after do
+        class_mongo_client.close
       end
 
       context "when accessing from the instance" do
 
         it "returns the overridden value" do
-          # @todo
-          # expect(band.mongo_client.options[:database].to_s).to eq(database_id_alt)
+          expect(instance_database.name.to_s).to eq(database_id_alt)
         end
       end
 
       context "when accessing from the class level" do
 
         it "returns the overridden value" do
-          expect(klass.database_name.to_s).to eq(database_id_alt)
+          expect(class_database.name.to_s).to eq(database_id_alt)
         end
 
         it "client returns the overridden value" do
-          expect(klass.mongo_client.options[:database].to_s).to eq(database_id_alt)
+          expect(class_mongo_client.database.name).to eq(database_id_alt)
         end
       end
     end
 
     context "when overriding the persistence options" do
 
-      let(:klass) do
-        Band.with(database: database_id_alt)
+      let(:instance_database) do
+        Band.with(database: database_id_alt) do |klass|
+          klass.new.mongo_client.database
+        end
+      end
+
+      let(:class_database) do
+        Band.with(database: database_id_alt) do |klass|
+          klass.mongo_client.database
+        end
+      end
+
+      let(:class_mongo_client) do
+        Band.with(database: database_id_alt) do |klass|
+          klass.new.mongo_client
+        end
       end
 
       it_behaves_like "an overridden database name"
@@ -305,7 +366,17 @@ describe Mongoid::Clients do
 
     context "when overriding with store_in" do
 
-      let(:klass) { Band }
+      let(:instance_database) do
+        Band.new.mongo_client.database
+      end
+
+      let(:class_database) do
+        Band.mongo_client.database
+      end
+
+      let(:class_mongo_client) do
+        Band.mongo_client
+      end
 
       before do
         Band.store_in database: database_id_alt
@@ -313,6 +384,7 @@ describe Mongoid::Clients do
 
       after do
         Band.reset_storage_options!
+        class_mongo_client.close
       end
 
       it_behaves_like "an overridden database name"
@@ -320,8 +392,22 @@ describe Mongoid::Clients do
 
     context "when overriding store_in and persistence options" do
 
-      let(:klass) do
-        Band.with(database: database_id_alt)
+      let(:instance_database) do
+        Band.with(database: database_id_alt) do |klass|
+          klass.new.mongo_client.database
+        end
+      end
+
+      let(:class_database) do
+        Band.with(database: database_id_alt) do |klass|
+          klass.mongo_client.database
+        end
+      end
+
+      let(:class_mongo_client) do
+        Band.with(database: database_id_alt) do |klass|
+          klass.new.mongo_client
+        end
       end
 
       before do
@@ -330,6 +416,7 @@ describe Mongoid::Clients do
 
       after do
         Band.reset_storage_options!
+        class_mongo_client.close
       end
 
       it_behaves_like "an overridden database name"
@@ -349,8 +436,22 @@ describe Mongoid::Clients do
 
       context "when overriding the persistence options" do
 
-        let(:klass) do
-          Band.with(client: client_name)
+        let(:instance_database) do
+          Band.with(client: :alternative) do |klass|
+            klass.new.mongo_client.database
+          end
+        end
+
+        let(:class_database) do
+          Band.with(client: :alternative) do |klass|
+            klass.mongo_client.database
+          end
+        end
+
+        let(:class_mongo_client) do
+          Band.with(client: :alternative) do |klass|
+            klass.new.mongo_client
+          end
         end
 
         it_behaves_like "an overridden database name"
@@ -358,7 +459,17 @@ describe Mongoid::Clients do
 
       context "when overriding with store_in" do
 
-        let(:klass) { Band }
+        let(:instance_database) do
+          Band.new.mongo_client.database
+        end
+
+        let(:class_database) do
+          Band.mongo_client.database
+        end
+
+        let(:class_mongo_client) do
+          Band.mongo_client
+        end
 
         before do
           Band.store_in(client: client_name)
@@ -366,6 +477,7 @@ describe Mongoid::Clients do
 
         after do
           Band.reset_storage_options!
+          class_mongo_client.close
         end
 
         it_behaves_like "an overridden database name"
@@ -373,7 +485,7 @@ describe Mongoid::Clients do
     end
   end
 
-  describe "#mongo_client", if: non_legacy_server? do
+  describe "#mongo_client" do
 
     let(:file) do
       File.join(File.dirname(__FILE__), "..", "config", "mongoid.yml")
@@ -397,6 +509,10 @@ describe Mongoid::Clients do
         Mongoid.clients[:default][:database] = database_id
       end
 
+      after do
+        mongo_client.close
+      end
+
       let!(:band) do
         Band.new
       end
@@ -424,10 +540,6 @@ describe Mongoid::Clients do
         Band.store_in(client: :nonexistent)
       end
 
-      after do
-        Band.reset_storage_options!
-      end
-
       let(:band) do
         Band.new
       end
@@ -439,7 +551,7 @@ describe Mongoid::Clients do
       end
     end
 
-    context "when getting a client by name", if: testing_locally? do
+    context "when getting a client by name" do
 
       let(:file) do
         File.join(File.dirname(__FILE__), "..", "config", "mongoid.yml")
@@ -457,11 +569,7 @@ describe Mongoid::Clients do
         Band.reset_storage_options!
       end
 
-      let!(:band) do
-        Band.store_in(client: :reports)
-      end
-
-      let!(:mongo_client) do
+      let(:mongo_client) do
         Band.new.mongo_client
       end
 
@@ -497,7 +605,7 @@ describe Mongoid::Clients do
     end
   end
 
-  describe ".mongo_client", if: non_legacy_server? do
+  describe ".mongo_client" do
 
     let(:file) do
       File.join(File.dirname(__FILE__), "..", "config", "mongoid.yml")
@@ -526,7 +634,7 @@ describe Mongoid::Clients do
         Mongoid.clients[:default][:database] = database_id
       end
 
-      let(:mongo_client) do
+      let!(:mongo_client) do
         Band.mongo_client
       end
 
@@ -568,7 +676,7 @@ describe Mongoid::Clients do
       end
     end
 
-    context "when provided a class that extend another document" do
+    context "when provided a class that extends another document" do
 
       let(:klass) do
         Class.new(Band)
@@ -599,7 +707,9 @@ describe Mongoid::Clients do
     context "when changing write concern options" do
 
       let(:client_one) do
-        Band.with(write: { w: 2 }).mongo_client
+        Band.with(write: { w: 2 }) do |klass|
+          klass.mongo_client
+        end
       end
 
       let(:client_two) do
@@ -614,13 +724,17 @@ describe Mongoid::Clients do
     context "when sending operations to a different database" do
 
       after do
-        Band.with(database: database_id_alt).delete_all
+        Band.with(database: database_id_alt) do |klass|
+          klass.delete_all
+        end
       end
 
       describe ".create" do
 
         let!(:band) do
-          Band.with(database: database_id_alt).create
+          Band.with(database: database_id_alt) do |klass|
+            klass.create
+          end
         end
 
         it "does not persist to the default database" do
@@ -630,15 +744,23 @@ describe Mongoid::Clients do
         end
 
         let(:from_db) do
-          Band.with(database: database_id_alt).find(band.id)
+          Band.with(database: database_id_alt) do |klass|
+            klass.find(band.id)
+          end
         end
 
         it "persists to the specified database" do
           expect(from_db).to eq(band)
         end
 
+        let(:count) do
+          Band.with(database: database_id_alt) do |klass|
+            klass.count
+          end
+        end
+
         it "persists the correct number of documents" do
-          expect(Band.with(database: database_id_alt).count).to eq(1)
+          expect(count).to eq(1)
         end
       end
     end
@@ -648,7 +770,9 @@ describe Mongoid::Clients do
       describe ".create" do
 
         let!(:band) do
-          Band.with(collection: "artists").create
+          Band.with(collection: "artists") do |klass|
+            klass.create
+          end
         end
 
         it "does not persist to the default database" do
@@ -658,15 +782,23 @@ describe Mongoid::Clients do
         end
 
         let(:from_db) do
-          Band.with(collection: "artists").find(band.id)
+          Band.with(collection: "artists") do |klass|
+            klass.find(band.id)
+          end
         end
 
         it "persists to the specified database" do
           expect(from_db).to eq(band)
         end
 
+        let(:count) do
+          Band.with(collection: "artists") do |klass|
+            klass.count
+          end
+        end
+
         it "persists the correct number of documents" do
-          expect(Band.with(collection: "artists").count).to eq(1)
+          expect(count).to eq(1)
         end
       end
     end
@@ -676,10 +808,15 @@ describe Mongoid::Clients do
       describe ".create" do
 
         before do
+          Person.index({ ssn: 1 }, { unique: true })
           Person.create_indexes
           Person.create(ssn: "432-97-1111")
         end
 
+        after do
+          Person.collection.drop
+        end
+
         context "when no error occurs" do
 
           it "inserts the document" do
@@ -703,6 +840,10 @@ describe Mongoid::Clients do
           Person.create!(ssn: "432-97-1112")
         end
 
+        after do
+          Person.collection.drop
+        end
+
         context "when no error occurs" do
 
           it "inserts the document" do
@@ -713,9 +854,14 @@ describe Mongoid::Clients do
         context "when a mongodb error occurs" do
 
           before do
+            Person.index({ ssn: 1 }, { unique: true })
             Person.create_indexes
           end
 
+          after do
+            Person.collection.drop
+          end
+
           it "bubbles up to the caller" do
             expect {
               Person.create!(ssn: "432-97-1112")
@@ -746,9 +892,14 @@ describe Mongoid::Clients do
           end
 
           before do
+            Person.index({ ssn: 1 }, { unique: true })
             Person.create_indexes
           end
 
+          after do
+            Person.collection.drop
+          end
+
           it "bubbles up to the caller" do
             expect {
               person.save
@@ -770,9 +921,14 @@ describe Mongoid::Clients do
           end
 
           before do
+            Person.index({ ssn: 1 }, { unique: true })
             Person.create_indexes
           end
 
+          after do
+            Person.collection.drop
+          end
+
           it "bubbles up to the caller" do
             expect {
               person.save!
@@ -796,7 +952,7 @@ describe Mongoid::Clients do
     end
   end
 
-  context "when overriding the default database", if: non_legacy_server? do
+  context "when overriding the default database" do
 
     let(:file) do
       File.join(File.dirname(__FILE__), "..", "config", "mongoid.yml")
@@ -808,42 +964,28 @@ describe Mongoid::Clients do
 
     context "when the override is global" do
 
-      shared_examples_for "a global database override" do
-
-        before do
-          Mongoid.override_database(:mongoid_optional)
-        end
-
-        after do
-          Band.delete_all
-          Mongoid.override_database(nil)
-        end
-
-        let!(:band) do
-          klass.create(name: "Tool")
-        end
-
-        it "persists to the overridden database" do
-          mongo_client = Band.mongo_client.with(database: :mongoid_optional)
-          expect(mongo_client[:bands].count(name: "Tool")).to eq(1)
-        end
-
-        it 'uses that database for the model mongo_client' do
-          expect(Band.mongo_client.database.name).to eq('mongoid_optional')
-        end
+      before do
+        Mongoid.override_database(:mongoid_optional)
       end
 
-      context "when normal usage" do
-        let(:klass) { Band }
-
-        it_behaves_like "a global database override"
+      after do
+        Band.delete_all
+        Band.mongo_client.close
+        Mongoid.override_database(nil)
       end
 
-      context "when overriding the persistence options" do
+      let!(:band) do
+        Band.create(name: "Tool")
+      end
 
-        let(:klass) { Band.with(connect_timeout: 10) }
+      it "persists to the overridden database" do
+        Band.mongo_client.with(database: :mongoid_optional) do |sess|
+          expect(sess[:bands].find(name: "Tool")).to_not be_nil
+        end
+      end
 
-        it_behaves_like "a global database override"
+      it 'uses that database for the model mongo_client' do
+        expect(Band.mongo_client.database.name).to eq('mongoid_optional')
       end
     end
   end

data/spec/mongoid/composable_spec.rb

@@ -20,5 +20,12 @@ describe Mongoid::Composable do
         end
       end
     end
+
+    Mongoid::Composable::RESERVED_METHOD_NAMES.each do |name|
+
+      it "includes the method names #{name}" do
+        expect(methods).to include(name)
+      end
+    end
   end
 end