mongoid 8.0.7 → 8.1.0

data/spec/mongoid/serializable_spec.rb

@@ -14,19 +14,19 @@ describe Mongoid::Serializable do
       expect(guitar.send(:field_names, {})).to eq(guitar.fields.except("_type").keys.sort)
     end
 
-    context "when using a custom discriminator_key" do 
-      before do 
+    context "when using a custom discriminator_key" do
+      before do
         Instrument.discriminator_key = "dkey"
       end
 
-      after do 
+      after do
         Instrument.discriminator_key = nil
       end
 
       let(:guitar) do
         Guitar.new
       end
-  
+
       it "includes _type but does not include the new discriminator key" do
         expect(guitar.send(:field_names, {})).to eq(guitar.fields.except("dkey").keys.sort)
       end
@@ -41,15 +41,11 @@ describe Mongoid::Serializable do
       end
 
       after do
-        Mongoid.include_root_in_json = false
         reload_model(:Minim)
       end
 
       context "when global config is set to true" do
-
-        before do
-          Mongoid.include_root_in_json = true
-        end
+        config_override :include_root_in_json, true
 
         it "returns true" do
           expect(Minim.public_send(meth)).to be true
@@ -67,10 +63,7 @@ describe Mongoid::Serializable do
       end
 
       context "when global config set to false" do
-
-        before do
-          Mongoid.include_root_in_json = false
-        end
+        config_override :include_root_in_json, false
 
         it "returns false" do
           expect(Minim.public_send(meth)).to be false
@@ -89,13 +82,13 @@ describe Mongoid::Serializable do
     end
 
     describe "#include_root_in_json" do
+      config_override :include_root_in_json, false
 
       before do
         reload_model(:Minim)
       end
 
       after do
-        Mongoid.include_root_in_json = false
         reload_model(:Minim)
       end
 
@@ -127,10 +120,6 @@ describe Mongoid::Serializable do
 
       context "when global config set to false" do
 
-        before do
-          Mongoid.include_root_in_json = false
-        end
-
         it "returns false" do
           expect(minim.public_send(meth)).to be false
         end
@@ -297,14 +286,7 @@ describe Mongoid::Serializable do
       end
 
       context "when include_type_for_serialization is true" do
-
-        before do
-          Mongoid.include_type_for_serialization = true
-        end
-
-        after do
-          Mongoid.include_type_for_serialization = false
-        end
+        config_override :include_type_for_serialization, true
 
         it "includes _type field" do
           expect(person.serializable_hash.keys).to include '_type'
@@ -881,16 +863,13 @@ describe Mongoid::Serializable do
     end
 
     context "when including root in json via Mongoid" do
+      config_override :include_root_in_json, false
 
       before do
         account.include_root_in_json.should be false
         Mongoid.include_root_in_json = true
       end
 
-      after do
-        Mongoid.include_root_in_json = false
-      end
-
       it "uses the mongoid configuration" do
         expect(JSON.parse(account.to_json)).to have_key("account")
       end

data/spec/mongoid/stateful_spec.rb

@@ -136,21 +136,135 @@ describe Mongoid::Stateful do
       Band.new
     end
 
-    context "when the document is readonly" do
+    context "when legacy_readonly is true" do
+      config_override :legacy_readonly, true
 
-      before do
-        document.__selected_fields = { test: 1 }
+      context "when the selected fields are set" do
+
+        before do
+          document.__selected_fields = { test: 1 }
+        end
+
+        it "returns true" do
+          expect(document).to be_readonly
+        end
       end
 
-      it "returns true" do
-        expect(document).to be_readonly
+      context "when no readonly has been set" do
+
+        it "returns false" do
+          expect(document).to_not be_readonly
+        end
+      end
+
+      context "when the readonly! method is called" do
+
+        let(:op) do
+          document.readonly!
+        end
+
+        it "returns false" do
+          op
+          expect(document).to_not be_readonly
+        end
+
+        it "warns" do
+          expect(Mongoid::Warnings).to receive(:warn_legacy_readonly)
+          op
+        end
+      end
+
+      context "when overriding readonly?" do
+
+        let(:doc) { ReadonlyModel.create! }
+
+        before do
+          class ReadonlyModel
+            include Mongoid::Document
+
+            attr_accessor :locked
+
+            def readonly?
+              !!locked
+            end
+          end
+        end
+
+        after do
+          Object.send(:remove_const, :ReadonlyModel)
+        end
+
+        it "raises when readonly? is true" do
+          expect(doc.readonly?).to be false
+          doc.locked = true
+          expect(doc.readonly?).to be true
+          expect do
+            doc.destroy
+          end.to raise_error(Mongoid::Errors::ReadonlyDocument)
+        end
       end
     end
 
-    context "when no readonly has been set" do
+    context "when legacy_readonly is false" do
+      config_override :legacy_readonly, false
 
