mongoid 7.3.2 → 7.4.0

data/spec/mongoid/tasks/database_rake_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "rake"
 require "spec_helper"

data/spec/mongoid/tasks/database_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/threaded_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -19,7 +18,7 @@ describe Mongoid::Threaded do
       described_class.stack("load").clear
     end
 
-    it "adds a boolen to the load stack" do
+    it "adds a boolean to the load stack" do
       expect(described_class.stack("load")).to eq([ true ])
     end
   end
@@ -104,7 +103,7 @@ describe Mongoid::Threaded do
       described_class.stack("load").clear
     end
 
-    it "removes a boolen from the stack" do
+    it "removes a boolean from the stack" do
       expect(described_class.stack("load")).to be_empty
     end
   end

data/spec/mongoid/timestamps/created/short_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -40,7 +39,7 @@ describe Mongoid::Timestamps::Created::Short do
   context "when the document is created" do
 
     let(:quiz) do
-      ShortQuiz.create
+      ShortQuiz.create!
     end
 
     it "runs the created callbacks" do

data/spec/mongoid/timestamps/created_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -36,7 +35,7 @@ describe Mongoid::Timestamps::Created do
   context "when the document is created" do
 
     let(:quiz) do
-      Quiz.create
+      Quiz.create!
     end
 
     it "runs the created callbacks" do

data/spec/mongoid/timestamps/timeless_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -89,7 +88,7 @@ describe Mongoid::Timestamps::Timeless do
         end
 
         before do
-          document.timeless.save
+          document.timeless.save!
         end
 
         it "does not set the created timestamp" do
@@ -119,7 +118,7 @@ describe Mongoid::Timestamps::Timeless do
       context "when used on the class" do
 
         let!(:document) do
-          Dokument.timeless.create
+          Dokument.timeless.create!
         end
 
         it "does not set the created timestamp" do

data/spec/mongoid/timestamps/updated/short_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -50,7 +49,7 @@ describe Mongoid::Timestamps::Updated::Short do
       end
 
       let(:doc) do
-        ShortAgent.create(updated_at: time)
+        ShortAgent.create!(updated_at: time)
       end
 
       it "does not override it with the default" do
@@ -75,14 +74,14 @@ describe Mongoid::Timestamps::Updated::Short do
 
     it "does not run the update callbacks" do
       expect(agent).to receive(:updated_at=).never
-      agent.save
+      agent.save!
     end
   end
 
   context "when the document is created" do
 
     let(:agent) do
-      ShortAgent.create
+      ShortAgent.create!
     end
 
     it "runs the update callbacks" do

data/spec/mongoid/timestamps/updated_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -42,7 +41,7 @@ describe Mongoid::Timestamps::Updated do
       end
 
       let(:doc) do
-        Dokument.create(updated_at: time)
+        Dokument.create!(updated_at: time)
       end
 
       it "does not override it with the default" do
@@ -67,14 +66,14 @@ describe Mongoid::Timestamps::Updated do
 
     it "does not run the update callbacks" do
       expect(agent).to receive(:updated_at=).never
-      agent.save
+      agent.save!
     end
   end
 
   context "when the document is created" do
 
     let(:agent) do
-      Agent.create
+      Agent.create!
     end
 
     it "runs the update callbacks" do

data/spec/mongoid/timestamps_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -53,7 +52,7 @@ describe Mongoid::Timestamps do
 
     it "does not run the update callbacks" do
       expect(document).to receive(:updated_at=).never
-      document.save
+      document.save!
     end
   end
 
@@ -70,14 +69,14 @@ describe Mongoid::Timestamps do
 
     it "does not set updated at" do
       expect(document).to receive(:updated_at=).never
-      document.save
+      document.save!
     end
   end
 
   context "when the document is created" do
 
     let!(:document) do
-      Dokument.create
+      Dokument.create!
     end
 
     it "runs the update callbacks" do
@@ -88,11 +87,11 @@ describe Mongoid::Timestamps do
   context "when only embedded documents have changed" do
 
     let!(:document) do
-      Dokument.create(updated_at: 2.days.ago)
+      Dokument.create!(updated_at: 2.days.ago)
     end
 
     let!(:address) do
-      document.addresses.create(street: "Karl Marx Strasse")
+      document.addresses.create!(street: "Karl Marx Strasse")
     end
 
     let!(:updated_at) do
@@ -101,7 +100,7 @@ describe Mongoid::Timestamps do
 
     before do
       address.number = 1
