From: Thomas Wood <grand.edgemaster@gmail.com>
Date: Mon, 23 Mar 2009 21:35:06 +0000 (+0000)
Subject: <td> tags must be closed, move browse index test over to changeset, lazy fix for... 
X-Git-Tag: live~7630^2~50
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d841d3d1352b31e7a2196b07f4ae335e6bca8380

<td> tags must be closed, move browse index test over to changeset, lazy fix for new format
---

diff --git a/app/views/changeset/_changeset.rhtml b/app/views/changeset/_changeset.rhtml
index 7e5aeed88..049be5d33 100644
--- a/app/views/changeset/_changeset.rhtml
+++ b/app/views/changeset/_changeset.rhtml
@@ -3,10 +3,12 @@
 
   <td class="<%= cl %>">
     #<%= changeset.id %>
+  </td>
 
   <td class="<%= cl %>">
     <% if changeset.closed_at > DateTime.now %> (still editing)
     <% else %><%= changeset.closed_at.strftime("%d %b %Y %H:%M") %><% end %>
+  </td>
 
     
   <%if showusername %>  
@@ -16,6 +18,7 @@
     <% else %>
       <i>Anonymous</i>
     <% end %>
+    </td>
   <% end %>
     
   <td class="<%= cl %>">
@@ -24,6 +27,7 @@
     <% else %>
       (none)
     <% end %>
+  </td>
 
   <td class="<%= cl %>">
     <% if changeset.min_lat.nil? %>
@@ -37,8 +41,10 @@
       (<a href='/?lat=<%= lat1 %>&lon=<%= lon1 %>&zoom=14'><%= format("%0.3f",lat1) -%>,<%= format("%0.3f",lon1) -%></a>) to 
       (<a href='/?lat=<%= lat2 %>&lon=<%= lon2 %>&zoom=14'><%= format("%0.3f",lat2) -%>,<%= format("%0.3f",lon2) -%></a>) 
   <% end %>
+  </td>
 
   <td class="<%= cl %>">
     <%= link_to 'more', {:controller => 'browse', :action => 'changeset', :id => changeset.id}, {:title => 'View changeset details'} %> 
+  </td>
 
 </tr>
diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb
index c4d7a5ae4..c5a333c0d 100644
--- a/test/functional/browse_controller_test.rb
+++ b/test/functional/browse_controller_test.rb
@@ -18,30 +18,6 @@ class BrowseControllerTest < ActionController::TestCase
   
   end
   
-  # This should display the last 20 changesets closed.
-  def test_index
-    @changesets = Changeset.find(:all, :order => "closed_at DESC", :conditions => ['closed_at < ?', DateTime.now], :limit=> 20)
-    assert @changesets.size <= 20
-    get :index
-    assert_response :success
-    assert_template "index"
-    # Now check that all 20 (or however many were returned) changesets are in the html
-    assert_select "h2", :text => "#{@changesets.size} Recently Closed Changesets", :count => 1
-    assert_select "ul[id='recently_changed'] li a", :count => @changesets.size
-    @changesets.each do |changeset|
-      if changeset.user.data_public?
-        user = changeset.user.display_name
-      else
-        user = "(anonymous)"
-      end
-    
-      cmt = changeset.tags_as_hash['comment'].to_s
-      cmt = "(no comment)" if cmt.length == 0
-      text = "#{changeset.id} by #{user} - #{cmt}"
-      assert_select "ul[id='recently_changed'] li a[href=/browse/changeset/#{changeset.id}]", :text => text
-    end
-  end
-  
   # Test reading a relation
   def test_read_relation
     
diff --git a/test/functional/changeset_controller_test.rb b/test/functional/changeset_controller_test.rb
index edc2aee93..591241aa0 100644
--- a/test/functional/changeset_controller_test.rb
+++ b/test/functional/changeset_controller_test.rb
@@ -995,6 +995,21 @@ EOF
            "element limit.")
   end
   
+  # This should display the last 20 changesets closed.
+  def test_list
+    @changesets = Changeset.find(:all, :order => "created_at DESC", :conditions => ['min_lat IS NOT NULL'], :limit=> 20)
+    assert @changesets.size <= 20
+    get :list
+    assert_response :success
+    assert_template "list"
+    # Now check that all 20 (or however many were returned) changesets are in the html
+    assert_select "h1", :text => "Recent Changes", :count => 1
+    assert_select "table[id='keyvalue'] tr", :count => @changesets.size + 1
+    @changesets.each do |changeset|
+      # FIXME this test needs rewriting - test for table contents
+    end
+  end
+  
   #------------------------------------------------------------
   # utility functions
   #------------------------------------------------------------