Adds assertions for import result.

git-svn-id: http://svn.redmine.org/redmine/trunk@15497 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/imports/show.html.erb b/app/views/imports/show.html.erb
index 96b40a6632a5083fea5e3c93ee79da86e0032efa..a50db99fe354e95c5e302d9961e76a8252105403 100644 (file)
--- a/app/views/imports/show.html.erb
+++ b/app/views/imports/show.html.erb
@@ -3,7 +3,7 @@
 <% if @import.saved_items.count > 0 %>
   <p><%= l(:notice_import_finished, :count => @import.saved_items.count) %></p>
 
-  <ul>
+  <ul id="saved-items">
   <% @import.saved_objects.each do |issue| %>
     <li><%= link_to_issue issue %></li>
   <% end %>
@@ -14,16 +14,20 @@
   <p><%= l(:notice_import_finished_with_errors, :count => @import.unsaved_items.count, :total => @import.total_items) %></p>
 
   <table id="unsaved-items" class="list">
+    <thead>
     <tr>
       <th>Position</th>
       <th>Message</th>
     </tr>
-  <% @import.unsaved_items.each do |item| %>
+    </thead>
+    <tbody>
+    <% @import.unsaved_items.each do |item| %>
     <tr>
       <td><%= item.position %></td>
       <td><%= simple_format_without_paragraph item.message %></td>
     </tr>
-  <% end %>
+    <% end %>
+    </tbody>
   </table>
 <% end %>
 

diff --git a/test/functional/imports_controller_test.rb b/test/functional/imports_controller_test.rb
index 9c8dafa34f4a9bf6325f224845e380fe1e70189c..5c41c10d7f86b143e2debfc7a0990d5512a618e5 100644 (file)
--- a/test/functional/imports_controller_test.rb
+++ b/test/functional/imports_controller_test.rb
@@ -184,6 +184,8 @@ class ImportsControllerTest < ActionController::TestCase
     get :show, :id => import.to_param
     assert_response :success
     assert_template 'show'
+    assert_select 'ul#saved-items'
+    assert_select 'ul#saved-items li', import.saved_items.count
     assert_select 'table#unsaved-items', 0
   end
 
@@ -197,5 +199,6 @@ class ImportsControllerTest < ActionController::TestCase
     assert_response :success
     assert_template 'show'
     assert_select 'table#unsaved-items'
+    assert_select 'table#unsaved-items tbody tr', import.unsaved_items.count
   end
 end