-      document.save
+      document.save!
     end
 
     it "updates the root document updated at" do

data/spec/mongoid/touchable_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 require_relative './touchable_spec_models'
@@ -132,6 +131,24 @@ describe Mongoid::Touchable do
         include_examples 'updates the child'
         include_examples 'updates the parent when :touch is true'
         include_examples 'updates the parent when :touch is not set'
+
+        context 'when also updating an additional field' do
+          it 'persists the update to the additional field' do
+            entrance
+            update_time
+            entrance.touch(:last_used_at)
+
+            entrance.reload
+            building.reload
+
+            # This is the assertion we want.
+            entrance.last_used_at.should == update_time
+
+            # Check other timestamps for good measure.
+            entrance.updated_at.should == update_time
+            building.updated_at.should == update_time
+          end
+        end
       end
 
       context "when the document is referenced" do
@@ -153,7 +170,7 @@ describe Mongoid::Touchable do
       context "when no updated at is defined" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         context "when no attribute is provided" do
@@ -213,7 +230,7 @@ describe Mongoid::Touchable do
       context "when an updated at is defined" do
 
         let!(:agent) do
-          Agent.create(updated_at: 2.days.ago)
+          Agent.create!(updated_at: 2.days.ago)
         end
 
         context "when no attribute is provided" do
@@ -313,11 +330,7 @@ describe Mongoid::Touchable do
         end
 
         let(:frozen_error_cls) do
-          if RUBY_VERSION >= '2.5'
-            FrozenError
-          else
-            RuntimeError
-          end
+          FrozenError
         end
 
         context "when no attribute is provided" do
@@ -379,11 +392,11 @@ describe Mongoid::Touchable do
         end
 
         let(:page) do
-          WikiPage.create(title: "test")
+          WikiPage.create!(title: "test")
         end
 
         let!(:edit) do
-          page.edits.create
+          page.edits.create!
         end
 
         before do
@@ -408,7 +421,7 @@ describe Mongoid::Touchable do
 
         before do
           book.pages.new
-          book.save
+          book.save!
           book.unset(:updated_at)
           book.pages.first.touch
         end
@@ -426,7 +439,7 @@ describe Mongoid::Touchable do
 
         before do
           2.times { book.pages.new }
-          book.save
+          book.save!
           book.unset(:updated_at)
           book.pages.first.content  = "foo"
           book.pages.second.content = "bar"
@@ -441,7 +454,7 @@ describe Mongoid::Touchable do
       context "when the relation is nil" do
 
         let!(:agent) do
-          Agent.create
+          Agent.create!
         end
 
         context "when the relation autobuilds" do
@@ -459,7 +472,7 @@ describe Mongoid::Touchable do
       context "when the relation is not nil" do
 
         let!(:agent) do
-          Agent.create
+          Agent.create!
         end
 
         let!(:agency) do
@@ -484,7 +497,7 @@ describe Mongoid::Touchable do
       context "when creating the child" do
 
         let!(:agency) do
-          Agency.create
+          Agency.create!
         end
 
         let!(:updated) do
@@ -492,7 +505,7 @@ describe Mongoid::Touchable do
         end
 
         let!(:agent) do
-          agency.agents.create
+          agency.agents.create!
         end
 
         it "updates the parent's updated at" do
@@ -512,7 +525,7 @@ describe Mongoid::Touchable do
 
         it "updates the parent's updated at" do
           expect {
-            agent.update_attributes(number: '2')
+            agent.update_attributes!(number: '2')
           }.to change { agency.updated_at }
         end
       end
@@ -520,11 +533,11 @@ describe Mongoid::Touchable do
       context "when destroying the child" do
 
         let!(:agency) do
-          Agency.create
+          Agency.create!
         end
 
         let!(:agent) do
-          agency.agents.create
+          agency.agents.create!
         end
 
         let!(:updated) do
@@ -544,7 +557,7 @@ describe Mongoid::Touchable do
     context "when other document attributes have been changed" do
 
       let(:band) do
-        Band.create(name: "Placebo")
+        Band.create!(name: "Placebo")
       end
 
       context "when an attribute is provided" do

data/spec/mongoid/touchable_spec_models.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 module TouchableSpec
   module Embedded
@@ -16,6 +15,8 @@ module TouchableSpec
       include Mongoid::Timestamps
 
       embedded_in :building
+
+      field :last_used_at, type: Time
     end
 
     class Floor

data/spec/mongoid/traversable_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -63,8 +62,72 @@ describe Mongoid::Traversable do
         expect(person._children).to include(address)
       end
 
