mongoid 5.4.1 → 6.0.0.beta

data/spec/mongoid/relations/cyclic_spec.rb

@@ -21,17 +21,6 @@ describe Mongoid::Relations::Cyclic do
       it "sets cyclic to true" do
         expect(document.cyclic).to be true
       end
-
-      context "when a query is executed" do
-
-        before do
-          document.save
-        end
-
-        it "queries the database, not memory" do
-          expect(Role.first).to be_a(Role)
-        end
-      end
     end
 
     context "when the name is not inflected easily" do
@@ -144,17 +133,6 @@ describe Mongoid::Relations::Cyclic do
         expect(document.class.relations['child_mango']).to be_cascading_callbacks
       end
     end
-
-    context "when a query is executed" do
-
-      before do
-        document.save
-      end
-
-      it "queries the database, not memory" do
-        expect(Shelf.first).to be_a(Shelf)
-      end
-    end
   end
 
   context "when building a namespaced hierarchy" do

data/spec/mongoid/relations/embedded/many_spec.rb

@@ -3761,12 +3761,10 @@ describe Mongoid::Relations::Embedded::Many do
 
       before do
         expect(artist).to receive(:before_add_song).and_raise
+        begin; artist.songs << song; rescue; end
       end
 
       it "does not add the document to the relation" do
-        expect {
-          artist.songs << song
-        }.to raise_error
         expect(artist.songs).to be_empty
       end
     end
@@ -3791,12 +3789,10 @@ describe Mongoid::Relations::Embedded::Many do
 
       before do
         expect(artist).to receive(:after_add_label).and_raise
+        begin; artist.labels << label; rescue; end
       end
 
       it "adds the document to the relation" do
-        expect {
-          artist.labels << label
-        }.to raise_error
         expect(artist.labels).to eq([ label ])
       end
     end
@@ -3857,19 +3853,18 @@ describe Mongoid::Relations::Embedded::Many do
         describe "#delete" do
 
           it "does not remove the document from the relation" do
-            expect {
-              artist.songs.delete(song)
-            }.to raise_error
+            begin; artist.songs.delete(song); rescue; end
             expect(artist.songs).to eq([ song ])
           end
         end
 
         describe "#clear" do
 
+          before do
+            begin; artist.songs.clear; rescue; end
+          end
+
           it "removes the documents from the relation" do
-            expect {
-              artist.songs.clear
-            }.to raise_error
             expect(artist.songs).to eq([ song ])
           end
         end
@@ -3925,9 +3920,7 @@ describe Mongoid::Relations::Embedded::Many do
       describe "#delete" do
 
         before do
-          expect {
-            artist.labels.delete(label)
-          }.to raise_error
+          begin; artist.labels.delete(label); rescue; end
         end
 
         it "removes the document from the relation" do
@@ -3938,9 +3931,7 @@ describe Mongoid::Relations::Embedded::Many do
       describe "#clear" do
 
         before do
-          expect {
-            artist.labels.clear
-          }.to raise_error
+          begin; artist.labels.clear; rescue; end
         end
 
         it "should remove from collection" do
@@ -4019,29 +4010,6 @@ describe Mongoid::Relations::Embedded::Many do
     end
   end
 
-  context "when embedded documents get marshalled" do
-
-    let(:person) do
-      Person.create
-    end
-
-    let!(:addresses) do
-      person.addresses
-    end
-
-    let!(:dumped) do
-      Marshal.dump(addresses)
-    end
-
-    let!(:loaded) do
-      Marshal.load(dumped)
-    end
-
-    it "keeps the proxy extensions when remarshalling" do
-      expect(loaded.extension).to eq("Testing")
-    end
-  end
-
   context "deleting embedded documents" do
 
     it "able to delete embedded documents upon condition" do

data/spec/mongoid/relations/embedded/one_spec.rb

@@ -70,7 +70,8 @@ describe Mongoid::Relations::Embedded::One do
               name_without_default or (self.name = Name.new)
             end
             class << person
-              alias_method_chain :name, :default
+              alias_method :name_without_default, :name
+              alias_method :name, :name_with_default
             end
           end
 

data/spec/mongoid/relations/macros_spec.rb

@@ -15,12 +15,30 @@ describe Mongoid::Relations::Macros do
     klass._validators.clear
   end
 
+  after do
+    klass.relations.clear
+    klass.validators.clear
+  end
+
   describe ".embedded_in" do
 
     it "defines the macro" do
       expect(klass).to respond_to(:embedded_in)
     end
 
+    context 'when the relation name is invalid' do
+
+      let(:relation) do
+        klass.embedded_in(:fields)
+      end
+
+      it 'raises an InvalidRelation exception' do
+        expect {
+          relation
+        }.to raise_exception(Mongoid::Errors::InvalidRelation)
+      end
+    end
+
     context "when defining the relation" do
 
       before do
@@ -74,6 +92,19 @@ describe Mongoid::Relations::Macros do
 
     context "when defining the relation" do
 
