mongoid 7.3.5 → 7.4.0

data/spec/mongoid/association/referenced/belongs_to/eager_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 require_relative '../has_many_models'
+require_relative '../has_one_models'
 
 describe Mongoid::Association::Referenced::BelongsTo::Eager do
 
@@ -104,7 +104,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Eager do
       context "when the eager load has returned documents" do
 
         let!(:post) do
-          person.posts.create(title: "testing")
+          person.posts.create!(title: "testing")
         end
 
         before { eager }
@@ -129,7 +129,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Eager do
       context "when the eager load has not returned documents" do
 
         let!(:post) do
-          Post.create(title: "testing")
+          Post.create!(title: "testing")
         end
 
         before { eager }
@@ -149,11 +149,11 @@ describe Mongoid::Association::Referenced::BelongsTo::Eager do
       context "without namespaces" do
 
         let!(:stand_alone_rating) do
-          Rating.create(value: 7)
+          Rating.create!(value: 7)
         end
 
         let!(:bar) do
-          Bar.create(name: "FooBar")
+          Bar.create!(name: "FooBar")
         end
 
         let(:bar_rating) do
@@ -161,11 +161,11 @@ describe Mongoid::Association::Referenced::BelongsTo::Eager do
         end
 
         let!(:movie) do
-          Movie.create(name: "Bladerunner")
+          Movie.create!(name: "Bladerunner")
         end
 
         let(:movie_rating) do
-          movie.ratings.create(value: 10)
+          movie.ratings.create!(value: 10)
         end
 
         let(:eager) do
@@ -214,23 +214,23 @@ describe Mongoid::Association::Referenced::BelongsTo::Eager do
       context "with namespaces" do
 
         let!(:stand_alone_review) do
-          Publication::Review.create(summary: "awful")
+          Publication::Review.create!(summary: "awful")
         end
 
         let!(:encyclopedia) do
-          Publication::Encyclopedia.create(title: "Encyclopedia Britannica")
+          Publication::Encyclopedia.create!(title: "Encyclopedia Britannica")
         end
 
         let(:encyclopedia_review) do
-          encyclopedia.reviews.create(summary: "inspiring")
+          encyclopedia.reviews.create!(summary: "inspiring")
         end
 
         let!(:pull_request) do
-          Coding::PullRequest.create(title: "Add eager loading for polymorphic belongs_to associations")
+          Coding::PullRequest.create!(title: "Add eager loading for polymorphic belongs_to associations")
         end
 
         let(:pull_request_review) do
-          pull_request.reviews.create(summary: "Looks good to me")
+          pull_request.reviews.create!(summary: "Looks good to me")
         end
 
         let(:eager) do
@@ -291,7 +291,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Eager do
         end
 
         let!(:reviewer_review) do
