mongoid 6.4.4 → 7.1.7

data/spec/mongoid/stateful_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Stateful do

data/spec/mongoid/tasks/database_rake_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "rake"
 require "spec_helper"
 
@@ -45,7 +48,7 @@ shared_context "rails rake task" do
   end
 end
 
-describe "db:drop", if: non_legacy_server? do
+describe "db:drop" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -58,7 +61,7 @@ describe "db:drop", if: non_legacy_server? do
   end
 end
 
-describe "db:purge", if: non_legacy_server? do
+describe "db:purge" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -71,7 +74,7 @@ describe "db:purge", if: non_legacy_server? do
   end
 end
 
-describe "db:seed", if: non_legacy_server? do
+describe "db:seed" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -85,7 +88,7 @@ describe "db:seed", if: non_legacy_server? do
   end
 end
 
-describe "db:setup", if: non_legacy_server? do
+describe "db:setup" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -117,7 +120,7 @@ describe "db:setup", if: non_legacy_server? do
   end
 end
 
-describe "db:reset", if: non_legacy_server? do
+describe "db:reset" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -135,7 +138,7 @@ describe "db:reset", if: non_legacy_server? do
   end
 end
 
-describe "db:create", if: non_legacy_server? do
+describe "db:create" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -144,7 +147,7 @@ describe "db:create", if: non_legacy_server? do
   end
 end
 
-describe "db:migrate", if: non_legacy_server? do
+describe "db:migrate" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -153,7 +156,7 @@ describe "db:migrate", if: non_legacy_server? do
   end
 end
 
-describe "db:test:prepare", if: non_legacy_server? do
+describe "db:test:prepare" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -174,7 +177,7 @@ describe "db:test:prepare", if: non_legacy_server? do
   end
 end
 
-describe "db:mongoid:create_indexes", if: non_legacy_server? do
+describe "db:mongoid:create_indexes" do
   include_context "rake task"
 
   it_behaves_like "create_indexes"
@@ -198,7 +201,7 @@ describe "db:mongoid:create_indexes", if: non_legacy_server? do
   end
 end
 
-describe "db:mongoid:remove_undefined_indexes", if: non_legacy_server? do
+describe "db:mongoid:remove_undefined_indexes" do
   include_context "rake task"
 
   it "receives remove_undefined_indexes" do
@@ -224,7 +227,7 @@ describe "db:mongoid:remove_undefined_indexes", if: non_legacy_server? do
   end
 end
 
-describe "db:mongoid:remove_indexes", if: non_legacy_server? do
+describe "db:mongoid:remove_indexes" do
   include_context "rake task"
 
   it "receives remove_indexes" do
@@ -250,7 +253,7 @@ describe "db:mongoid:remove_indexes", if: non_legacy_server? do
   end
 end
 
-describe "db:mongoid:drop", if: non_legacy_server? do
+describe "db:mongoid:drop" do
   include_context "rake task"
 
   it "works" do
@@ -266,7 +269,7 @@ describe "db:mongoid:drop", if: non_legacy_server? do
   end
 end
 
-describe "db:mongoid:purge", if: non_legacy_server? do
+describe "db:mongoid:purge" do
   include_context "rake task"
 
   it "receives a purge" do

data/spec/mongoid/tasks/database_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe "Mongoid::Tasks::Database" do
@@ -133,7 +136,7 @@ describe "Mongoid::Tasks::Database" do
       expect(removed_indexes).to be_empty
     end
 
-    context 'when the index is a text index', if: non_legacy_server? do
+    context 'when the index is a text index' do
 
       before do
         class Band

data/spec/mongoid/threaded_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Threaded do

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Timestamps::Created::Short do

data/spec/mongoid/timestamps/created_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Timestamps::Created do

data/spec/mongoid/timestamps/timeless_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Timestamps::Timeless do

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Timestamps::Updated::Short do

data/spec/mongoid/timestamps/updated_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Timestamps::Updated do

data/spec/mongoid/timestamps_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Timestamps do

data/spec/mongoid/{relations/touchable_spec.rb → touchable_spec.rb}

@@ -1,11 +1,39 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
-describe Mongoid::Relations::Touchable do
+describe Mongoid::Touchable do
 
   describe "#touch" do
 
+    context "when the document has no associations" do
+      let(:updatable) do
+        Updatable.create
+      end
+
+      it "responds to #touch" do
+        expect(updatable).to respond_to(:touch)
+      end
+
+      it "updates the timestamp when called" do
+        expect(updatable.updated_at).to be_nil
+
+        updatable.touch
+        updated_at = updatable.updated_at
+        expect(updated_at).not_to be_nil
+
+        updatable.touch
+        expect(updatable.updated_at).to be > updated_at
+      end
+    end
+
     context "when the document is embedded" do
 
+      before do
+        Label.send(:include, Mongoid::Touchable::InstanceMethods)
+      end
+
       let(:band) do
         Band.create(name: "Placebo")
       end
@@ -29,6 +57,11 @@ describe Mongoid::Relations::Touchable do
 
     context "when no relations have touch options" do
 
+      before do
+        Person.send(:include, Mongoid::Touchable::InstanceMethods)
+        Agent.send(:include, Mongoid::Touchable::InstanceMethods)
+      end
+
       context "when no updated at is defined" do
 
         let(:person) do
@@ -156,13 +189,13 @@ describe Mongoid::Relations::Touchable do
 
       context "when record is new" do
 
-        let(:agent) do
+        let!(:agent) do
           Agent.new(updated_at: 2.days.ago)
         end
 
         context "when no attribute is provided" do
 
-          let!(:touched) do
+          let(:touched) do
             agent.touch
           end
 
