cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move current element actions to their own controllers

Browse source
This commit is contained in:
Anton Khorev 2024-03-15 03:24:45 +03:00
parent 3b143dc2b4
commit 54dec27949
16 changed files with 224 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

131
test/controllers/browse_controller_test.rb
View file

@ -4,146 +4,15 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
##
# test all routes which lead to this controller
def test_routes
assert_routing(
{ :path => "/node/1", :method => :get },
{ :controller => "browse", :action => "node", :id => "1" }
)
assert_routing(
{ :path => "/way/1", :method => :get },
{ :controller => "browse", :action => "way", :id => "1" }
)
assert_routing(
{ :path => "/relation/1", :method => :get },
{ :controller => "browse", :action => "relation", :id => "1" }
)
assert_routing(
{ :path => "/query", :method => :get },
{ :controller => "browse", :action => "query" }
)
end
def test_read_relation
relation = create(:relation)
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
assert_select ".secondary-actions a[href='#{api_relation_path relation}']", :count => 1
assert_select ".secondary-actions a[href='#{relation_history_path relation}']", :count => 1
assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 0
end
def test_multiple_version_relation_links
relation = create(:relation, :with_history, :version => 2)
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
end
def test_read_way
way = create(:way)
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
assert_select ".secondary-actions a[href='#{api_way_path way}']", :count => 1
assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1
assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 0
end
def test_multiple_version_way_links
way = create(:way, :with_history, :version => 2)
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
end
def test_read_node
node = create(:node)
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
assert_select ".secondary-actions a[href='#{api_node_path node}']", :count => 1
assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1
assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 0
end
def test_multiple_version_node_links
node = create(:node, :with_history, :version => 2)
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
end
def test_read_deleted_node
node = create(:node, :visible => false)
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
assert_select "a[href='#{api_node_path node}']", :count => 0
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
node = create(:node, :with_history, :deleted, :version => 2)
node_v1 = node.old_nodes.find_by(:version => 1)
node_v1.redact!(create(:redaction))
get node_path(:id => node)
assert_response :success
assert_template "feature"
# check that we don't show lat/lon for a redacted node.
assert_select ".browse-section", 1
assert_select ".browse-section.browse-node", 1
assert_select ".browse-section.browse-node .latitude", 0
assert_select ".browse-section.browse-node .longitude", 0
end
def test_query
get query_path
assert_response :success
assert_template "browse/query"
end
def test_anonymous_user_feature_page_secondary_actions
node = create(:node, :with_history)
get node_path(:id => node)
assert_response :success
assert_select ".secondary-actions a", :text => "View Details", :count => 0
assert_select ".secondary-actions a", :text => "View History", :count => 1
assert_select ".secondary-actions a", :text => "View Unredacted History", :count => 0
end
def test_regular_user_feature_page_secondary_actions
session_for(create(:user))
node = create(:node, :with_history)
get node_path(:id => node)
assert_response :success
assert_select ".secondary-actions a", :text => "View Details", :count => 0
assert_select ".secondary-actions a", :text => "View History", :count => 1
assert_select ".secondary-actions a", :text => "View Unredacted History", :count => 0
end
def test_moderator_user_feature_page_secondary_actions
session_for(create(:moderator_user))
node = create(:node, :with_history)
get node_path(:id => node)
assert_response :success
assert_select ".secondary-actions a", :text => "View Details", :count => 0
assert_select ".secondary-actions a", :text => "View History", :count => 1
assert_select ".secondary-actions a", :text => "View Unredacted History", :count => 1
end
end

85
test/controllers/nodes_controller_test.rb Normal file
View file

