Merge remote-tracking branch 'upstream/pull/3710'

diff --git a/app/views/browse/feature.html.erb b/app/views/browse/feature.html.erb
index c5c26330e46dbac17cb071ea6c96a9f218cd0f22..86b9020a209e7b7823bb92361c7d63f666e8d644 100644 (file)
--- a/app/views/browse/feature.html.erb
+++ b/app/views/browse/feature.html.erb
@@ -5,7 +5,9 @@
 <%= render :partial => @type, :object => @feature %>
 
 <div class='secondary-actions'>
-  <%= link_to(t("browse.download_xml"), :controller => "api/#{@type.pluralize}", :action => :show) %>
-  &middot;
+  <% if @feature.visible? %>
+    <%= link_to(t("browse.download_xml"), :controller => "api/#{@type.pluralize}", :action => :show) %>
+    &middot;
+  <% end %>
   <%= link_to(t("browse.view_history"), :action => "#{@type}_history") %>
 </div>

diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb
index 7ad16dcd982ee8020a583c3cbcf5bc97414a0057..cde9403d00bdec89b56e3cb069f4f8ded7766cc3 100644 (file)
--- a/test/controllers/browse_controller_test.rb
+++ b/test/controllers/browse_controller_test.rb
@@ -63,7 +63,15 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
   end
 
   def test_read_node
-    browse_check :node_path, create(:node).id, "browse/feature"
+    node = create :node
+    browse_check :node_path, node.id, "browse/feature"
+    assert_select "a[href='#{api_node_path node}']", :count => 1
+  end
+
+  def test_read_deleted_node
+    node = create :node, :visible => false
+    browse_check :node_path, node.id, "browse/feature"
+    assert_select "a[href='#{api_node_path node}']", :count => 0
   end
 
   def test_read_node_history