mongoid 5.4.1 → 6.0.0.beta

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

@@ -0,0 +1,30 @@
+require "spec_helper"
+
+describe Mongoid::Criteria::Queryable::Smash do
+
+  let(:smash) do
+    described_class.new(ns: :namespace)
+  end
+
+  describe "#[]" do
+
+    before do
+      smash.store(:namespace, :default)
+      smash.store(:some_field, 42)
+    end
+
+    context "when accessing aliased field" do
+
+      it "returns value for original field" do
+        expect(smash[:ns]).to eq(:default)
+      end
+    end
+
+    context "when accessing non-aliased field" do
+
+      it "returns value for the field" do
+        expect(smash[:some_field]).to eq(42)
+      end
+    end
+  end
+end

data/spec/mongoid/criteria_spec.rb

@@ -590,7 +590,8 @@ describe Mongoid::Criteria do
 
     let!(:match) do
       Band.create(name: "Depeche Mode").tap do |band|
-        band.records.create(name: "101")
+        r = band.records
+        r.create(name: "101")
       end
     end
 
@@ -1147,29 +1148,6 @@ describe Mongoid::Criteria do
       end
     end
 
-    context "when providing one association" do
-
-      let!(:user) do
-        User.create(posts: [ post1 ])
-      end
-
-      let!(:post1) do
-        Post.create
-      end
-
-      let(:result) do
-        User.includes(:posts).first
-      end
-
-      it "executes the query" do
-        expect(result).to eq(user)
-      end
-
-      it "includes the related objects" do
-        expect(result.posts).to eq([ post1 ])
-      end
-    end
-
     context "when providing a list of associations" do
 
       let!(:user) do
@@ -1527,6 +1505,13 @@ describe Mongoid::Criteria do
             end
           end
 
+          it "does not eager load the first document" do
+            doc = criteria.first
+            expect_query(1) do
+              expect(doc.person).to eq(person)
+            end
+          end
+
           it "returns the last document" do
             expect(document).to eq(post_two)
           end
@@ -1582,6 +1567,13 @@ describe Mongoid::Criteria do
             end
           end
 
+          it "does not eager load the last document" do
+            doc = criteria.last
+            expect_query(1) do
+              expect(doc.band).to eq(tool)
+            end
+          end
+
           it "returns the document" do
             expect(document).to eq(address_one)
           end
@@ -1607,6 +1599,13 @@ describe Mongoid::Criteria do
             end
           end
 
+          it "does not eager load the first document" do
+            doc = criteria.first
+            expect_query(1) do
+              expect(doc.band).to eq(depeche)
+            end
+          end
+
           it "returns the document" do
             expect(document).to eq(address_two)
           end
@@ -1700,7 +1699,7 @@ describe Mongoid::Criteria do
           end
 
           before do
-            expect(new_context).to receive(:eager_load).with([person]).once.and_call_original
+            expect(new_context).to receive(:eager_load_one).with(person).once.and_call_original
           end
 
           let!(:from_db) do
@@ -1751,7 +1750,7 @@ describe Mongoid::Criteria do
         end
 
         before do
-          expect(context).to receive(:eager_load).with([person]).once.and_call_original
+          expect(context).to receive(:eager_load_one).with(person).once.and_call_original
         end
 
         let!(:from_db) do
@@ -2130,7 +2129,7 @@ describe Mongoid::Criteria do
         end
 
         before do
-          expect(context).to receive(:preload).twice.and_call_original
+          expect(context).to receive(:eager_load).with([ game_one, game_two ]).once.and_call_original
         end
 
         let!(:documents) do
@@ -2193,7 +2192,7 @@ describe Mongoid::Criteria do
       end
 
       before do
-        expect(context).to receive(:preload).twice.and_call_original
+        expect(context).to receive(:eager_load).with([ person ]).once.and_call_original
       end
 
       let!(:documents) do
@@ -3078,14 +3077,14 @@ describe Mongoid::Criteria do
       context "when not including private methods" do
 
         it "returns false" do
-          expect(criteria).to_not respond_to(:initialize_copy)
+          expect(criteria).to_not respond_to(:fork)
         end
       end
 
       context "when including private methods" do
 
         it "returns true" do
