X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ee4c34172f0a0145344525962cc5411a7f260ff5..81b431ac1117aa2d684834b8561d8df1e717dab4:/test/controllers/old_relations_controller_test.rb

diff --git a/test/controllers/old_relations_controller_test.rb b/test/controllers/old_relations_controller_test.rb
index 534a1304c..6eb6db9dd 100644
--- a/test/controllers/old_relations_controller_test.rb
+++ b/test/controllers/old_relations_controller_test.rb
@@ -19,6 +19,7 @@ class OldRelationsControllerTest < ActionDispatch::IntegrationTest
     end
     assert_select ".secondary-actions a[href='#{relation_version_path relation, 1}']", :count => 1
     assert_select ".secondary-actions a[href='#{relation_path relation}']", :count => 1
+    assert_select ".secondary-actions a[href='#{old_relation_path relation, 1, :params => { :show_redactions => true }}']", :count => 0
     assert_select ".secondary-actions a[href='#{relation_history_path relation}']", :count => 1
   end
 
@@ -58,35 +59,67 @@ class OldRelationsControllerTest < ActionDispatch::IntegrationTest
     assert_template :layout => "map"
   end
 
-  def test_redacted
+  test "show unrevealed redacted versions to anonymous users" do
     relation = create_redacted_relation
     get old_relation_path(relation, 1)
     assert_response :success
     assert_template "old_relations/show"
     assert_template :layout => "map"
+    assert_select "td", :text => "TOP SECRET", :count => 0
     assert_select ".secondary-actions a[href='#{relation_path relation}']", :count => 1
+    assert_select ".secondary-actions a[href='#{old_relation_path relation, 1, :params => { :show_redactions => true }}']", :count => 0
     assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 0
     assert_select ".secondary-actions a[href='#{relation_version_path relation, 1}']", :count => 0
   end
 
-  test "don't show redacted versions to anonymous users" do
+  test "show unrevealed redacted versions to regular users" do
+    session_for(create(:user))
+    relation = create_redacted_relation
+    get old_relation_path(relation, 1)
+    assert_response :success
+    assert_template "old_relations/show"
+    assert_template :layout => "map"
+    assert_select "td", :text => "TOP SECRET", :count => 0
+    assert_select ".secondary-actions a[href='#{relation_path relation}']", :count => 1
+    assert_select ".secondary-actions a[href='#{old_relation_path relation, 1, :params => { :show_redactions => true }}']", :count => 0
+    assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 0
+    assert_select ".secondary-actions a[href='#{relation_version_path relation, 1}']", :count => 0
+  end
+
+  test "show unrevealed redacted versions to moderators" do
+    session_for(create(:moderator_user))
+    relation = create_redacted_relation
+    get old_relation_path(relation, 1)
+    assert_response :success
+    assert_template "old_relations/show"
+    assert_template :layout => "map"
+    assert_select "td", :text => "TOP SECRET", :count => 0
+    assert_select ".secondary-actions a[href='#{relation_path relation}']", :count => 1
+    assert_select ".secondary-actions a[href='#{old_relation_path relation, 1, :params => { :show_redactions => true }}']", :count => 1
+    assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 0
+    assert_select ".secondary-actions a[href='#{relation_version_path relation, 1}']", :count => 0
+  end
+
+  test "don't reveal redacted versions to anonymous users" do
     relation = create_redacted_relation
     get old_relation_path(relation, 1, :params => { :show_redactions => true })
     assert_response :redirect
   end
 
-  test "don't show redacted versions to regular users" do
+  test "don't reveal redacted versions to regular users" do
     session_for(create(:user))
     relation = create_redacted_relation
     get old_relation_path(relation, 1, :params => { :show_redactions => true })
     assert_response :redirect
   end
 
-  test "show redacted versions to moderators" do
+  test "reveal redacted versions to moderators" do
     session_for(create(:moderator_user))
     relation = create_redacted_relation
     get old_relation_path(relation, 1, :params => { :show_redactions => true })
     assert_response :success
+    assert_select "td", :text => "TOP SECRET", :count => 1
+    assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 1
   end
 
   def test_not_found
@@ -100,8 +133,9 @@ class OldRelationsControllerTest < ActionDispatch::IntegrationTest
   private
 
   def create_redacted_relation
-    create(:relation, :with_history, :deleted, :version => 2) do |relation|
+    create(:relation, :with_history, :version => 2) do |relation|
       relation_v1 = relation.old_relations.find_by(:version => 1)
+      create(:old_relation_tag, :old_relation => relation_v1, :k => "name", :v => "TOP SECRET")
       relation_v1.redact!(create(:redaction))
     end
   end