unfreeze props when destroy transaction rolls back

neo4jrb · Jan 9, 2015 · 45c87b3 · 45c87b3
1 parent 703bf6e
commit 45c87b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/neo4j/shared/callbacks.rb b/lib/neo4j/shared/callbacks.rb
@@ -18,6 +18,7 @@ def destroy #:nodoc:
         run_callbacks(:destroy) { super }
       rescue
         @_deleted = false
+        @attributes = @attributes.dup
         tx.mark_failed
         raise
       ensure

diff --git a/spec/e2e/active_model_spec.rb b/spec/e2e/active_model_spec.rb
@@ -254,14 +254,16 @@ class Company
       end
 
       it 'rolls back node destroy' do
-        c = Company.create
+        c = Company.create(name: 'Foo')
         expect(c).to be_persisted
         expect { c.destroy }.not_to raise_error
         expect(c).not_to be_persisted
         Company.after_destroy { fail }
-        c = Company.create
+        c = Company.create(name: 'Foo')
         expect { c.destroy }.to raise_error
         expect(c).to be_persisted
+        expect(c).not_to be_frozen
+        expect(c).not_to be_changed
       end
     end
   end