+      context 'when the relation name is invalid' do
+
+        let(:relation) do
+          klass.embeds_many(:fields)
+        end
+
+        it 'raises an InvalidRelation exception' do
+          expect {
+            relation
+          }.to raise_exception(Mongoid::Errors::InvalidRelation)
+        end
+      end
+
       before do
         klass.embeds_many(:addresses)
       end
@@ -132,8 +163,8 @@ describe Mongoid::Relations::Macros do
         expect(metadata.order).to_not be_nil
       end
 
-      it "returns Origin::Key" do
-        expect(metadata.order).to be_kind_of(Origin::Key)
+      it "returns Mongoid::Criteria::Queryable::Key" do
+        expect(metadata.order).to be_kind_of(Mongoid::Criteria::Queryable::Key)
       end
     end
 
@@ -157,6 +188,19 @@ describe Mongoid::Relations::Macros do
 
     context "when defining the relation" do
 
+      context 'when the relation name is invalid' do
+
+        let(:relation) do
+          klass.embeds_one(:fields)
+        end
+
+        it 'raises an InvalidRelation exception' do
+          expect {
+            relation
+          }.to raise_exception(Mongoid::Errors::InvalidRelation)
+        end
+      end
+
       before do
         klass.embeds_one(:name)
       end
@@ -223,8 +267,300 @@ describe Mongoid::Relations::Macros do
 
   describe ".belongs_to" do
 
+    let(:_class) do
+      class RelationsTestClass
+        include Mongoid::Document
+      end
+    end
+
+    let(:conf) do
+      CONFIG.merge(options: { belongs_to_required_by_default: default_require })
+    end
+
+    let(:relation) do
+      _class.new
+    end
+
+    let(:relation_options) { {} }
+
+    let(:default_require) { Mongoid.belongs_to_required_by_default }
+
+    before do
+      Mongoid.configure do |config|
+        config.load_configuration(conf)
+      end
+      _class.belongs_to(:person, relation_options)
+    end
+
+    after do
+      Object.send(:remove_const, _class.name)
+    end
+
+    after(:all) do
+      Mongoid.configure do |config|
+        config.load_configuration(CONFIG)
+      end
+    end
+
     it "defines the macro" do
-      expect(klass).to respond_to(:belongs_to)
+      expect(_class).to respond_to(:belongs_to)
+    end
+
+    context 'when the relation has options' do
+
+      context 'when the relation has the option :required' do
+
+        context 'when the relation does not have the :optional option' do
+
+          context 'when :required is true' do
+
+            let(:relation_options) do
+              { required: true }
+            end
+
+            context 'when the default config is to require the association' do
+
+              let(:default_require) { true }
+
+              it 'requires the association' do
+                expect(relation.save).to be(false)
+              end
+            end
+
+            context 'when the default config is to not require the association' do
+
+              let(:default_require) { false }
+
+              it 'requires the association' do
+                expect(relation.save).to be(false)
+              end
+            end
+          end
+
+          context 'when :required is false' do
+
+            let(:relation_options) do
+              { required: false }
+            end
+
+            context 'when the default config is to require the association' do
+
+              let(:default_require) { true }
+
+              it 'does not require the association' do
+                expect(relation.save).to be(true)
+              end
+            end
+
+            context 'when the default config is to not require the association' do
+
+              let(:default_require) { false }
+
+              it 'does not require the association' do
+                expect(relation.save).to be(true)
+              end
+            end
+          end
+        end
+
+        context 'when the relation has the option :optional' do
+
+          context 'when :required is true' do
+
+            context 'when :optional is true' do
+
+              let(:relation_options) do
+                {
+                  required: true,
+                  optional: true
+                }
+              end
+
+              context 'when the default config is to require the association' do
+
+                let(:default_require) { true }
+
+                it 'requires the association' do
+                  expect(relation.save).to be(false)
+                end
+              end
+
+              context 'when the default config is to not require the association' do
+
+                let(:default_require) { false }
+
+                it 'requires the association' do
+                  expect(relation.save).to be(false)
+                end
+              end
+            end
+
+            context 'when :optional is false' do
+
+              let(:relation_options) do
+                {
+                  required: true,
+                  optional: false
+                }
+              end
+
+              context 'when the default config is to require the association' do
+
+                let(:default_require) { true }
+
+                it 'requires the association' do
+                  expect(relation.save).to be(false)
+                end
+              end
+
+              context 'when the default config is to not require the association' do
+
+                let(:default_require) { false }
+
+                it 'requires the association' do
+                  expect(relation.save).to be(false)
+                end
+              end
+            end
+          end
+
+          context 'when :required is false' do
+
+            context 'when :optional is true' do
+
+              let(:relation_options) do
+                {
+                  required: false,
+                  optional: true
+                }
+              end
+
+              context 'when the default config is to require the association' do
+
+                let(:default_require) { true }
+
+                it 'does not require the association' do
+                  expect(relation.save).to be(true)
+                end
+              end
+
+              context 'when the default config is to not require the association' do
+
+                let(:default_require) { true }
+
+                it 'does not require the association' do
+                  expect(relation.save).to be(true)
+                end
+              end
+            end
+
+            context 'when :optional is false' do
+
+              let(:relation_options) do
+                {
+                  required: false,
+                  optional: false
+                }
+              end
+
+              context 'when the default config is to require the association' do
+
+                let(:default_require) { true }
+
+                it 'does not require the association' do
+                  expect(relation.save).to be(true)
+                end
+              end
+
+              context 'when the default config is to not require the association' do
+
+                let(:default_require) { false }
+
+                it 'does not require the association' do
+                  expect(relation.save).to be(true)
+                end
+              end
+            end
+          end
+        end
+      end
+
+      context 'when the relation does not have the option :required' do
+
+        context 'when the relation has the option :optional' do
+
+          context 'when :optional is true' do
+
+            let(:relation_options) do
+              { optional: true }
+            end
+
+            context 'when the default config is to require the association' do
+
+              let(:default_require) { true }
+
+              it 'does not require the association' do
+                expect(relation.save).to be(true)
+              end
+            end
+
+            context 'when the default config is to not require the association' do
+
+              let(:default_require) { false }
+
+              it 'does not require the association' do
+                expect(relation.save).to be(true)
+              end
+            end
+          end
+
+          context 'when :optional is false' do
+
+            let(:relation_options) do
+              { optional: false }
+            end
+
+            context 'when the default config is to require the association' do
+
+              let(:default_require) { true }
+
+              it 'requires the association' do
+                expect(relation.save).to be(false)
+              end
+            end
+
+            context 'when the default config is to not require the association' do
+
+              let(:default_require) { false }
+
+              it 'requires the association' do
+                expect(relation.save).to be(false)
+              end
+            end
+          end
+        end
+      end
+    end
+
+    context 'when the relation does not have options' do
+
+      context 'when the default config is to require the association' do
+
+        let(:default_require) { true }
+
+        it 'requires the association' do
+          expect(relation.save).to be(false)
+        end
+      end
+
+      context 'when the default config is to not require the association' do
+
+        let(:default_require) { false }
+
+        it 'does not require the association' do
+          expect(relation.save).to be(true)
+        end
+      end
     end
 
     context "when the relation is polymorphic" do
