mongoid 7.2.6 → 7.3.0

data/spec/mongoid/attributes_spec.rb

@@ -96,6 +96,49 @@ describe Mongoid::Attributes do
             it "does not raise an error" do
               expect(from_db.map).to eq(map)
             end
+
+            context 'when only one of the hash fields is projected' do
+
+              let(:map) do
+                { 'dates' => { 'y' => { '2016' => 'Berlin', '2017' => 'Munich' } } }
+              end
+
+              let(:expected) do
+                { 'dates' => { 'y' => {
+                  '2016' => 'Berlin',
+                } } }
+              end
+
+              it 'retrieves only the projected fields' do
+                expect(from_db.map).to eq(expected)
+              end
+            end
+
+            context 'when several of the hash fields is projected' do
+
+              let(:map) do
+                { 'dates' => { 'y' => {
+                  '2016' => 'Berlin',
+                  '2017' => 'Munich',
+                  '2018' => 'Krakow',
+                } } }
+              end
+
+              let(:expected) do
+                { 'dates' => { 'y' => {
+                  '2016' => 'Berlin',
+                  '2018' => 'Krakow',
+                } } }
+              end
+
+              let(:from_db) do
+                Person.only('map.dates.y.2016', 'map.dates.y.2018').first
+              end
+
+              it 'retrieves only the projected fields' do
+                expect(from_db.map).to eq(expected)
+              end
+            end
           end
         end
 
@@ -298,16 +341,12 @@ describe Mongoid::Attributes do
           context 'when retrieving a field of the association using the dot notation' do
 
             it 'retrieves the field' do
-              pending 'MONGOID-5032, fixed in 7.3'
-
               expect(from_db['name.first_name']).to eq 'Jose'
             end
           end
 
           context 'when retrieving a field of a nested association using the dot notation' do
             it 'retrieves the field' do
-              pending 'MONGOID-5032, fixed in 7.3'
-
               expect(from_db['name.language.name']).to eq 'es'
             end
           end
@@ -320,8 +359,6 @@ describe Mongoid::Attributes do
 
           context 'when retrieving a field under the projected sub-association' do
             it 'retrieves the field' do
-              pending 'MONGOID-5032, fixed in 7.3'
-
               expect(from_db['name.language.name']).to eq 'es'
             end
           end
@@ -1892,6 +1929,61 @@ describe Mongoid::Attributes do
     end
   end
 
+  describe '#unalias_attribute' do
+    let(:shirt) { Shirt.new }
+    let(:id) { '1234' }
+
+    context 'when creating object' do
+      let(:shirt) { Shirt.new(id: id) }
+
+      it 'id and _id are not the same' do
+        expect(shirt.id).to eq(id)
+        expect(shirt._id).not_to eq(id)
+      end
+    end
+
+    context 'update' do
+      before do
+        shirt.update(id: id)
+      end
+
+      it 'updates id but not_id' do
+        expect(shirt.id).to eq(id)
+        expect(shirt._id).not_to eq(id)
+      end
+    end
+
+    context 'id=' do
+      before do
+        shirt.id = id
+      end
+
+      it 'sets id and not _id' do
+        expect(shirt.id).to eq(id)
+        expect(shirt._id).not_to eq(id)
+      end
+    end
+
+    context 'id?' do
+      context 'with null id' do
+        it 'returns false' do
+          expect(shirt.id?).to be false
+          expect(shirt._id?).to be true
+        end
+      end
+
+      context 'with id' do
+        before do
+          shirt.id = id
+        end
+
+        it 'returns true' do
+          expect(shirt.id?).to be true
+        end
+      end
+    end
+  end
+
   describe "#alias_attribute" do
 
     let(:product) do

data/spec/mongoid/clients/factory_spec.rb

@@ -47,6 +47,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
@@ -65,15 +66,9 @@ describe Mongoid::Clients::Factory do
             expect(client).to be_a(Mongo::Client)
           end
 
-          context 'not JRuby' do
-            # Run this test on JRuby when driver 2.16.0 is released -
-            # see RUBY-2771.
-            fails_on_jruby
-
-            it 'does not produce driver warnings' do
-              Mongo::Logger.logger.should_not receive(:warn)
-              client
-            end
+          it 'does not produce driver warnings' do
+            Mongo::Logger.logger.should_not receive(:warn)
+            client
           end
 
           let(:cluster_addresses) do