-      it "returns false" do
-        expect(document).to_not be_readonly
+      context "when the selected fields are set" do
+
+        before do
+          document.__selected_fields = { test: 1 }
+        end
+
+        it "returns false" do
+          expect(document).to_not be_readonly
+        end
+      end
+
+      context "when the readonly! method is called" do
+
+        before do
+          document.readonly!
+        end
+
+        it "returns true" do
+          expect(document).to be_readonly
+        end
+      end
+
+      context "when no readonly has been set" do
+
+        it "returns false" do
+          expect(document).to_not be_readonly
+        end
+      end
+
+      context "when overriding readonly?" do
+
+        let(:doc) { ReadonlyModel.new }
+
+        before do
+          class ReadonlyModel
+            include Mongoid::Document
+
+            attr_accessor :locked
+
+            def readonly?
+              !!locked
+            end
+          end
+        end
+
+        after do
+          Object.send(:remove_const, :ReadonlyModel)
+        end
+
+        it "raises when readonly? is true" do
+          expect(doc.readonly?).to be false
+          doc.locked = true
+          expect(doc.readonly?).to be true
+          expect do
+            doc.save!
+          end.to raise_error(Mongoid::Errors::ReadonlyDocument)
+        end
       end
     end
   end

data/spec/mongoid/tasks/database_rake_spec.rb

@@ -35,6 +35,22 @@ shared_context "rake task" do
       task.invoke
     end
   end
+
+  shared_examples_for "create_collections" do
+
+    it "receives create_collections" do
+      expect(Mongoid::Tasks::Database).to receive(:create_collections)
+      task.invoke
+    end
+  end
+
+  shared_examples_for "force create_collections" do
+
+    it "receives create_collections" do
+      expect(Mongoid::Tasks::Database).to receive(:create_collections).with(force: true)
+      task.invoke
+    end
+  end
 end
 
 shared_context "rails rake task" do
@@ -99,6 +115,10 @@ describe "db:setup" do
     expect(task.prerequisites).to include("mongoid:create_indexes")
   end
 
+  it "calls db:mongoid:create_collections" do
+    expect(task.prerequisites).to include("mongoid:create_collections")
+  end
+
   it "calls db:seed" do
     expect(task.prerequisites).to include("db:seed")
   end
@@ -113,6 +133,7 @@ describe "db:setup" do
 
   it "works" do
     expect(Mongoid::Tasks::Database).to receive(:create_indexes)
+    expect(Mongoid::Tasks::Database).to receive(:create_collections)
     expect(Rails).to receive(:root).and_return(".")
     expect(Rails).to receive(:application).and_return(application)
     task.invoke
@@ -169,9 +190,14 @@ describe "db:test:prepare" do
     expect(task.prerequisites).to include("mongoid:create_indexes")
   end
 
+  it "calls mongoid:create_collections" do
+    expect(task.prerequisites).to include("mongoid:create_collections")
+  end
+
   it "works" do
     expect(Rails).to receive(:application).and_return(application)
     expect(Mongoid::Tasks::Database).to receive(:create_indexes)
+    expect(Mongoid::Tasks::Database).to receive(:create_collections)
     task.invoke
   end
 end
@@ -200,6 +226,54 @@ describe "db:mongoid:create_indexes" do
   end
 end
 
+describe "db:mongoid:create_collections" do
+  include_context "rake task"
+
+  it_behaves_like "create_collections"
+
+  it "calls load_models" do
+    expect(task.prerequisites).to include("load_models")
+  end
+
+  it "calls environment" do
+    expect(task.prerequisites).to include("environment")
+  end
+
+  context "when using rails task" do
+    include_context "rails rake task"
+
+    before do
+      expect(Rails).to receive(:application).and_return(application)
+    end
+
+    it_behaves_like "create_collections"
+  end
+end
+
+describe "db:mongoid:create_collections:force" do
+  include_context "rake task"
+
+  it_behaves_like "force create_collections"
+
+  it "calls load_models" do
+    expect(task.prerequisites).to include("load_models")
+  end
+
+  it "calls environment" do
+    expect(task.prerequisites).to include("environment")
+  end
+
+  context "when using rails task" do
+    include_context "rails rake task"
+
+    before do
+      expect(Rails).to receive(:application).and_return(application)
+    end
+
+    it_behaves_like "force create_collections"
+  end
+end
+
 describe "db:mongoid:remove_undefined_indexes" do
   include_context "rake task"
 

data/spec/mongoid/tasks/database_spec.rb

@@ -4,6 +4,59 @@ require "spec_helper"
 
 describe "Mongoid::Tasks::Database" do
 