-          Publication::Review.create(summary: "okay",
+          Publication::Review.create!(summary: "okay",
             reviewer: reviewer)
         end
 
@@ -300,7 +300,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Eager do
         end
 
         let!(:template_review) do
-          Publication::Review.create(summary: "Looks good to me",
+          Publication::Review.create!(summary: "Looks good to me",
             template: template)
         end
 
@@ -330,7 +330,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Eager do
       context 'when eager loading an association that has type but not value set' do
 
         let!(:reviewer_review) do
-          Publication::Review.create(summary: "okay",
+          Publication::Review.create!(summary: "okay",
             reviewer_type: 'Dog')
         end
 
@@ -344,6 +344,41 @@ describe Mongoid::Association::Referenced::BelongsTo::Eager do
       end
     end
 
+    context "when the association has scope" do
+
+      context 'when inverse of has_many' do
+        let!(:trainer1) { HmmTrainer.create!(name: 'Dave') }
+        let!(:trainer2) { HmmTrainer.create!(name: 'Ash') }
+        let!(:animal1) { HmmAnimal.create!(taxonomy: 'reptile', trainer: trainer1) }
+        let!(:animal2) { HmmAnimal.create!(taxonomy: 'bird', trainer: trainer2) }
+
+        let(:eager) do
+          HmmAnimal.includes(:trainer).to_a
+        end
+
+        it 'eager loads the included docs' do
+          expect(eager[0].trainer).to eq trainer1
+          expect(eager[1].trainer).to be_nil
+        end
+      end
+
+      context 'when inverse of has_one' do
+        let!(:trainer1) { HomTrainer.create!(name: 'Dave') }
+        let!(:trainer2) { HomTrainer.create!(name: 'Ash') }
+        let!(:animal1) { HomAnimal.create!(taxonomy: 'reptile', trainer: trainer1) }
+        let!(:animal2) { HomAnimal.create!(taxonomy: 'bird', trainer: trainer2) }
+
+        let(:eager) do
+          HomAnimal.includes(:trainer).to_a
+        end
+
+        it 'eager loads the included docs' do
+          expect(eager[0].trainer).to eq trainer1
+          expect(eager[1].trainer).to be_nil
+        end
+      end
+    end
+
     context "when setting the foreign key id directly" do
 
       it "works" do

data/spec/mongoid/association/referenced/belongs_to/proxy_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -10,7 +9,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
   end
 
   let(:person) do
-    Person.create
+    Person.create!
   end
 
   describe "#=" do
@@ -62,15 +61,15 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
     context "when referencing a document from an embedded document" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let(:address) do
-        person.addresses.create(street: "Wienerstr")
+        person.addresses.create!(street: "Wienerstr")
       end
 
       let(:account) do
-        Account.create(name: "1", number: 1000000)
+        Account.create!(name: "1", number: 1000000)
       end
 
       before do
@@ -86,7 +85,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
       end
 
       it "allows saving of the embedded document" do
-        expect(address.save).to be true
+        expect(address.save!).to be true
       end
     end
 
@@ -153,7 +152,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           end
 
           let(:game) do
-            Game.create
+            Game.create!
           end
 
           before do
@@ -187,16 +186,16 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
         context "when the parent is a subclass" do
 
           let(:canvas) do
-            Canvas::Test.create
+            Canvas::Test.create!
           end
 
           let(:comment) do
-            Comment.create(title: "test")
+            Comment.create!(title: "test")
           end
 
           before do
             comment.commentable = canvas
-            comment.save
+            comment.save!
           end
 
           it "sets the correct value in the type field" do
@@ -250,7 +249,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           end
 
           let(:rating) do
-            Rating.create
+            Rating.create!
           end
 
           before do
@@ -286,6 +285,11 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
 
         context 'when the child has persistence options set' do
 
+          before do
+            Person.collection.client['other-posts'].delete_many
+            Person.collection.client['other-people'].delete_many
+          end
+
           let(:person) do
             Person.new
           end
@@ -295,11 +299,11 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           end
 
           before do
-            post.with(collection: 'other-posts') do |p|
-              person.with(collection: 'other-people') do |per|
-                p.person = person
-                per.save
-                p.save
+            post.with(collection: 'other-posts') do |post|
+              person.with(collection: 'other-people') do |person|
+                post.person = person
+                person.save!
+                post.save!
               end
             end
           end
@@ -356,7 +360,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           end
 
           let(:post) do
-            Post.create
+            Post.create!
           end
 
           before do
@@ -448,7 +452,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
             end
 
             let(:rating) do
-              Rating.create
+              Rating.create!
             end
 
             before do
@@ -501,7 +505,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           Account.belongs_to :person, dependent: :destroy
           Person.has_one :account
           person.account = account
-          person.save
+          person.save!
         end
 
         after :all do
@@ -552,7 +556,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           Drug.belongs_to :person, dependent: :destroy
           Person.has_many :drugs
           person.drugs = [drug]
-          person.save
+          person.save!
         end
 
         after :all do
@@ -583,15 +587,15 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
     context "when dependent is delete" do
 
       let(:account) do
-        Account.create
+        Account.create!(name: 'Foobar')
       end
 
       let(:drug) do
-        Drug.create
+        Drug.create!
       end
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       context "when relation is has_one" do
@@ -607,7 +611,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           Account.belongs_to :person, dependent: :delete_all
           Person.has_one :account
           person.account = account
-          person.save
+          person.save!
         end
 
         after :all do
@@ -647,7 +651,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           Drug.belongs_to :person, dependent: :delete_all
           Person.has_many :drugs
           person.drugs = [drug]
-          person.save
+          person.save!
         end
 
         after :all do
@@ -678,15 +682,15 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
     context "when dependent is nullify" do
 
       let(:account) do
-        Account.create
+        Account.create!(name: 'Foobar')
       end
 
       let(:drug) do
-        Drug.create
+        Drug.create!
       end
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       context "when relation is has_one" do
@@ -702,7 +706,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           Account.belongs_to :person, dependent: :nullify
           Person.has_one :account
           person.account = account
-          person.save
+          person.save!
         end
 
         context "when parent is persisted" do
@@ -741,7 +745,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           Drug.belongs_to :person, dependent: :nullify
           Person.has_many :drugs
           person.drugs = [drug]
-          person.save
+          person.save!
         end
 
         context "when parent exists" do
@@ -827,11 +831,11 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
         context "when the parent is not a new record" do
 
           let(:person) do
-            Person.create
+            Person.create!
           end
 
           let(:game) do
-            Game.create
+            Game.create!
           end
 
           before do
@@ -896,7 +900,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
             end
 
             let(:rating) do
-              Rating.create
+              Rating.create!
             end
 
             before do
@@ -959,7 +963,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           end
 
           let(:post) do
-            Post.create
+            Post.create!
           end
 
           before do
@@ -1018,7 +1022,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           end
 
           let(:rating) do
-            Rating.create
+            Rating.create!
           end
 
           before do
@@ -1160,11 +1164,11 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
   context "when replacing the relation with another" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     let!(:post) do
-      Post.create(title: "test")
+      Post.create!(title: "test")
     end
 
     let!(:game) do
@@ -1173,7 +1177,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
 
     before do
       post.person = game.person
-      post.save
+      post.save!
     end
 
     it "clones the relation" do
@@ -1220,17 +1224,17 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
   context "when the document belongs to a has one and has many" do
 
     let(:movie) do
-      Movie.create(name: "Infernal Affairs")
+      Movie.create!(name: "Infernal Affairs")
     end
 
     let(:account) do
-      Account.create(name: "Leung")
+      Account.create!(name: "Leung")
     end
 
     context "when creating the document" do
 
       let(:comment) do
-        Comment.create(movie: movie, account: account)
+        Comment.create!(title: 'My Title', movie: movie, account: account)
       end
 
       it "sets the correct has one" do
@@ -1246,20 +1250,20 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
   context "when reloading the relation" do
 
     let!(:person_one) do
-      Person.create
+      Person.create!
     end
 
     let!(:person_two) do
-      Person.create(title: "Sir")
+      Person.create!(title: "Sir")
     end
 
     let!(:game) do
-      Game.create(name: "Starcraft 2")
+      Game.create!(name: "Starcraft 2")
     end
 
     before do
       game.person = person_one
-      game.save
+      game.save!
     end
 
     context "when the relation references the same document" do
@@ -1286,7 +1290,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
 
       before do
         game.person_id = person_two.id
-        game.save
+        game.save!
       end
 
       let(:reloaded) do
@@ -1306,13 +1310,13 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
   context "when creating with a reference to an integer id parent" do
 
     let!(:jar) do
-      Jar.create do |doc|
+      Jar.create! do |doc|
         doc._id = 1
       end
     end
 
     let(:cookie) do
-      Cookie.create(jar_id: "1")
+      Cookie.create!(jar_id: "1")
     end
 
     it "allows strings to be passed as the id" do
@@ -1329,15 +1333,15 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
     context "when the relation exists" do
 
       let!(:person_one) do
-        Person.create
+        Person.create!
       end
 
       let!(:person_two) do
-        Person.create
+        Person.create!
       end
 
       let!(:game) do
-        Game.create(person: person_one)
+        Game.create!(person: person_one)
       end
 
       before do
@@ -1352,11 +1356,11 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
 
   describe "#method_missing" do
       let!(:person) do
-        Person.create
+        Person.create!
       end
 
       let!(:game) do
-        Game.create(person: person)
+        Game.create!(person: person)
       end
 
     it 'handles keyword args' do

data/spec/mongoid/association/referenced/belongs_to_query_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 require_relative './has_many_models'

data/spec/mongoid/association/referenced/belongs_to_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 require_relative './has_one_models'
@@ -1050,6 +1049,27 @@ describe Mongoid::Association::Referenced::BelongsTo do
     end
   end
 
+  describe '#scope' do
+
+    context 'when scope is specified in the options' do
+
+      let(:options) do
+        { scope: -> { unscoped.where(foo: :bar) } }
+      end
+
+      it 'returns a Criteria Queryable Key' do
+        expect(association.scope).to be_a(Proc)
+      end
+    end
+
+    context 'when scope is not specified in the options' do
+
+      it 'returns nil' do
+        expect(association.scope).to be_nil
+      end
+    end
+  end
+
   describe '#as' do
 
     it 'returns nil' do
@@ -1900,7 +1920,7 @@ describe Mongoid::Association::Referenced::BelongsTo do
 
   describe '#foreign_key_setter' do
 
-    it 'returns the foriegn key field followed by "="' do
+    it 'returns the foreign key field followed by "="' do
       expect(association.foreign_key_setter).to eq("owner_object_id=")
     end
   end

data/spec/mongoid/association/referenced/has_and_belongs_to_many/binding_spec.rb

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

data/spec/mongoid/association/referenced/has_and_belongs_to_many/buildable_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -67,6 +66,31 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Buildable do
       end
     end
 
+    context "when scope is specified" do
+
+      let(:object_id) do
+        BSON::ObjectId.new
+      end
+
+      let(:options) do
+        {
+          scope: -> { where(rating: 3) }
+        }
+      end
+
+      let(:object) do
+        [ object_id ]
+      end
+
+      let(:criteria) do
+        Preference.all_of("_id" => { "$in" => object }).where(rating: 3)
+      end
+
+      it "returns the criteria" do
+        expect(documents).to eq(criteria)
+      end
+    end
+
     context "when provided a object" do
 
       context "when the object is not nil" do
@@ -108,7 +132,7 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Buildable do
       context "when the ids are incorrect" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         before do

data/spec/mongoid/association/referenced/has_and_belongs_to_many/eager_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 require_relative '../has_and_belongs_to_many_models'
@@ -79,7 +78,7 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Eager do
       context "when the eager load has returned documents" do
 
         let!(:preference) do
-          person.preferences.create(name: "testing")
+          person.preferences.create!(name: "testing")
         end
 
         before { eager }
@@ -118,12 +117,41 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Eager do
 
         it "returns the proxy" do
           expect do
-            eager.preferences.create(name: "testing")
+            eager.preferences.create!(name: "testing")
           end.to_not raise_error
         end
       end
     end
 
+    context "when the association has scope" do
+      let!(:trainer1) { HabtmmTrainer.create!(name: 'Dave') }
+      let!(:trainer2) { HabtmmTrainer.create!(name: 'Ash') }
+      let!(:animal1) { HabtmmAnimal.create!(taxonomy: 'reptile', trainers: [trainer1, trainer2]) }
+      let!(:animal2) { HabtmmAnimal.create!(taxonomy: 'bird', trainers: [trainer1, trainer2]) }
+
+      context 'when scope set by Symbol' do
+        let(:eager) do
+          HabtmmAnimal.includes(:trainers).where(_id: animal1._id).first
+        end
+
+        it 'eager loads the included docs' do
+          expect(eager.trainers._loaded).to eq(trainer1._id => trainer1)
+          expect(eager.trainers).to eq [trainer1]
+        end
+      end
+
+      context 'when scope set by Proc' do
+        let(:eager) do
+          HabtmmTrainer.includes(:animals).where(_id: trainer1._id).to_a.first
+        end
+
+        it 'eager loads the included docs' do
+          expect(eager.animals._loaded).to eq(animal1._id => animal1)
+          expect(eager.animals).to eq [animal1]
+        end
+      end
+    end
+
     context "when some related documents no longer exist" do
       # Query count assertions require that all queries are sent using the
       # same connection object.

data/spec/mongoid/association/referenced/has_and_belongs_to_many/proxy_persistence_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 require_relative '../has_and_belongs_to_many_models'