Cucumber tests for testing deeper stacks

Author: joonty

features/correct_window_setup.feature

@@ -30,3 +30,22 @@ Feature: Correct window setup
         When I step over
         Then the first item on the stack should show the file example.php
         And the first item on the stack should show line 3
+
+    Scenario: Reading the stack window with multiple files
+        Given I have a file example.php containing
+            """
+            <?php
+            include "example2.php";
+            ?>
+            """
+        And I have a file example2.php containing
+            """
+            <?php
+            $var1 = 1;
+            $var2 = array("hello", "world");
+            ?>
+            """
+        And I start the debugger with the PHP script example.php
+        When I step in
+        Then item 1 on the stack should show the file example2.php
+        And item 1 on the stack should show line 2

features/step_definitions/debugger_command_steps.rb

@@ -2,3 +2,8 @@
   vdebug.step_over
   vdebug.running?.should be(true), 'Vdebug is not running'
 end
+
+When "I step in" do
+  vdebug.step_in
+  vdebug.running?.should be(true), 'Vdebug is not running'
+end

features/step_definitions/stack_window_steps.rb

@@ -5,3 +5,17 @@
 Then "the first item on the stack should show line $line" do |line|
   vdebug.stack.first[:line].should == line
 end
+
+Then "item $item on the stack should show the file $file" do |idx, file|
+  idx = idx.to_i
+  stack_length = vdebug.stack.length
+  stack_length.should be >= idx, "There are only #{stack_length} items on the stack"
+  vdebug.stack[idx-1][:file].should include file
+end
+
+Then "item $item on the stack should show line $line" do |idx, line|
+  idx = idx.to_i
+  stack_length = vdebug.stack.length
+  stack_length.should be >= idx, "There are only #{stack_length} items on the stack"
+  vdebug.stack[idx-1][:line].should == line
+end

features/support/helpers.rb

@@ -19,13 +19,19 @@ def kill_vim
 end
 
 module ScriptRunner
+  STDERR_FILE = "error.out"
+
   def run_php_script(path)
     fork_and_run "php -c #{PHP_INI}", Shellwords.escape(path)
   end
 
+  def stderr_contents
+    File.read(STDERR_FILE)
+  end
+
   def fork_and_run(bin, argstr)
     fork do
-      exec %Q{XDEBUG_CONFIG="idekey=something" /usr/bin/env #{bin} #{argstr}}
+      exec %Q{XDEBUG_CONFIG="idekey=something" /usr/bin/env #{bin} #{argstr} 2>#{STDERR_FILE}}
       exit!
     end
     sleep 0.5

rubylib/vdebug.rb

@@ -13,10 +13,23 @@ def start_listening
     sleep 1
   end
 
+  def messages
+    vim.command("messages")
+  end
+
+  def step_to_line(number)
+    vim.command "#{number}"
+    vim.command "python debugger.run_to_cursor()"
+  end
+
   def step_over
     vim.command 'python debugger.step_over()'
   end
 
+  def step_in
+    vim.command 'python debugger.step_into()'
+  end
+
   # Retrieve a hash with the buffer names (values) and numbers (keys)
   def buffers
     @buffers ||= fetch_buffers
@@ -64,7 +77,7 @@ def stack_window_content
   def stack
     stack_window_content.split("\n").map { |l|
       s = {}
-      matches = /^\[(\d+)\] {([^}]+)} @ ([^:]+):(\d+)/.match(l)
+      matches = /^\[(\d+)\] (\S+) @ ([^:]+):(\d+)/.match(l)
       if matches
         s[:level] = matches[1]
         s[:name] = matches[2]