-          expect(criteria.respond_to?(:initialize_copy, true)).to be true
+          expect(criteria.respond_to?(:fork, true)).to be true
         end
       end
     end
@@ -3314,17 +3313,6 @@ describe Mongoid::Criteria do
         end
       end
 
-      context 'when the criteria contains a BSON::Regexp::Raw' do
-
-        let(:criteria) do
-          Band.where(name: BSON::Regexp::Raw.new("^Depeche"))
-        end
-
-        it "returns the matching documents" do
-          expect(criteria).to eq([ match ])
-        end
-      end
-
       context "when the criteria is an exact fk array match" do
 
         let(:id_one) do
@@ -3363,25 +3351,6 @@ describe Mongoid::Criteria do
         end
       end
 
-      context "when querying on a BSON::Decimal128", if: decimal128_supported? do
-
-        let(:decimal) do
-          BSON::Decimal128.new("0.0005")
-        end
-
-        let!(:band) do
-          Band.create(name: "Boards of Canada", decimal: decimal)
-        end
-
-        let(:from_db) do
-          Band.where(decimal: decimal).first
-        end
-
-        it "finds the document by the big decimal value" do
-          expect(from_db).to eq(band)
-        end
-      end
-
       context 'when querying on a polymorphic relation' do
 
         let(:movie) do
@@ -3502,8 +3471,21 @@ describe Mongoid::Criteria do
 
   describe "#with" do
 
-    let!(:criteria) do
-      Band.where(name: "Depeche Mode").with(collection: "artists")
+    let!(:criteria_and_collection) do
+      collection = nil
+      criteria = Band.where(name: "Depeche Mode").with(collection: "artists") do |crit|
+        collection = crit.collection
+        crit
+      end
+      [ criteria, collection ]
+    end
+
+    let(:criteria) do
+      criteria_and_collection[0]
+    end
+
+    let(:collection) do
+      criteria_and_collection[1]
     end
 
     it "retains the criteria selection" do
@@ -3511,7 +3493,7 @@ describe Mongoid::Criteria do
     end
 
     it "sets the persistence options" do
-      expect(criteria.persistence_options).to eq(collection: "artists")
+      expect(collection.name).to eq("artists")
     end
   end
 

data/spec/mongoid/document_spec.rb

@@ -122,75 +122,6 @@ describe Mongoid::Document do
     end
   end
 
-  describe "#cache_key" do
-
-    let(:document) do
-      Dokument.new
-    end
-
-    context "when the document is new" do
-
-      it "has a new key name" do
-        expect(document.cache_key).to eq("dokuments/new")
-      end
-    end
-
-    context "when persisted" do
-
-      before do
-        document.save
-      end
-
-      context "with updated_at" do
-
-        let!(:updated_at) do
-          document.updated_at.utc.to_s(:nsec)
-        end
-
-        it "has the id and updated_at key name" do
-          expect(document.cache_key).to eq("dokuments/#{document.id}-#{updated_at}")
-        end
-      end
-
-      context "without updated_at, with Timestamps" do
-
-        before do
-          document.updated_at = nil
-        end
-
-        it "has the id key name" do
-          expect(document.cache_key).to eq("dokuments/#{document.id}")
-        end
-      end
-    end
-
-    context "when model dont have Timestamps" do
-
-      let(:artist) do
-        Artist.create!
-      end
-
-      it "should have the id key name" do
-        expect(artist.cache_key).to eq("artists/#{artist.id}")
-      end
-    end
-
-    context "when model has Short Timestamps" do
-
-      let(:agent) do
-        ShortAgent.create!
-      end
-
-      let!(:updated_at) do
-        agent.updated_at.utc.to_s(:nsec)
-      end
-
-      it "has the id and updated_at key name" do
-        expect(agent.cache_key).to eq("short_agents/#{agent.id}-#{updated_at}")
-      end
-    end
-  end
-
   describe "#identity" do
 
     let(:person) do
@@ -675,7 +606,7 @@ describe Mongoid::Document do
 
         it "freezes attributes" do
           expect(person.freeze).to eq(person)
-          expect { person.title = "something" }.to raise_error
+          expect { person.title = "something" }.to raise_error(RuntimeError)
         end
       end
 