+      it "does not include embedded documents multiple levels deep" do
+        expect(person._children).not_to include(location)
+      end
+    end
+  end
+
+  describe "#_descendants" do
+
+    let(:person) do
+      Person.new(title: "King")
+    end
+
+    context "with one level of embedding" do
+
+      let(:name) do
+        Name.new(first_name: "Titus")
+      end
+
+      let(:address) do
+        Address.new(street: "Queen St")
+      end
+
+      before do
+        person.name = name
+        person.addresses << address
+      end
+
+      it "includes embeds_one documents" do
+        expect(person._descendants).to include(name)
+      end
+
+      it "includes embeds_many documents" do
+        expect(person._descendants).to include(address)
+      end
+    end
+
+    context "with multiple levels of embedding" do
+
+      let(:name) do
+        Name.new(first_name: "Titus")
+      end
+
+      let(:address) do
+        Address.new(street: "Queen St")
+      end
+
+      let(:location) do
+        Location.new(name: "Work")
+      end
+
+      before do
+        person.name = name
+        address.locations << location
+        person.addresses << address
+      end
+
+      it "includes embeds_one documents" do
+        expect(person._descendants).to include(name)
+      end
+
+      it "includes embeds_many documents" do
+        expect(person._descendants).to include(address)
+      end
+
       it "includes embedded documents multiple levels deep" do
-        expect(person._children).to include(location)
+        expect(person._descendants).to include(location)
       end
     end
   end

data/spec/mongoid/validatable/associated_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/validatable/format_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/validatable/length_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/validatable/numericality_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/validatable/presence_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
+require_relative '../association/referenced/has_one_models'
 
 describe Mongoid::Validatable::PresenceValidator do
 
@@ -239,7 +239,7 @@ describe Mongoid::Validatable::PresenceValidator do
           context "when saving the base" do
 
             before do
-              person.save
+              person.save!
             end
 
             it "saves the relation" do
@@ -250,41 +250,44 @@ describe Mongoid::Validatable::PresenceValidator do
       end
     end
 
-    context "when the relation is a has one and autosave is false" do
+    context "when the association is a has one and autosave is false" do
 
       before do
-        Person.relations["game"].options[:autosave] = false
-        Person.validates :game, presence: true
+        HomCollege.validates :accreditation, presence: true
       end
 
       after do
-        Person.reset_callbacks(:validate)
+        HomCollege.reset_callbacks(:validate)
       end
 
-      it "does not change autosave on the relation" do
-        expect(Person.relations["game"].autosave?).to be false
+      it "does not change autosave on the association" do
+        expect(HomCollege.relations["accreditation"].autosave?).to be false
       end
 
-      context "when the relation is new" do
+      context "when the association target is new" do
 
-        let(:person) do
-          Person.new
+        let(:parent) do
+          HomCollege.new
         end
 
-        context "when the base is valid" do
+        context "when the parent is valid" do
 
-          let!(:game) do
-            person.build_game
+          let!(:child) do
+            parent.build_accreditation
           end
 
-          context "when saving the base" do
+          context "when saving the parent" do
 
             before do
-              person.save
+              parent.associations[:accreditation].options[:autosave].should be_falsy
+
+              parent.save!
             end
 
-            it "does not save the relation" do
-              expect { game.reload }.to raise_error(Mongoid::Errors::DocumentNotFound)
+            it "does not save the association target" do
+              child.persisted?.should be false
+
+              expect { child.reload }.to raise_error(Mongoid::Errors::DocumentNotFound)
             end
           end
         end
@@ -294,17 +297,17 @@ describe Mongoid::Validatable::PresenceValidator do
     context "when the relation is a belongs to" do
 
       let(:product) do
-        Product.create(name: "testing")
+        Product.create!(name: "testing")
       end
 
       context "when the relation is present" do
 
         let(:purchase) do
-          Purchase.create
+          Purchase.create!
         end
 
         let(:line_item) do
-          purchase.line_items.create(product: product)
+          purchase.line_items.create!(product: product)
         end
 
         context "when the foreign key is nil" do
@@ -334,11 +337,11 @@ describe Mongoid::Validatable::PresenceValidator do
       context "when the relation has documents" do
 
         let!(:house) do
-          House.create
+          House.create!
         end
 
         let!(:person) do
-          Person.create(houses: [ house ])
+          Person.create!(houses: [ house ])
         end
 
         context "when the relation is loaded from the db" do