X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/721dd9c27d299455b9159457a095716f797389f1..f2150a94cf2eb0d518a19769fc7582ea50a5f67b:/test/functional/browse_controller_test.rb?ds=sidebyside

diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb
index 65e851011..f4da4c1a8 100644
--- a/test/functional/browse_controller_test.rb
+++ b/test/functional/browse_controller_test.rb
@@ -4,63 +4,52 @@ require 'browse_controller'
 class BrowseControllerTest < ActionController::TestCase
   api_fixtures
 
-  def basic_authorization(user, pass)
-    @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")
-  end
-
-  def content(c)
-    @request.env["RAW_POST_DATA"] = c.to_s
-  end
-
-  # We need to load the home page, then activate the start rjs method
-  # and finally check that the new panel has loaded.
   def test_start
-  
-  end
-  
-  # This should display the last 20 nodes that were edited.
-  def test_index
-    @nodes = Node.find(:all, :order => "timestamp DESC", :limit => 20)
-    assert @nodes.size <= 20
-    get :index
+    xhr :get, :start
     assert_response :success
-    assert_template "index"
-    # Now check that all 20 (or however many were returned) nodes are in the html
-    assert_select "h2", :text => "#{@nodes.size} Recently Changed Nodes", :count => 1
-    assert_select "ul[id='recently_changed'] li a", :count => @nodes.size
-    @nodes.each do |node|
-      name = node.tags_as_hash['name'].to_s
-      name = "(No name)" if name.length == 0
-      assert_select "ul[id='recently_changed'] li a[href=/browse/node/#{node.id}]", :text => "#{name} - #{node.id} (#{node.version})"
-    end
   end
   
-  # Test reading a relation
   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
+  
+  # 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) 
+    get type
+    assert_response :not_found
+    assert_template 'not_found'
+    get type, {:id => -10} # we won't have an id that's negative
+    assert_response :not_found
+    assert_template 'not_found'
+    get type, {:id => id}
+    assert_response :success
+    assert_template type
   end
 end