X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/71cb2c50fcaf29e2b933fc981e40a00223d94d34..0a10ac2e9be4246987951eea86ae201f14c65fc1:/test/controllers/old_nodes_controller_test.rb diff --git a/test/controllers/old_nodes_controller_test.rb b/test/controllers/old_nodes_controller_test.rb index 3f2958bd3..a1232be76 100644 --- a/test/controllers/old_nodes_controller_test.rb +++ b/test/controllers/old_nodes_controller_test.rb @@ -19,6 +19,7 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest end assert_select ".secondary-actions a[href='#{node_version_path node, 1}']", :count => 1 assert_select ".secondary-actions a[href='#{node_path node}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_node_path node, 1, :params => { :show_redactions => true }}']", :count => 0 assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1 end @@ -49,19 +50,69 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 1 end - def test_redacted - node = create(:node, :with_history, :deleted, :version => 2) - node_v1 = node.old_nodes.find_by(:version => 1) - node_v1.redact!(create(:redaction)) + test "show unrevealed redacted versions to anonymous users" do + node = create_redacted_node get old_node_path(node, 1) assert_response :success assert_template "old_nodes/show" assert_template :layout => "map" + assert_select "td", :text => "TOP SECRET", :count => 0 assert_select ".secondary-actions a[href='#{node_path node}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_node_path node, 1, :params => { :show_redactions => true }}']", :count => 0 assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 0 assert_select ".secondary-actions a[href='#{node_version_path node, 1}']", :count => 0 end + test "show unrevealed redacted versions to regular users" do + session_for(create(:user)) + node = create_redacted_node + get old_node_path(node, 1) + assert_response :success + assert_template "old_nodes/show" + assert_template :layout => "map" + assert_select "td", :text => "TOP SECRET", :count => 0 + assert_select ".secondary-actions a[href='#{node_path node}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_node_path node, 1, :params => { :show_redactions => true }}']", :count => 0 + assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 0 + assert_select ".secondary-actions a[href='#{node_version_path node, 1}']", :count => 0 + end + + test "show unrevealed redacted versions to moderators" do + session_for(create(:moderator_user)) + node = create_redacted_node + get old_node_path(node, 1) + assert_response :success + assert_template "old_nodes/show" + assert_template :layout => "map" + assert_select "td", :text => "TOP SECRET", :count => 0 + assert_select ".secondary-actions a[href='#{node_path node}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_node_path node, 1, :params => { :show_redactions => true }}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 0 + assert_select ".secondary-actions a[href='#{node_version_path node, 1}']", :count => 0 + end + + test "don't reveal redacted versions to anonymous users" do + node = create_redacted_node + get old_node_path(node, 1, :params => { :show_redactions => true }) + assert_response :redirect + end + + test "don't reveal redacted versions to regular users" do + session_for(create(:user)) + node = create_redacted_node + get old_node_path(node, 1, :params => { :show_redactions => true }) + assert_response :redirect + end + + test "reveal redacted versions to moderators" do + session_for(create(:moderator_user)) + node = create_redacted_node + get old_node_path(node, 1, :params => { :show_redactions => true }) + assert_response :success + assert_select "td", :text => "TOP SECRET", :count => 1 + assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 1 + end + def test_not_found get old_node_path(0, 0) assert_response :not_found @@ -69,4 +120,14 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest assert_template :layout => "map" assert_select "#sidebar_content", /node #0 version 0 could not be found/ end + + private + + def create_redacted_node + create(:node, :with_history, :version => 2) do |node| + node_v1 = node.old_nodes.find_by(:version => 1) + create(:old_node_tag, :old_node => node_v1, :k => "name", :v => "TOP SECRET") + node_v1.redact!(create(:redaction)) + end + end end