lib/atp/processors/adjacent_if_combiner.rb in atp-1.0.0 vs lib/atp/processors/adjacent_if_combiner.rb in atp-1.1.0

@@ -88,10 +88,11 @@
       end
 
       def safe_to_combine?(node1, node2)
         # Nodes won't be collapsed if node1 touches the shared run flag, i.e. if there is any chance
         # that by the time it would naturally execute node2, the flag could have been changed by node1
-        !volatile?(node1.to_a[0]) && !SetRunFlagFinder.new.contains?(node1, node1.to_a[0])
+        (!volatile?(node1.to_a[0]) || (volatile?(node1.to_a[0]) && !node1.contains?(:test))) &&
+          !SetRunFlagFinder.new.contains?(node1, node1.to_a[0])
       end
     end
   end
 end