@@ -130,6 +125,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
@@ -174,6 +170,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
@@ -212,6 +209,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
@@ -259,6 +257,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
@@ -290,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
@@ -306,6 +306,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
@@ -348,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
@@ -384,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

@@ -83,11 +83,9 @@ describe Mongoid::Clients::Options, retry: 3 do
 
         let!(:connections_and_cluster_during) do
           connections = nil
-          cluster = nil
-          Minim.with(options) do |klass|
+          cluster = Minim.with(options) do |klass|
             klass.where(name: 'emily').to_a
             connections = Minim.mongo_client.database.command(serverStatus: 1).first['connections']['current']
-            cluster = Minim.collection.cluster
           end
           [ connections, cluster ]
         end
@@ -126,10 +124,7 @@ describe Mongoid::Clients::Options, retry: 3 do
           end
 
           it 'disconnects the new cluster when the block exits' do
-            expect(cluster_after).not_to be(cluster_during)
-
-            cluster_during.connected?.should be false
-            cluster_before.connected?.should be true
+            expect(connections_before).to eq(connections_after)
           end
         end
 
@@ -143,14 +138,11 @@ describe Mongoid::Clients::Options, retry: 3 do
 
           it 'does not create a new cluster' do
             expect(connections_during).to eq(connections_before)
-
-            cluster_during.should be cluster_before
           end
 
           it 'does not disconnect the original cluster' do
+            expect(connections_after).to eq(connections_before)
             expect(cluster_before).to be(cluster_after)
-
-            cluster_before.connected?.should be true
           end
         end
 

data/spec/mongoid/config/environment_spec.rb

@@ -5,19 +5,9 @@ require "spec_helper"
 
 describe Mongoid::Config::Environment do
 
-  around do |example|
-    if defined?(Rails)
-      SavedRails = Rails
-      example.run
-      Object.send(:remove_const, :Rails) if defined?(Rails)
-      Rails = SavedRails
-      Object.send(:remove_const, :SavedRails)
-    else
-      example.run
-      if defined?(Rails)
-        Object.send(:remove_const, :Rails)
-      end
-    end
+  after(:all) do
+    Rails = RailsTemp
+    Object.send(:remove_const, :RailsTemp)
   end
 
   describe "#env_name" do
@@ -34,6 +24,11 @@ describe Mongoid::Config::Environment do
           end
         end
 
+        after do
+          RailsTemp = Rails
+          Object.send(:remove_const, :Rails)
+        end
+
         it "returns the rails environment" do
           expect(described_class.env_name).to eq("production")
         end
@@ -91,77 +86,4 @@ describe Mongoid::Config::Environment do
       end
     end
   end
-
-  describe "#load_yaml" do
-    let(:path) { 'mongoid.yml' }
-    let(:environment) {}
-    before { allow(Rails).to receive('env').and_return('test') }
-
-    subject { described_class.load_yaml(path, environment) }
-
-    context 'when file not found' do
-      let(:path) { 'not/a/valid/path'}
-
-      it { expect { subject }.to raise_error(Errno::ENOENT) }
-    end
-
-    context 'when file found' do
-      before do
-        allow(File).to receive(:new).with('mongoid.yml').and_return(StringIO.new(file_contents))
-      end
-
-      let(:file_contents) do
-        <<~FILE
-          test:
-            clients: ['test']
-          development:
-            clients: ['dev']
-        FILE
-      end
-
-      context 'when file cannot be parsed as YAML' do
-        let(:file_contents) { "*\nbad:%123abc" }
-
-        it { expect { subject }.to raise_error(Psych::SyntaxError) }
-      end
-
-      context 'when file contains ERB errors' do
-        let(:file_contents) { '<%= foo %>' }
-
-        it { expect { subject }.to raise_error(NameError) }
-      end
-
-      context 'when file is empty' do
-        let(:file_contents) { '' }
-
-        it { expect { subject }.to raise_error(Mongoid::Errors::EmptyConfigFile) }
-      end
-
-      context 'when file does not contain a YAML Hash object' do
-        let(:file_contents) { '["this", "is", "an", "array"]' }
-
-        it { expect { subject }.to raise_error(Mongoid::Errors::InvalidConfigFile) }
-      end
-
-      context 'when environment not specified' do
-        it 'uses the rails environment' do
-          is_expected.to eq("clients"=>["test"])
-        end
-      end
-
-      context 'when environment is specified' do
-        let(:environment) { 'development' }
-
-        it 'uses the specified environment' do
-          is_expected.to eq("clients"=>["dev"])
-        end
-      end
-
-      context 'when environment is missing' do
-        let(:environment) { 'staging' }
-
-        it { is_expected.to be_nil }
-      end
-    end
-  end
 end

