lib/atp/processors/condition.rb in atp-0.2.1 vs lib/atp/processors/condition.rb in atp-0.3.0

@@ -75,10 +75,11 @@
         end
       end
       alias_method :on_flow_flag, :on_boolean_condition
       alias_method :on_test_result, :on_boolean_condition
       alias_method :on_test_executed, :on_boolean_condition
+      alias_method :on_job, :on_boolean_condition
 
       def on_condition(node)
         children = node.children.dup
         name = children.shift
         remove_condition << node
@@ -89,11 +90,10 @@
         else
           node.updated(nil, [name] + process_all(children))
         end
       end
       alias_method :on_group, :on_condition
-      alias_method :on_job, :on_condition
 
       # Returns true if the given node contains the given condition within
       # its immediate children
       def has_condition?(condition, node)
         ([node] + node.children.to_a).any? do |n|
@@ -107,10 +107,10 @@
         remove_condition.any? { |c| equal_conditions?(c, node) }
       end
 
       def equal_conditions?(node1, node2)
         if node1.type == node2.type
-          if node1.type == :group || node1.type == :job
+          if node1.type == :group
             node1.to_a.take(1) == node2.to_a.take(1)
           else
             node1.to_a.take(2) == node2.to_a.take(2)
           end
         end