Add a mailmap file to normalise names/addresses

[rails.git] / test / functional / browse_controller_test.rb

diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb
index 63c3d0b04555857926eb46562190d2fdfc3a2e6c..87a3e748967320e80b4d1f82b5e1959183b5ee25 100644 (file)
--- a/test/functional/browse_controller_test.rb
+++ b/test/functional/browse_controller_test.rb
@@ -49,31 +49,31 @@ class BrowseControllerTest < ActionController::TestCase
     xhr :get, :start
     assert_response :success
   end
-  
+
   def test_read_relation
     browse_check 'relation', relations(:visible_relation).relation_id
   end
-  
+
   def test_read_relation_history
     browse_check 'relation_history', relations(:visible_relation).relation_id
   end
-  
+
   def test_read_way
     browse_check 'way', ways(:visible_way).way_id
   end
-  
+
   def test_read_way_history
     browse_check 'way_history', ways(:visible_way).way_id
   end
-  
+
   def test_read_node
     browse_check 'node', nodes(:visible_node).node_id
   end
-  
+
   def test_read_node_history
     browse_check 'node_history', nodes(:visible_node).node_id
   end
-  
+
   def test_read_changeset
     browse_check 'changeset', changesets(:normal_user_first_change).id
   end
@@ -83,51 +83,54 @@ class BrowseControllerTest < ActionController::TestCase
   #
   # note that these are presently highly reliant on the structure of the
   # page for the selection tests, which doesn't work out particularly
-  # well if that structure changes. so... if you change the page layout 
+  # well if that structure changes. so... if you change the page layout
   # then please make it more easily (and robustly) testable!
   ##
   def test_redacted_node_history
     get :node_history, :id => nodes(:redacted_node_redacted_version).node_id
     assert_response :success
     assert_template 'node_history'
-    
+
     # there are 2 revisions of the redacted node, but only one
-    # should be showing up here.
-    assert_select "body div[id=content] table[class=browse_details]", 1
-    assert_select "body div[id=content] table[class=browse_details][id=1]", 0
+    # should be showing details here.
+    assert_select "body div#content div.browse_details", 2
+    assert_select "body div#content div.browse_details[id=1] div.common", 0
+    assert_select "body div#content div.browse_details[id=2] div.common", 1
   end
-  
+
   def test_redacted_way_history
     get :way_history, :id => ways(:way_with_redacted_versions_v1).way_id
     assert_response :success
     assert_template 'way_history'
-    
+
     # there are 4 revisions of the redacted way, but only 2
-    # should be showing up here.
-    assert_select "body div[id=content] table[class=browse_details]", 2
-    # redacted revisions are 2 & 3
-    assert_select "body div[id=content] table[class=browse_details][id=2]", 0
-    assert_select "body div[id=content] table[class=browse_details][id=3]", 0
+    # should be showing details here.
+    assert_select "body div#content div.browse_details", 4
+    assert_select "body div#content div.browse_details[id=1] div.common", 1
+    assert_select "body div#content div.browse_details[id=2] div.common", 0
+    assert_select "body div#content div.browse_details[id=3] div.common", 0
+    assert_select "body div#content div.browse_details[id=4] div.common", 1
   end
-  
+
   def test_redacted_relation_history
     get :relation_history, :id => relations(:relation_with_redacted_versions_v1).relation_id
     assert_response :success
     assert_template 'relation_history'
-    
+
     # there are 4 revisions of the redacted relation, but only 2
-    # should be showing up here.
-    assert_select "body div[id=content] table[class=browse_details]", 2
-    # redacted revisions are 2 & 3
-    assert_select "body div[id=content] table[class=browse_details][id=2]", 0
-    assert_select "body div[id=content] table[class=browse_details][id=3]", 0
+    # should be showing details here.
+    assert_select "body div#content div.browse_details", 4
+    assert_select "body div#content div.browse_details[id=1] div.common", 1
+    assert_select "body div#content div.browse_details[id=2] div.common", 0
+    assert_select "body div#content div.browse_details[id=3] div.common", 0
+    assert_select "body div#content div.browse_details[id=4] div.common", 1
   end
-  
+
   # This is a convenience method for most of the above checks
   # First we check that when we don't have an id, it will correctly return a 404
   # then we check that we get the correct 404 when a non-existant id is passed
   # then we check that it will get a successful response, when we do pass an id
-  def browse_check(type, id) 
+  def browse_check(type, id)
     assert_raise ActionController::RoutingError do
       get type
     end