+  before(:all) do
+    module DatabaseSpec
+      class Measurement
+        include Mongoid::Document
+
+        field :timestamp, type: Time
+        field :temperature, type: Integer
+
+        embeds_many :comments
+
+        store_in collection: "measurement",
+          collection_options: {
+            capped: true, size: 10000
+          }
+      end
+
+      class Comment
+        include Mongoid::Document
+
+        field :content, type: String
+
+        embedded_in :measurement
+
+        store_in collection_options: {
+            capped: true, size: 10000
+          }
+      end
+
+      class Note
+        include Mongoid::Document
+
+        field :text
+
+        recursively_embeds_one
+
+        store_in collection_options: {
+          capped: true, size: 10000
+        }
+      end
+    end
+  end
+
+  after(:all) do
+    Mongoid.deregister_model(DatabaseSpec::Measurement)
+    DatabaseSpec.send(:remove_const, :Measurement)
+    Mongoid.deregister_model(DatabaseSpec::Comment)
+    DatabaseSpec.send(:remove_const, :Comment)
+    Mongoid.deregister_model(DatabaseSpec::Note)
+    DatabaseSpec.send(:remove_const, :Note)
+    Object.send(:remove_const, :DatabaseSpec)
+  end
+
+
   let(:logger) do
     double("logger").tap do |log|
       allow(log).to receive(:info)
@@ -18,6 +71,80 @@ describe "Mongoid::Tasks::Database" do
     [ User, Account, Address, Draft ]
   end
 
+  describe '.create_collections' do
+    context 'collection_options are specified' do
+      let(:models) do
+        [DatabaseSpec::Measurement]
+      end
+
+      after do
+        DatabaseSpec::Measurement.collection.drop
+      end
+
+      [true, false].each do |force|
+        context "when force is #{force}" do
+          it 'creates the collection' do
+            expect(DatabaseSpec::Measurement).to receive(:create_collection).once.with(force: force)
+            Mongoid::Tasks::Database.create_collections(models, force: force)
+          end
+        end
+      end
+    end
+
+    context 'collection_options are not specified' do
+      let(:models) do
+        [Person]
+      end
+
+      [true, false].each do |force|
+        context "when force is #{force}" do
+          it 'creates the collection' do
+            expect(Person).to receive(:create_collection).once.with(force: force)
+            Mongoid::Tasks::Database.create_collections(models, force: force)
+          end
+        end
+      end
+
+      context "when collection options is defined on embedded model" do
+
+        let(:models) do
+          [DatabaseSpec::Comment]
+        end
+
+        let(:logger) do
+          double("logger").tap do |log|
+            expect(log).to receive(:info).once.with(/MONGOID: collection options ignored on: .*, please define in the root model/)
+          end
+        end
+
+        before do
+          allow(Mongoid::Tasks::Database).to receive(:logger).and_return(logger)
+        end
+
+        it "does nothing, but logging" do
+          expect(DatabaseSpec::Comment).to receive(:create_collection).never
+          Mongoid::Tasks::Database.create_collections(models)
+        end
+      end
+
+      context "when collection options is defined on cyclic model" do
+
+        let(:models) do
+          [DatabaseSpec::Note]
+        end
+
+        after do
+          DatabaseSpec::Note.collection.drop
+        end
+
+        it "creates the collection" do
+          expect(DatabaseSpec::Note).to receive(:create_collection).once
+          Mongoid::Tasks::Database.create_collections(models)
+        end
+      end
+    end
+  end
+
   describe ".create_indexes" do
 
     let!(:klass) do

data/spec/mongoid/timestamps_spec.rb

@@ -17,12 +17,7 @@ describe Mongoid::Timestamps do
 
     let(:time_zone) { "Pacific Time (US & Canada)" }
 
-    around do |ex|
-      z = Time.zone
-      Time.zone = time_zone
-      ex.run
-      Time.zone = z
-    end
+    time_zone_override "Pacific Time (US & Canada)"
 
     before do
       document.run_callbacks(:create)
@@ -77,17 +72,20 @@ describe Mongoid::Timestamps do
   context "when the document has changed with updated_at specified" do
 
     let(:document) do
-      Dokument.new(created_at: Time.now.utc)
+      Dokument.create(created_at: Time.now.utc)
+    end
+
+    let(:expected_updated_at) do
+      DateTime.parse("2001-06-12")
     end
 
     before do
-      document.new_record = false
-      document.updated_at = DateTime.parse("2001-06-12")
+      document.updated_at = expected_updated_at
     end
 
     it "does not set updated at" do
-      expect(document).to receive(:updated_at=).never
       document.save!
+      expect(document.reload.updated_at).to be == expected_updated_at
     end
   end
 
@@ -127,7 +125,7 @@ describe Mongoid::Timestamps do
   end
 
   # This section of tests describes the behavior of the updated_at field for
-  # different updates on associations, as outlined in PR #5219.
+  # different updates on referenced associations, as outlined in PR #5219.
   describe "updated_at attribute" do
     let!(:start_time) { Timecop.freeze(Time.at(Time.now.to_i)) }