@@ -247,6 +583,19 @@ describe Mongoid::Relations::Macros do
 
     context "when defining the relation" do
 
+      context 'when the relation name is invalid' do
+
+        let(:relation) do
+          klass.belongs_to(:fields)
+        end
+
+        it 'raises an InvalidRelation exception' do
+          expect {
+            relation
+          }.to raise_exception(Mongoid::Errors::InvalidRelation)
+        end
+      end
+
       before do
         klass.belongs_to(:person)
       end
@@ -306,6 +655,19 @@ describe Mongoid::Relations::Macros do
 
     context "when defining the relation" do
 
+      context 'when the relation name is invalid' do
+
+        let(:relation) do
+          klass.has_many(:fields)
+        end
+
+        it 'raises an InvalidRelation exception' do
+          expect {
+            relation
+          }.to raise_exception(Mongoid::Errors::InvalidRelation)
+        end
+      end
+
       before do
         klass.has_many(:posts)
       end
@@ -364,8 +726,8 @@ describe Mongoid::Relations::Macros do
         expect(metadata.order).to_not be_nil
       end
 
-      it "returns Origin::Key" do
-        expect(metadata.order).to be_kind_of(Origin::Key)
+      it "returns Mongoid::Criteria::Queryable::Key" do
+        expect(metadata.order).to be_kind_of(Mongoid::Criteria::Queryable::Key)
       end
     end
 
@@ -389,6 +751,19 @@ describe Mongoid::Relations::Macros do
 
     context "when defining the relation" do
 
+      context 'when the relation name is invalid' do
+
+        let(:relation) do
+          klass.has_and_belongs_to_many(:fields)
+        end
+
+        it 'raises an InvalidRelation exception' do
+          expect {
+            relation
+          }.to raise_exception(Mongoid::Errors::InvalidRelation)
+        end
+      end
+
       before do
         klass.has_and_belongs_to_many(:preferences)
       end
@@ -429,8 +804,8 @@ describe Mongoid::Relations::Macros do
           expect(metadata.order).to_not be_nil
         end
 
-        it "returns Origin::Key" do
-          expect(metadata.order).to be_kind_of(Origin::Key)
+        it "returns Mongoid::Criteria::Queryable::Key" do
+          expect(metadata.order).to be_kind_of(Mongoid::Criteria::Queryable::Key)
         end
       end
 
@@ -459,6 +834,19 @@ describe Mongoid::Relations::Macros do
 
     context "when defining the relation" do
 
+      context 'when the relation name is invalid' do
+
+        let(:relation) do
+          klass.has_one(:fields)
+        end
+
+        it 'raises an InvalidRelation exception' do
+          expect {
+            relation
+          }.to raise_exception(Mongoid::Errors::InvalidRelation)
+        end
+      end
+
       before do
         klass.has_one(:game)
       end