@@ -173,7 +206,7 @@ describe Mongoid::Relations::Touchable do
 
         context "when an attribute is provided" do
 
-          let!(:touched) do
+          let(:touched) do
             agent.touch(:dob)
           end
 
@@ -183,6 +216,49 @@ describe Mongoid::Relations::Touchable do
         end
       end
 
+      context "when record is destroyed" do
+
+        let!(:agent) do
+          Agent.create!(updated_at: 2.days.ago).tap do |agent|
+            agent.destroy
+          end
+        end
+
+        let(:frozen_error_cls) do
+          if RUBY_VERSION >= '2.5'
+            FrozenError
+          else
+            RuntimeError
+          end
+        end
+
+        context "when no attribute is provided" do
+
+          let(:touched) do
+            agent.touch
+          end
+
+          it "raises FrozenError" do
+            expect do
+              touched
+            end.to raise_error(frozen_error_cls)
+          end
+        end
+
+        context "when an attribute is provided" do
+
+          let(:touched) do
+            agent.touch(:dob)
+          end
+
+          it "raises FrozenError" do
+            expect do
+              touched
+            end.to raise_error(frozen_error_cls)
+          end
+        end
+      end
+
       context "when creating the child" do
 
         let(:time) do
@@ -209,6 +285,11 @@ describe Mongoid::Relations::Touchable do
 
       context "when the relation is a parent of an embedded doc" do
 
+        before do
+          Page.send(:include, Mongoid::Touchable::InstanceMethods)
+          Edit.send(:include, Mongoid::Touchable::InstanceMethods)
+        end
+
         let(:page) do
           WikiPage.create(title: "test")
         end
@@ -229,6 +310,10 @@ describe Mongoid::Relations::Touchable do
 
       context "when the parent of embedded doc has cascade callbacks" do
 
+        before do
+          Band.send(:include, Mongoid::Touchable::InstanceMethods)
+        end
+
         let!(:book) do
           Book.new
         end

data/spec/mongoid/traversable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Traversable do

data/spec/mongoid/validatable/associated_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Validatable::AssociatedValidator do
@@ -171,7 +174,7 @@ describe Mongoid::Validatable::AssociatedValidator do
         end
       end
 
-      context "when the assocation has all valid documents" do
+      context "when the association has all valid documents" do
 
         let(:associated) do
           double(valid?: true, flagged_for_destroy?: false)

data/spec/mongoid/validatable/format_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Validatable::FormatValidator do

data/spec/mongoid/validatable/length_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Validatable::LengthValidator do

data/spec/mongoid/validatable/numericality_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe ActiveModel::Validations::NumericalityValidator do

data/spec/mongoid/validatable/presence_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Validatable::PresenceValidator do
@@ -211,13 +214,14 @@ describe Mongoid::Validatable::PresenceValidator do
 
     context "when the relation is a has one" do
 
-      before do
+      around do |example|
+        original_relations = Person.relations
+        Person.has_one :game, autosave: true
         Person.validates :game, presence: true
-      end
-
-      after do
+        example.run
         Person.reset_callbacks(:save)
         Person.reset_callbacks(:validate)
+        Person.relations = original_relations
       end
 
       context "when the relation is new" do
@@ -249,7 +253,7 @@ describe Mongoid::Validatable::PresenceValidator do
     context "when the relation is a has one and autosave is false" do
 
       before do
-        Person.relations["game"][:autosave] = false
+        Person.relations["game"].options[:autosave] = false
         Person.validates :game, presence: true
       end
 
@@ -258,7 +262,7 @@ describe Mongoid::Validatable::PresenceValidator do
       end
 
       it "does not change autosave on the relation" do
-        expect(Person.relations["game"][:autosave]).to be false
+        expect(Person.relations["game"].autosave?).to be false
       end
 
       context "when the relation is new" do

data/spec/mongoid/validatable/uniqueness_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Validatable::UniquenessValidator do
@@ -796,20 +799,47 @@ describe Mongoid::Validatable::UniquenessValidator do
           end
         end
 
-        context "when a range scope is provided" do
+        context "when a range condition is provided" do
 
           before do
-            Dictionary.validates_uniqueness_of(:name, :scope => Dictionary.where(:year.gte => 1900, :year.lt => 2000))
-            Dictionary.create(name: "French-English", year: 1950)
-            Dictionary.create(name: "French-English", year: 1960)
+            Dictionary.validates_uniqueness_of(:name,
+              conditions: -> { Dictionary.where(:year.gte => 1900, :year.lt => 2000) })
           end
 
           after do
             Dictionary.reset_callbacks(:validate)
           end
 
-          it "successfully prevents uniqueness violation" do
-            expect(Dictionary.all.size).to eq(1)
+          context 'when multiple documents would match the condition' do
+            it "prevents creation of new document" do
+              Dictionary.create!(name: "French-English", year: 1950)
+
+              expect do
+                Dictionary.create!(name: "French-English", year: 1960)
+              end.to raise_error(Mongoid::Errors::Validations, /Name is already taken/)
+
+              expect(Dictionary.all.size).to eq(1)
+            end
+          end
+
+          context 'when only new document would match the condition' do
+            it 'creates the new document' do
+              Dictionary.create!(name: "French-English", year: 950)
+              expect do
+                Dictionary.create!(name: "French-English", year: 1950)
+              end.not_to raise_error
+            end
+          end
+
+          context 'when only existing document matches the condition' do
+            it 'creates the new document' do
+              pending 'https://jira.mongodb.org/browse/MONGOID-4815'
+
+              Dictionary.create!(name: "French-English", year: 1950)
+              expect do
+                Dictionary.create!(name: "French-English", year: 950)
+              end.not_to raise_error
+            end
           end
         end