Revert "Test_results visual refactor to avoid duplicated logic in tem…

…plate and to avoid rendering hidden details" This reverts commit 6d6244c.
mumuki · Jul 31, 2020 · 3608981 · 3608981
1 parent 0ce9492
commit 3608981
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 21 deletions.
diff --git a/app/helpers/contextualization_result_helper.rb b/app/helpers/contextualization_result_helper.rb
@@ -21,17 +21,8 @@ def contextualization_status(contextualization)
     end
   end
 
-  def render_test_result_title(test_result)
-    [test_result[:title].presence, test_result[:summary]].compact.join(': ')
-  end
-
   def render_test_result_header(test_result)
-    %Q{
-      <span class="text-#{status_class_for(test_result[:status])} mu-test-result-header">
-        #{status_icon(test_result[:status])}
-        #{render_test_result_title test_result}
-      </span>
-    }.html_safe
+    [test_result[:title].presence, test_result[:summary]].compact.join(': ').html_safe
   end
 
   def render_test_results(contextualization)

diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb
@@ -39,10 +39,6 @@ def class_for_exercise(exercise)
     icon_class_for(exercise.assignment_for(current_user))
   end
 
-  def status_class_for(status_like)
-    icon_class_for(status_like.to_submission_status)
-  end
-
   def icon_class_for(iconizable)
     iconizable.iconize[:class].to_s
   end

diff --git a/app/views/layouts/_test_results.html.erb b/app/views/layouts/_test_results.html.erb
@@ -8,15 +8,24 @@
   <ul class="results-list mu-multiple-test-results">
     <% contextualization.affable_test_results.each_with_index do |test_result, index| %>
       <li>
-        <%= render_test_result_header test_result %>
         <% if test_result[:status].failed? %>
-          <% unless contextualization.visible_success_output? %>
-            <a data-toggle="collapse" href="#example-result-<%= index %>"  class="example-see-more"><%= t :view_details %></a>
-            <div class="example-result collapse <%= 'in' if contextualization.visible_success_output? %>" id="example-result-<%= index %>">
-              <%= contextualization.test_result_html test_result %>
-            </div>
-          <% end %>
+          <span class="text-danger mu-test-result-header">
+            <%= status_icon(test_result[:status]) %>
+            <%= render_test_result_header test_result %>
+            <% unless contextualization.visible_success_output? %>
+              <a data-toggle="collapse" href="#example-result-<%= index %>"  class="example-see-more"><%= t :view_details %></a>
+            <% end %>
+          </span>
+        <% else %>
+          <span class="text-success mu-test-result-header">
+            <%= status_icon(test_result[:status]) %>
+            <%= render_test_result_header test_result %>
+          </span>
         <% end %>
+
+        <div class="example-result collapse <%= 'in' if contextualization.visible_success_output? %>" id="example-result-<%= index %>">
+          <%= contextualization.test_result_html test_result %>
+        </div>
       </li>
     <% end %>
   </ul>