X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d23763d6cdbf5ec11f0e83f8e6e8fb32ed973e6a..c1b5ae0aa08be555588de8098b5ea8319f4c7925:/test/controllers/browse_controller_test.rb

diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb
index 2bb743636..e74345f6a 100644
--- a/test/controllers/browse_controller_test.rb
+++ b/test/controllers/browse_controller_test.rb
@@ -28,10 +28,6 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
       { :path => "/relation/1/history", :method => :get },
       { :controller => "browse", :action => "relation_history", :id => "1" }
     )
-    assert_routing(
-      { :path => "/changeset/1", :method => :get },
-      { :controller => "browse", :action => "changeset", :id => "1" }
-    )
     assert_routing(
       { :path => "/query", :method => :get },
       { :controller => "browse", :action => "query" }
@@ -40,7 +36,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
 
   def test_read_relation
     relation = create(:relation)
-    browse_check :relation_path, relation.id, "browse/feature"
+    sidebar_browse_check :relation_path, relation.id, "browse/feature"
     assert_select "h4", /^Version/ do
       assert_select "a[href='#{old_relation_path relation, 1}']", :text => "1", :count => 1
     end
@@ -51,7 +47,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
 
   def test_multiple_version_relation_links
     relation = create(:relation, :with_history, :version => 2)
-    browse_check :relation_path, relation.id, "browse/feature"
+    sidebar_browse_check :relation_path, relation.id, "browse/feature"
     assert_select ".secondary-actions a[href='#{relation_history_path relation}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_relation_path relation, 2}']", :count => 1
@@ -59,7 +55,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
 
   def test_read_relation_history
     relation = create(:relation, :with_history)
-    browse_check :relation_history_path, relation.id, "browse/history"
+    sidebar_browse_check :relation_history_path, relation.id, "browse/history"
     assert_select "h4", /^Version/ do
       assert_select "a[href='#{old_relation_path relation, 1}']", :text => "1", :count => 1
     end
@@ -67,7 +63,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
 
   def test_read_way
     way = create(:way)
-    browse_check :way_path, way.id, "browse/feature"
+    sidebar_browse_check :way_path, way.id, "browse/feature"
     assert_select "h4", /^Version/ do
       assert_select "a[href='#{old_way_path way, 1}']", :text => "1", :count => 1
     end
@@ -78,7 +74,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
 
   def test_multiple_version_way_links
     way = create(:way, :with_history, :version => 2)
-    browse_check :way_path, way.id, "browse/feature"
+    sidebar_browse_check :way_path, way.id, "browse/feature"
     assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_way_path way, 2}']", :count => 1
@@ -86,7 +82,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
 
   def test_read_way_history
     way = create(:way, :with_history)
-    browse_check :way_history_path, way.id, "browse/history"
+    sidebar_browse_check :way_history_path, way.id, "browse/history"
     assert_select "h4", /^Version/ do
       assert_select "a[href='#{old_way_path way, 1}']", :text => "1", :count => 1
     end
@@ -94,7 +90,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
 
   def test_read_node
     node = create(:node)
-    browse_check :node_path, node.id, "browse/feature"
+    sidebar_browse_check :node_path, node.id, "browse/feature"
     assert_select "h4", /^Version/ do
       assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1
     end
@@ -105,7 +101,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
 
   def test_multiple_version_node_links
     node = create(:node, :with_history, :version => 2)
-    browse_check :node_path, node.id, "browse/feature"
+    sidebar_browse_check :node_path, node.id, "browse/feature"
     assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_node_path node, 2}']", :count => 1
@@ -113,7 +109,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
 
   def test_read_deleted_node
     node = create(:node, :visible => false)
-    browse_check :node_path, node.id, "browse/feature"
+    sidebar_browse_check :node_path, node.id, "browse/feature"
     assert_select "h4", /^Version/ do
       assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1
     end
@@ -122,35 +118,12 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
 
   def test_read_node_history
     node = create(:node, :with_history)
-    browse_check :node_history_path, node.id, "browse/history"
+    sidebar_browse_check :node_history_path, node.id, "browse/history"
     assert_select "h4", /^Version/ do
       assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1
     end
   end
 
-  def test_read_changeset
-    user = create(:user)
-    changeset = create(:changeset, :user => user)
-    create(:changeset, :user => user)
-    browse_check :changeset_path, changeset.id, "browse/changeset"
-  end
-
-  def test_read_private_changeset
-    user = create(:user)
-    changeset = create(:changeset, :user => create(:user, :data_public => false))
-    create(:changeset, :user => user)
-    browse_check :changeset_path, changeset.id, "browse/changeset"
-  end
-
-  def test_read_changeset_element_links
-    changeset = create(:changeset)
-    node = create(:node, :with_history, :changeset => changeset)
-
-    browse_check :changeset_path, changeset.id, "browse/changeset"
-    assert_dom "a[href='#{node_path node}']", :count => 1
-    assert_dom "a[href='#{old_node_path node, 1}']", :count => 1
-  end
-
   ##
   #  Methods to check redaction.
   #
@@ -234,42 +207,4 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "browse/query"
   end
-
-  private
-
-  # 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(path, id, template)
-    path_method = method(path)
-
-    assert_raise ActionController::UrlGenerationError do
-      get path_method.call
-    end
-
-    assert_raise ActionController::UrlGenerationError do
-      get path_method.call(:id => -10) # we won't have an id that's negative
-    end
-
-    get path_method.call(:id => 0)
-    assert_response :not_found
-    assert_template "browse/not_found"
-    assert_template :layout => "map"
-
-    get path_method.call(:id => 0), :xhr => true
-    assert_response :not_found
-    assert_template "browse/not_found"
-    assert_template :layout => "xhr"
-
-    get path_method.call(:id => id)
-    assert_response :success
-    assert_template template
-    assert_template :layout => "map"
-
-    get path_method.call(:id => id), :xhr => true
-    assert_response :success
-    assert_template template
-    assert_template :layout => "xhr"
-  end
 end