data/spec/mongoid/config_spec.rb

@@ -545,4 +545,36 @@ describe Mongoid::Config do
       expect(Mongoid::Config.log_level).to eq(2)
     end
   end
+
+  context "with an overridden database" do
+    let(:database) do
+      "test_purge_#{Time.now.to_i}"
+    end
+
+    before do
+      Mongoid.override_database(database)
+    end
+
+    after do
+      Mongoid.override_database(nil)
+    end
+
+    describe "#purge!" do
+      it 'respects persistence context overrides' do
+        House.create!(name: '1', model: 'Big')
+        expect(House.count).to eq(1)
+        Mongoid.purge!
+        expect(House.count).to eq(0)
+      end
+    end
+
+    describe "#truncate!" do
+      it 'respects persistence context overrides' do
+        House.create!(name: '1', model: 'Big')
+        expect(House.count).to eq(1)
+        Mongoid.truncate!
+        expect(House.count).to eq(0)
+      end
+    end
+  end
 end

data/spec/mongoid/contextual/atomic_spec.rb

@@ -801,28 +801,27 @@ describe Mongoid::Contextual::Atomic do
           context.unset(:name)
         end
 
-        it "unsets the fields from all documents" do
-          depeche_mode.reload
-          new_order.reload
-          expect(depeche_mode.name).to be_nil
-          expect(depeche_mode.years).to_not be_nil
-          expect(new_order.name).to be_nil
-          expect(new_order.years).to_not be_nil
+        it "unsets the first existing field" do
+          expect(depeche_mode.reload.name).to be_nil
+        end
+
+        it "unsets the last existing field" do
+          expect(new_order.reload.name).to be_nil
         end
       end
 
       context "when the field is aliased" do
+
         before do
           context.unset(:years)
         end
 
-        it "unsets the fields from all documents" do
-          depeche_mode.reload
-          new_order.reload
-          expect(depeche_mode.name).to_not be_nil
-          expect(depeche_mode.years).to be_nil
-          expect(new_order.name).to_not be_nil
-          expect(new_order.years).to be_nil
+        it "unsets the first existing field" do
+          expect(depeche_mode.reload.years).to be_nil
+        end
+
+        it "unsets the last existing field" do
+          expect(new_order.reload.years).to be_nil
         end
       end
     end
@@ -830,8 +829,7 @@ describe Mongoid::Contextual::Atomic do
     context "when unsetting multiple fields" do
 
       let!(:new_order) do
-        Band.create(name: "New Order", genres: %w[electro dub], years: 10,
-          likes: 200, rating: 4.3, origin: 'Space')
+        Band.create(name: "New Order", genres: [ "electro", "dub" ], years: 10)
       end
 
       let(:criteria) do
@@ -848,62 +846,27 @@ describe Mongoid::Contextual::Atomic do
           context.unset(:name, :genres)
         end
 
-        it "unsets the specified fields" do
-          new_order.reload
-          expect(new_order.name).to be_nil
-          expect(new_order.genres).to be_nil
-          expect(new_order.years).to_not be_nil
-          expect(new_order.likes).to_not be_nil
-          expect(new_order.rating).to_not be_nil
+        it "unsets name field" do
+          expect(new_order.reload.name).to be_nil
         end
-      end
-
-      context "when the field is aliased" do
 
-        before do
-          context.unset(:name, :years)
-        end
-
-        it "unsets the specified fields" do
-          new_order.reload
-          expect(new_order.name).to be_nil
-          expect(new_order.genres).to_not be_nil
-          expect(new_order.years).to be_nil
-          expect(new_order.likes).to_not be_nil
-          expect(new_order.rating).to_not be_nil
+        it "unsets genres field" do
+          expect(new_order.reload.genres).to be_nil
         end
       end
 
-      context "when using Hash arguments" do
+      context "when the field is aliased" do
 
         before do
