Merge 9e78193 into 35aea60

examples/mongoid_test.rb

@@ -23,6 +23,12 @@ class Person
   field :name
 end
 
+class Item
+  include Mongoid::Document
+  field :title
+  validates :title, presence: true, on: :my_context
+end
+
 class BugTest < Minitest::Test
   def test_query_count
     p = Person.create!(name: 'arthurnn')
@@ -35,4 +41,16 @@ def test_query_count
 
     assert_equal 2, query_counter
   end
+
+  def test_default_context
+    item = Item.new
+    assert item.valid?
+    assert item.save
+  end
+
+  def test_my_context
+    item = Item.new
+    assert_equal item.valid?(:my_context), false, 'Cannot validate context'
+    assert_equal item.save(context: :my_context), false, 'Cannot save correct context'
+  end
 end

lib/mongoid/persistable/creatable.rb

@@ -111,7 +111,8 @@ def post_process_insert
       #
       # @since 4.0.0
       def prepare_insert(options = {})
-        return self if performing_validations?(options) && invalid?(:create)
+        return self if performing_validations?(options) &&
+          invalid?(options[:context] || :create)
         result = run_callbacks(:save) do
           run_callbacks(:create) do
             yield(self)

lib/mongoid/persistable/updatable.rb

@@ -110,7 +110,8 @@ def init_atomic_updates
       #
       # @since 4.0.0
       def prepare_update(options = {})
-        return false if performing_validations?(options) && invalid?(:update)
+        return false if performing_validations?(options) &&
+          invalid?(options[:context] || :update)
         process_flagged_destroys
         result = run_callbacks(:save) do
           run_callbacks(:update) do

spec/app/models/contextable_item.rb

@@ -0,0 +1,5 @@
+class ContextableItem
+  include Mongoid::Document
+  field :title
+  validates :title, presence: true, on: :in_context
+end

spec/mongoid/persistable/savable_spec.rb

@@ -8,6 +8,14 @@
       Person.create
     end
 
+    let(:contextable_item) do
+      ContextableItem.new
+    end
+
+    let(:persisted_contextable_item) do
+      ContextableItem.create(title: 'sir')
+    end
+
     context "when skipping validation" do
 
       context "when no relations are involved" do
@@ -285,6 +293,35 @@
         }.to raise_error(Mongoid::Errors::ReadonlyDocument)
       end
     end
+
+    context "when validation context isn't assigned" do
+      it "returns true" do
+        expect(contextable_item.save).to be true
+      end
+    end
+
+    context "when validation context exists" do
+      context "on new document" do
+        it "returns true" do
+          contextable_item.title = "sir"
+          expect(contextable_item.save(context: :in_context)).to be true
+        end
+        it "returns false" do
+          expect(contextable_item.save(context: :in_context)).to be false
+        end
+      end
+
+      context "on persisted document" do
+        it "returns true" do
+          persisted_contextable_item.title = "lady"
+          expect(persisted_contextable_item.save(context: :in_context)).to be true
+        end
+        it "returns false" do
+          persisted_contextable_item.title = nil
+          expect(persisted_contextable_item.save(context: :in_context)).to be false
+        end
+      end
+    end
   end
 
   describe "save!" do