@ -0,0 +1,85 @@
require "test_helper"
class NodesControllerTest < ActionDispatch::IntegrationTest
##
# test all routes which lead to this controller
def test_routes
assert_routing(
{ :path => "/node/1", :method => :get },
{ :controller => "nodes", :action => "show", :id => "1" }
)
end
def test_show
node = create(:node)
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
assert_select ".secondary-actions a[href='#{api_node_path node}']", :count => 1
assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1
assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 0
end
def test_show_multiple_versions
node = create(:node, :with_history, :version => 2)
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
end
def test_show_deleted
node = create(:node, :visible => false)
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
assert_select "a[href='#{api_node_path node}']", :count => 0
end
def test_show_redacted
node = create(:node, :with_history, :deleted, :version => 2)
node_v1 = node.old_nodes.find_by(:version => 1)
node_v1.redact!(create(:redaction))
get node_path(node)
assert_response :success
assert_template "feature"
# check that we don't show lat/lon for a redacted node.
assert_select ".browse-section", 1
assert_select ".browse-section.browse-node", 1
assert_select ".browse-section.browse-node .latitude", 0
assert_select ".browse-section.browse-node .longitude", 0
end
def test_show_secondary_actions_to_anonymous_user
node = create(:node, :with_history)
get node_path(node)
assert_response :success
assert_select ".secondary-actions a", :text => "View Details", :count => 0
assert_select ".secondary-actions a", :text => "View History", :count => 1
assert_select ".secondary-actions a", :text => "View Unredacted History", :count => 0
end
def test_show_secondary_actions_to_regular_user
session_for(create(:user))
node = create(:node, :with_history)
get node_path(node)
assert_response :success
assert_select ".secondary-actions a", :text => "View Details", :count => 0
assert_select ".secondary-actions a", :text => "View History", :count => 1
assert_select ".secondary-actions a", :text => "View Unredacted History", :count => 0
end
def test_show_secondary_actions_to_moderator
session_for(create(:moderator_user))
node = create(:node, :with_history)
get node_path(node)
assert_response :success
assert_select ".secondary-actions a", :text => "View Details", :count => 0
assert_select ".secondary-actions a", :text => "View History", :count => 1
assert_select ".secondary-actions a", :text => "View Unredacted History", :count => 1
end
end

31
test/controllers/relations_controller_test.rb Normal file
View file

@ -0,0 +1,31 @@
require "test_helper"
class RelationsControllerTest < ActionDispatch::IntegrationTest
##
# test all routes which lead to this controller
def test_routes
assert_routing(
{ :path => "/relation/1", :method => :get },
{ :controller => "relations", :action => "show", :id => "1" }
)
end
def test_show
relation = create(:relation)
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
assert_select ".secondary-actions a[href='#{api_relation_path relation}']", :count => 1
assert_select ".secondary-actions a[href='#{relation_history_path relation}']", :count => 1
assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 0
end
def test_show_multiple_versions
relation = create(:relation, :with_history, :version => 2)
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
end
end

14
test/controllers/site_controller_test.rb
View file

@ -89,13 +89,13 @@ class SiteControllerTest < ActionDispatch::IntegrationTest
# Test the index page redirects
def test_index_redirect
get root_path(:node => 123)
assert_redirected_to :controller => :browse, :action => :node, :id => 123
assert_redirected_to node_path(123)
get root_path(:way => 123)
assert_redirected_to :controller => :browse, :action => :way, :id => 123
assert_redirected_to way_path(123)
get root_path(:relation => 123)
assert_redirected_to :controller => :browse, :action => :relation, :id => 123
assert_redirected_to relation_path(123)
get root_path(:note => 123)
assert_redirected_to :controller => :notes, :action => :show, :id => 123
@ -131,16 +131,16 @@ class SiteControllerTest < ActionDispatch::IntegrationTest
assert_redirected_to :controller => :site, :action => :index, :anchor => "map=3/4.8779296875/3.955078125&layers=T"
get permalink_path(:code => "wBz3--", :node => 1)
assert_redirected_to :controller => :browse, :action => :node, :id => 1, :anchor => "map=3/4.8779296875/3.955078125"
assert_redirected_to node_path(1, :anchor => "map=3/4.8779296875/3.955078125")
get permalink_path(:code => "wBz3--", :way => 2)
assert_redirected_to :controller => :browse, :action => :way, :id => 2, :anchor => "map=3/4.8779296875/3.955078125"
assert_redirected_to way_path(2, :anchor => "map=3/4.8779296875/3.955078125")
get permalink_path(:code => "wBz3--", :relation => 3)
assert_redirected_to :controller => :browse, :action => :relation, :id => 3, :anchor => "map=3/4.8779296875/3.955078125"
assert_redirected_to relation_path(3, :anchor => "map=3/4.8779296875/3.955078125")
get permalink_path(:code => "wBz3--", :changeset => 4)
assert_redirected_to changeset_path(:id => 4, :anchor => "map=3/4.8779296875/3.955078125")
assert_redirected_to changeset_path(4, :anchor => "map=3/4.8779296875/3.955078125")
end
# Test the key page

31
test/controllers/ways_controller_test.rb Normal file
View file

@ -0,0 +1,31 @@
require "test_helper"
class WaysControllerTest < ActionDispatch::IntegrationTest
##
# test all routes which lead to this controller
def test_routes
assert_routing(
{ :path => "/way/1", :method => :get },
{ :controller => "ways", :action => "show", :id => "1" }
)
end
def test_show
way = create(:way)
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
assert_select ".secondary-actions a[href='#{api_way_path way}']", :count => 1
assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1
assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 0
end
def test_show_multiple_versions
way = create(:way, :with_history, :version => 2)
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
end
end