From 5d6a47929c0ee3a3580ccf155cd25f57674035d0 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 8 Dec 2013 11:18:55 +0000 Subject: [PATCH] Don't show lat/lon for a deleted node, in case it is redacted Fixes #642 --- app/views/browse/_common_details.html.erb | 2 +- test/functional/browse_controller_test.rb | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index 054ffbd79..971e467aa 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -23,7 +23,7 @@ #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %> -<% if @type == "node" %> +<% if @type == "node" and common_details.visible? %>
<%= t 'browse.location' %> <%= link_to(content_tag(:span, number_with_delimiter(common_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(common_details.lon), :class => "longitude"), {:controller => 'site', :action => 'index', :lat => h(common_details.lat), :lon => h(common_details.lon), :zoom => "18"}) %> diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb index f1445d957..82a039242 100644 --- a/test/functional/browse_controller_test.rb +++ b/test/functional/browse_controller_test.rb @@ -85,16 +85,30 @@ class BrowseControllerTest < ActionController::TestCase # 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 + get :node, :id => current_nodes(:redacted_node).id + 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_redacted_node_history get :node_history, :id => nodes(:redacted_node_redacted_version).node_id assert_response :success - assert_template 'browse/history' + assert_template "browse/history" # there are 2 revisions of the redacted node, but only one # should be showing details here. assert_select ".browse-section", 2 assert_select ".browse-section.browse-redacted", 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_redacted_way_history -- 2.39.5