lib/cucumber/ast/step.rb in square-cucumber-0.3.12.2 vs lib/cucumber/ast/step.rb in square-cucumber-0.3.93.1

@@ -31,10 +31,11 @@
 
         StepInvocation.new(self, name, multiline_arg, matched_cells)
       end
 
       def accept(visitor)
+        return if $cucumber_interrupted
         # The only time a Step is visited is when it is in a ScenarioOutline.
         # Otherwise it's always StepInvocation that gets visited instead.
         visit_step_result(visitor, first_match(visitor), @multiline_arg, :skipped, nil, nil)
       end
       
@@ -83,11 +84,14 @@
       end
 
       private
 
       def matched_cells(cells)
+        col_index = 0
         cells.select do |cell|
-          delimited = delimited(cell.header_cell.value)
+          header_cell = cell.table.header_cell(col_index)
+          col_index += 1
+          delimited = delimited(header_cell.value)
           @name.index(delimited) || (@multiline_arg && @multiline_arg.has_text?(delimited))
         end
       end
 
       def delimit_argument_names(argument_hash)