@@ -689,7 +620,7 @@ describe Mongoid::Document do
           person.freeze
           expect {
             person.title = "something"
-          }.to raise_error
+          }.to raise_error(RuntimeError)
         end
       end
     end
@@ -1215,22 +1146,20 @@ describe Mongoid::Document do
 
   context "when marshalling the document" do
 
-    let(:person) do
-      Person.new.tap do |person|
-        person.addresses.extension
-      end
+    let(:agency) do
+      Agency.new
     end
 
-    let!(:account) do
-      person.create_account(name: "savings")
+    let!(:agent) do
+      agency.agents.build(title: "VIP")
     end
 
     describe Marshal, ".dump" do
 
       it "successfully dumps the document" do
         expect {
-          Marshal.dump(person)
-          Marshal.dump(account)
+          Marshal.dump(agency)
+          Marshal.dump(agent)
         }.not_to raise_error
       end
     end
@@ -1238,7 +1167,7 @@ describe Mongoid::Document do
     describe Marshal, ".load" do
 
       it "successfully loads the document" do
-        expect { Marshal.load(Marshal.dump(person)) }.not_to raise_error
+        expect(Marshal.load(Marshal.dump(agency))).to eq(agency)
       end
     end
   end
@@ -1253,22 +1182,26 @@ describe Mongoid::Document do
 
       describe "#fetch" do
 
-        let!(:person) do
-          Person.new
+        let(:agency) do
+          Agency.new
+        end
+
+        let(:agent) do
+          agency.agents.build(title: "VIP", address: address)
         end
 
-        let!(:account) do
-          person.create_account(name: "savings")
+        let(:address) do
+          Address.new(city: 'Berlin')
         end
 
         it "stores the parent object" do
-          expect(cache.fetch("key") { person }).to eq(person)
-          expect(cache.fetch("key")).to eq(person)
+          expect(cache.fetch("key") { agency }).to eq(agency)
+          expect(cache.fetch("key")).to eq(agency)
         end
 
         it "stores the embedded object" do
-          expect(cache.fetch("key") { account }).to eq(account)
-          expect(cache.fetch("key")).to eq(account)
+          expect(cache.fetch("key") { agent }).to eq(agent)
+          expect(cache.fetch("key").address).to eq(agent.address)
         end
       end
     end

data/spec/mongoid/errors/invalid_relation_spec.rb

@@ -0,0 +1,37 @@
+require "spec_helper"
+
+describe Mongoid::Errors::InvalidRelation do
+
+  describe "#message" do
+
+    module MyModule
+      def crazy_method; self; end
+    end
+
+    before do
+      Object.send(:include, MyModule)
+    end
+
+    let(:error) do
+      described_class.new(Person, :crazy_method)
+    end
+
+    it "contains the problem in the message" do
+      expect(error.message).to include(
+                                   "Defining a relation named 'crazy_method' is not allowed."
+                               )
+    end
+
+    it "contains the summary in the message" do
+      expect(error.message).to include(
+                                   "Defining this relation would override the method 'crazy_method'"
+                               )
+    end
+
+    it "contains the resolution in the message" do
+      expect(error.message).to include(
+                                   "Use Mongoid.destructive_fields to see what names are not allowed"
+                               )
+    end
+  end
+end

data/spec/mongoid/errors/mongoid_error_spec.rb

@@ -50,15 +50,18 @@ describe Mongoid::Errors::MongoidError do
   describe "#to_json" do
 
     it "has problem" do
-      expect(error.to_json).to include('"problem":"message"')
+      # @todo: uncomment if https://github.com/rails/rails/pull/24628 is merged
+      #expect(error.to_json).to include('"problem":"message"')
     end
 
     it "has summary" do
-      expect(error.to_json).to include('"summary":"summary"')
+      # @todo: uncomment if https://github.com/rails/rails/pull/24628 is merged
+      #expect(error.to_json).to include('"summary":"summary"')
     end
 
     it "has resolution" do
-      expect(error.to_json).to include('"resolution":"resolution"')
+      # @todo: uncomment if https://github.com/rails/rails/pull/24628 is merged
+      #expect(error.to_json).to include('"resolution":"resolution"')
     end
   end
 end