X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6df7fdbb9eb563f8ccf68f24c3d210b27c93cd83..618b09a8ab6aa12b86e9702185740a9be6260e18:/test/functional/browse_controller_test.rb?ds=inline

diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb
index 81dbede57..87a3e7489 100644
--- a/test/functional/browse_controller_test.rb
+++ b/test/functional/browse_controller_test.rb
@@ -1,77 +1,144 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'browse_controller'
 
-# Re-raise errors caught by the controller.
-class BrowseController; def rescue_action(e) raise e end; end
-
-  class BrowseControllerTest < Test::Unit::TestCase
+class BrowseControllerTest < ActionController::TestCase
   api_fixtures
-  
-
-
-  def setup
-    @controller = BrowseController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
 
-  def basic_authorization(user, pass)
-    @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")
+  ##
+  # test all routes which lead to this controller
+  def test_routes
+    assert_routing(
+      { :path => "/browse/start", :method => :get },
+      { :controller => "browse", :action => "start" }
+    )
+    assert_routing(
+      { :path => "/browse/node/1", :method => :get },
+      { :controller => "browse", :action => "node", :id => "1" }
+    )
+    assert_routing(
+      { :path => "/browse/node/1/history", :method => :get },
+      { :controller => "browse", :action => "node_history", :id => "1" }
+    )
+    assert_routing(
+      { :path => "/browse/way/1", :method => :get },
+      { :controller => "browse", :action => "way", :id => "1" }
+    )
+    assert_routing(
+      { :path => "/browse/way/1/history", :method => :get },
+      { :controller => "browse", :action => "way_history", :id => "1" }
+    )
+    assert_routing(
+      { :path => "/browse/relation/1", :method => :get },
+      { :controller => "browse", :action => "relation", :id => "1" }
+    )
+    assert_routing(
+      { :path => "/browse/relation/1/history", :method => :get },
+      { :controller => "browse", :action => "relation_history", :id => "1" }
+    )
+    assert_routing(
+      { :path => "/browse/changeset/1", :method => :get },
+      { :controller => "browse", :action => "changeset", :id => "1" }
+    )
+    assert_routing(
+      { :path => "/browse/note/1", :method => :get },
+      { :controller => "browse", :action => "note", :id => "1" }
+    )
   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
+
+  ##
+  #  Methods to check redaction.
+  #
+  # 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
+  # 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 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 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 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)
+    assert_raise ActionController::RoutingError do
+      get type
+    end
+    assert_raise ActionController::RoutingError do
+      get type, {:id => -10} # we won't have an id that's negative
+    end
+    get type, {:id => id}
+    assert_response :success
+    assert_template type
   end
 end