[DEVX-2655] Fix in_transaction collisions with other gems (#112)

lib/granite/action/transaction.rb

@@ -24,25 +24,25 @@ def run_callbacks(event)
 
       private
 
-      attr_accessor :in_transaction
+      attr_accessor :granite_in_transaction
 
       def transaction(&block)
-        if in_transaction
+        if granite_in_transaction
           yield
         else
           run_in_transaction(&block)
         end
       end
 
       def run_in_transaction
-        self.in_transaction = true
+        self.granite_in_transaction = true
 
         TransactionManager.transaction do
           TransactionManager.after_commit(self)
           yield
         end
       ensure
-        self.in_transaction = false
+        self.granite_in_transaction = false
       end
     end
   end

spec/lib/granite/action/transaction_spec.rb

@@ -14,6 +14,13 @@
         end
 
         def execute_perform!(*)
+          # Simulates the after_commit_everywhere in_transaction helper (https://github.com/Envek/after_commit_everywhere/pull/23)
+          # to avoid name collisions
+          in_transaction { 'test' }
+        end
+
+        def in_transaction
+          yield
         end
       end
     end