all specs passing, running full tx support spec each time

.rspec

@@ -1,2 +1,2 @@
 --color
---tty
+--tty

lib/neo4j/migration.rb

@@ -79,14 +79,17 @@ def add_ids_to(model)
 
       def id_batch_set(label, property, new_ids, to_set)
         Benchmark.realtime do
-          Neo4j::Transaction.run do
+          begin
+            tx = Neo4j::Transaction.new
             Neo4j::Session.query("MATCH (n:`#{label}`) WHERE NOT has(n.#{property})
               with COLLECT(n) as nodes, #{new_ids} as ids
               FOREACH(i in range(0,#{to_set - 1})|
                 FOREACH(node in [nodes[i]]|
                   SET node.#{property} = ids[i]))
               RETURN distinct(true)
               LIMIT #{to_set}")
+          ensure
+            tx.close
           end
         end
       end

spec/e2e/transaction_spec.rb

@@ -11,7 +11,7 @@
     end
 
     #:nocov:
-    it 'returns  hash values inside but outside it has the node value after commit' do
+    it 'returns a wrapped node inside and outside of transaction' do
       i = 0
       SecureRandom.stub(:uuid) do
         i += 1
@@ -20,23 +20,30 @@
 
       if Neo4j::Session.current.db_type == :server_db
         clazz
-        tx = Neo4j::Transaction.new
-        a = clazz.create name: 'a'
-        b = clazz.create name: 'b'
-        a.thing = b
-        expect(a.thing).to eq("name"=>"b", "_classname"=>clazz.to_s, "uuid" => "secure1234_2")
-        tx.close
+        begin
+          tx = Neo4j::Transaction.new
+          a = clazz.create name: 'a'
+          b = clazz.create name: 'b'
+          a.thing = b
+          # expect(a.thing).to eq("name"=>"b", "_classname"=>clazz.to_s, "uuid" => "secure1234_2")
+          expect(a.thing).to eq b
+        ensure
+          tx.close
+        end
         expect(a.thing).to eq(b)
       end
 
       if Neo4j::Session.current.db_type == :embedded_db
         clazz
-        tx = Neo4j::Transaction.new
-        a = clazz.create name: 'a'
-        b = clazz.create name: 'b'
-        a.thing = b
-        expect(a.thing).to eq(b)
-        tx.close
+        begin
+          tx = Neo4j::Transaction.new
+          a = clazz.create name: 'a'
+          b = clazz.create name: 'b'
+          a.thing = b
+          expect(a.thing).to eq(b)
+        ensure
+          tx.close
+        end
         expect(a.thing).to eq(b)
       end
 

spec/unit/wrapper_spec.rb

@@ -96,7 +96,7 @@ module AutoLoadTest
       class MyWrapper
         include Neo4j::Node::Wrapper
         def props
-          42
+          { value: 42 }
         end
       end
       class B
@@ -118,7 +118,7 @@ class C < D
       allow(Neo4j::ActiveNode::Labels).to receive(:_wrapped_labels).and_return(label_mapping)
 
       wrapper.should_receive(:_class_wrappers).and_return(label_mapping.keys)
-      D.any_instance.should_receive(:init_on_load).with(wrapper, 42)
+      D.any_instance.should_receive(:init_on_load).with(wrapper, { value: 42 })
       wrapper.wrapper
     end
   end