X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d951e4f82e50c48b6783493d735d90d99ed41637..ee4c34172f0a0145344525962cc5411a7f260ff5:/test/controllers/old_ways_controller_test.rb

diff --git a/test/controllers/old_ways_controller_test.rb b/test/controllers/old_ways_controller_test.rb
index 3e1113475..b9632ed77 100644
--- a/test/controllers/old_ways_controller_test.rb
+++ b/test/controllers/old_ways_controller_test.rb
@@ -18,6 +18,7 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest
       assert_select "a[href='#{old_way_path way, 1}']", :count => 0
     end
     assert_select ".secondary-actions a[href='#{way_version_path way, 1}']", :count => 1
+    assert_select ".secondary-actions a[href='#{way_path way}']", :count => 1
     assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1
   end
 
@@ -31,6 +32,7 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest
       assert_select "a[href='#{old_way_path way, 1}']", :count => 0
     end
     assert_select ".secondary-actions a[href='#{way_version_path way, 1}']", :count => 1
+    assert_select ".secondary-actions a[href='#{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, 2}']", :count => 1
 
@@ -42,6 +44,7 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest
       assert_select "a[href='#{old_way_path way, 2}']", :count => 0
     end
     assert_select ".secondary-actions a[href='#{way_version_path way, 2}']", :count => 1
+    assert_select ".secondary-actions a[href='#{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 => 1
   end
@@ -61,17 +64,36 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest
   end
 
   def test_redacted
-    way = create(:way, :with_history, :deleted, :version => 2)
-    way_v1 = way.old_ways.find_by(:version => 1)
-    way_v1.redact!(create(:redaction))
+    way = create_redacted_way
     get old_way_path(way, 1)
     assert_response :success
     assert_template "old_ways/show"
     assert_template :layout => "map"
+    assert_select ".secondary-actions a[href='#{way_path way}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 0
     assert_select ".secondary-actions a[href='#{way_version_path way, 1}']", :count => 0
   end
 
+  test "don't show redacted versions to anonymous users" do
+    way = create_redacted_way
+    get old_way_path(way, 1, :params => { :show_redactions => true })
+    assert_response :redirect
+  end
+
+  test "don't show redacted versions to regular users" do
+    session_for(create(:user))
+    way = create_redacted_way
+    get old_way_path(way, 1, :params => { :show_redactions => true })
+    assert_response :redirect
+  end
+
+  test "show redacted versions to moderators" do
+    session_for(create(:moderator_user))
+    way = create_redacted_way
+    get old_way_path(way, 1, :params => { :show_redactions => true })
+    assert_response :success
+  end
+
   def test_not_found
     get old_way_path(0, 0)
     assert_response :not_found
@@ -79,4 +101,13 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest
     assert_template :layout => "map"
     assert_select "#sidebar_content", /way #0 version 0 could not be found/
   end
+
+  private
+
+  def create_redacted_way
+    create(:way, :with_history, :deleted, :version => 2) do |way|
+      way_v1 = way.old_ways.find_by(:version => 1)
+      way_v1.redact!(create(:redaction))
+    end
+  end
 end