-          context.unset({ years: true, likes: "" }, { rating: false, origin: nil })
-        end
-
-        it "unsets the specified fields" do
-          new_order.reload
-          expect(new_order.name).to_not be_nil
-          expect(new_order.genres).to_not be_nil
-          expect(new_order.years).to be_nil
-          expect(new_order.likes).to be_nil
-          expect(new_order.rating).to be_nil
-          expect(new_order.origin).to be_nil
+          context.unset(:name, :years)
         end
-      end
 
-      context "when mixing argument types" do
-
-        before do
-          context.unset(:name, [:years], { likes: "" }, { rating: false })
+        it "unsets the unaliased field" do
+          expect(new_order.reload.name).to be_nil
         end
 
-        it "unsets the specified fields" do
-          new_order.reload
-          expect(new_order.name).to be_nil
-          expect(new_order.genres).to_not be_nil
-          expect(new_order.years).to be_nil
-          expect(new_order.likes).to be_nil
-          expect(new_order.rating).to be_nil
+        it "unsets the aliased field" do
+          expect(new_order.reload.years).to be_nil
         end
       end
     end
@@ -932,9 +895,7 @@ describe Mongoid::Contextual::Atomic do
       end
 
       it "unsets the unaliased field" do
-        depeche_mode.reload
-        expect(depeche_mode.name).to be_nil
-        expect(depeche_mode.years).to_not be_nil
+        expect(depeche_mode.reload.name).to be_nil
       end
     end
   end

data/spec/mongoid/contextual/geo_near_spec.rb

@@ -59,7 +59,7 @@ describe Mongoid::Contextual::GeoNear do
       end
 
       it "is nil except for 4.0 sharded when it is 0" do
-        expect(geo_near.average_distance).to eq expected_value
+        expect(geo_near.average_distance).to be expected_value
       end
     end
   end

data/spec/mongoid/contextual/mongo_spec.rb

@@ -1442,8 +1442,8 @@ describe Mongoid::Contextual::Mongo do
     describe "##{method}" do
 
       before do
-        Band.create(name: "Depeche Mode")
-        Band.create(name: "New Order")
+        Band.create!(name: "Depeche Mode")
+        Band.create!(name: "New Order")
       end
 
       context "when the criteria has a limit" do

data/spec/mongoid/criteria/modifiable_spec.rb

@@ -705,7 +705,7 @@ describe Mongoid::Criteria::Modifiable do
           end
 
           it 'uses the values from the attributes' do
-            expect(document.map).to eq({ foo: :bar })
+            expect(document.map).to eq('foo' => :bar )
           end
         end
 

data/spec/mongoid/criteria/queryable/expandable_spec.rb

@@ -9,79 +9,6 @@ describe Mongoid::Criteria::Queryable::Expandable do
     Mongoid::Query.new
   end
 
-  describe '#expand_condition' do
-
-    let(:expanded) do
-      query.send(:expand_condition, condition)
-    end
-
-    context 'field name => value' do
-      shared_examples_for 'expands' do
-
-        it 'expands' do
-          expanded.should == {'foo' => 'bar'}
-        end
-      end
-
-      context 'string key' do
-        let(:condition) do
-          {'foo' => 'bar'}
-        end
-
-        it_behaves_like 'expands'
-      end
-
-      context 'symbol key' do
-        let(:condition) do
-          {foo: 'bar'}
-        end
-
-        it_behaves_like 'expands'
-      end
-    end
-
-    context 'Key instance => value' do
-      let(:key) do
-        Mongoid::Criteria::Queryable::Key.new(:foo, :__override__, '$gt')
-      end
-
-      let(:condition) do
-        {key => 'bar'}
-      end
-
-      it 'expands' do
-        expanded.should == {'foo' => {'$gt' => 'bar'}}
-      end
-    end
-
-=begin
-    context 'operator => operator value expression' do
-      shared_examples_for 'expands' do
-
-        it 'expands' do
-          expanded.should == {'foo' => 'bar'}
-        end
-      end
-
-      context 'string key' do
-        let(:condition) do
-          {'$in' => %w(bar)}
-        end
-
-        it_behaves_like 'expands'
-      end
-
-      context 'symbol key' do
-        let(:condition) do
-          {:$in => %w(bar)}
-        end
-
-        it_behaves_like 'expands'
-      end
-    end
-=end
-  end
-
   describe '#expand_condition_to_array_values' do
     shared_examples_for 'expands' do