Improve debugging

Author: jonleighton

test/acceptance/app_test.rb

@@ -21,28 +21,22 @@ def app
     @app ||= Spring::Test::Application.new("#{TEST_ROOT}/apps/tmp")
   end
 
-  def debug(artifacts)
-    artifacts = artifacts.dup
-    artifacts.delete :status
-    app.dump_streams(artifacts.delete(:command), artifacts)
-  end
-
   def assert_output(artifacts, expected)
     expected.each do |stream, output|
       assert artifacts[stream].include?(output),
-             "expected #{stream} to include '#{output}'.\n\n#{debug(artifacts)}"
+             "expected #{stream} to include '#{output}'.\n\n#{app.debug(artifacts)}"
     end
   end
 
   def assert_success(command, expected_output = nil)
     artifacts = app.run(*Array(command))
-    assert artifacts[:status].success?, "expected successful exit status\n\n#{debug(artifacts)}"
+    assert artifacts[:status].success?, "expected successful exit status\n\n#{app.debug(artifacts)}"
     assert_output artifacts, expected_output if expected_output
   end
 
   def assert_failure(command, expected_output = nil)
     artifacts = app.run(*Array(command))
-    assert !artifacts[:status].success?, "expected unsuccessful exit status\n\n#{debug(artifacts)}"
+    assert !artifacts[:status].success?, "expected unsuccessful exit status\n\n#{app.debug(artifacts)}"
     assert_output artifacts, expected_output if expected_output
   end
 

test/acceptance/helper.rb

@@ -57,8 +57,12 @@ def stderr
         @stderr ||= IO.pipe
       end
 
+      def log_file_path
+        path("tmp/spring.log")
+      end
+
       def log_file
-        @log_file ||= path("tmp/spring.log").open("w+")
+        @log_file ||= log_file_path.open("w+")
       end
 
       def env
@@ -68,7 +72,7 @@ def env
           "HOME"       => user_home.to_s,
           "RAILS_ENV"  => nil,
           "RACK_ENV"   => nil,
-          "SPRING_LOG" => log_file.path
+          "SPRING_LOG" => log_file_path.to_s
         }
       end
 
@@ -202,6 +206,12 @@ def dump_streams(command, streams)
         output
       end
 
+      def debug(artifacts)
+        artifacts = artifacts.dup
+        artifacts.delete :status
+        dump_streams(artifacts.delete(:command), artifacts)
+      end
+
       def await_reload
         raise "no pid" if @application_pids.nil? || @application_pids.empty?
 
@@ -212,7 +222,9 @@ def await_reload
 
       def run!(*args)
         artifacts = run(*args)
-        raise "command failed" unless artifacts[:status].success?
+        unless artifacts[:status].success?
+          raise "command failed\n\n#{debug(artifacts)}"
+        end
         artifacts
       end