[Crackerjack-devel-changes] SF.net SVN: crackerjack:[956] trunk/viewsite

[<zn...@us...>]

Revision: 956
          http://crackerjack.svn.sourceforge.net/crackerjack/?rev=956&view=rev
Author:   znz
Date:     2009-09-08 02:50:19 +0000 (Tue, 08 Sep 2009)

Log Message:
-----------
fix 500 Internal Server Error of compare_logs/show when STATUS_[AB]_NOT_FOUND

Modified Paths:
--------------
    trunk/viewsite/app/views/compare_logs/show.html.erb
    trunk/viewsite/test/fixtures/compare_logs.yml
    trunk/viewsite/test/functional/compare_logs_controller_test.rb

Modified: trunk/viewsite/app/views/compare_logs/show.html.erb
===================================================================
--- trunk/viewsite/app/views/compare_logs/show.html.erb	2009-09-07 04:17:29 UTC (rev 955)
+++ trunk/viewsite/app/views/compare_logs/show.html.erb	2009-09-08 02:50:19 UTC (rev 956)
@@ -3,13 +3,21 @@
 <%- unless @compare_log.invalid? -%>
 <p>
   <b>A result:</b>
-  <%=link_to h(@a_execute_log.execute_result.to_summary), @a_execute_log %>
+  <%- if @a_execute_log -%>
+    <%=link_to h(@a_execute_log.execute_result.to_summary), @a_execute_log %>
+  <%- else -%>
+    (not found)
+  <%- end -%>
 </p>
 
 <p>
 <p>
   <b>B result:</b>
-  <%=link_to h(@b_execute_log.execute_result.to_summary), @b_execute_log %>
+  <%- if @b_execute_log -%>
+    <%=link_to h(@b_execute_log.execute_result.to_summary), @b_execute_log %>
+  <%- else -%>
+    (not found)
+  <%- end -%>
 </p>
 
 <p>

Modified: trunk/viewsite/test/fixtures/compare_logs.yml
===================================================================
--- trunk/viewsite/test/fixtures/compare_logs.yml	2009-09-07 04:17:29 UTC (rev 955)
+++ trunk/viewsite/test/fixtures/compare_logs.yml	2009-09-08 02:50:19 UTC (rev 956)
@@ -35,3 +35,21 @@
   c_out_log: "u_u_access out"
   c_err_log: "u_u_access err"
   compare_status: <%= CompareLog::STATUS_OK %>
+
+n_u_access:
+  compare_result: u_u # dummy
+  a_execute_log: ~
+  b_execute_log: ubuntu804_access
+  system_call: access
+  c_out_log: ~
+  c_err_log: ~
+  compare_status: <%= CompareLog::STATUS_A_NOT_FOUND %>
+
+u_n_access:
+  compare_result: u_u # dummy
+  a_execute_log: ubuntu804_access
+  b_execute_log: ~
+  system_call: access
+  c_out_log: ~
+  c_err_log: ~
+  compare_status: <%= CompareLog::STATUS_B_NOT_FOUND %>

Modified: trunk/viewsite/test/functional/compare_logs_controller_test.rb
===================================================================
--- trunk/viewsite/test/functional/compare_logs_controller_test.rb	2009-09-07 04:17:29 UTC (rev 955)
+++ trunk/viewsite/test/functional/compare_logs_controller_test.rb	2009-09-08 02:50:19 UTC (rev 956)
@@ -55,4 +55,14 @@
 
     # assert_redirected_to compare_logs_path
   end
+
+  test "should show compare_log of STATUS_A_NOT_FOUND" do
+    get :show, :id => compare_logs(:n_u_access).id
+    assert_response :success
+  end
+
+  test "should show compare_log of STATUS_B_NOT_FOUND" do
+    get :show, :id => compare_logs(:u_n_access).id
+    assert_response :success
+  end
 end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.