X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6af8f8a9e37e92c139779fbb5fb2590ad040993e..6648d3a2a6202566099423472665d3072eb02ae9:/test/controllers/old_way_controller_test.rb?ds=sidebyside

diff --git a/test/controllers/old_way_controller_test.rb b/test/controllers/old_way_controller_test.rb
index 306a48615..1fff79187 100644
--- a/test/controllers/old_way_controller_test.rb
+++ b/test/controllers/old_way_controller_test.rb
@@ -1,9 +1,7 @@
-require 'test_helper'
-require 'old_way_controller'
+require "test_helper"
+require "old_way_controller"
 
 class OldWayControllerTest < ActionController::TestCase
-  api_fixtures
-
   ##
   # test all routes which lead to this controller
   def test_routes
@@ -27,56 +25,76 @@ class OldWayControllerTest < ActionController::TestCase
 
   def test_history_visible
     # check that a visible way is returned properly
-    get :history, :id => ways(:visible_way).way_id
+    get :history, :params => { :id => create(:way, :with_history).id }
     assert_response :success
   end
-  
+
   def test_history_invisible
     # check that an invisible way's history is returned properly
-    get :history, :id => ways(:invisible_way).way_id
+    get :history, :params => { :id => create(:way, :with_history, :deleted).id }
     assert_response :success
   end
-  
+
   def test_history_invalid
     # check chat a non-existent way is not returned
-    get :history, :id => 0
+    get :history, :params => { :id => 0 }
     assert_response :not_found
   end
-  
+
   ##
   # check that we can retrieve versions of a way
   def test_version
-    check_current_version(current_ways(:visible_way).id)
-    check_current_version(current_ways(:used_way).id)
-    check_current_version(current_ways(:way_with_versions).id)
+    way = create(:way, :with_history)
+    used_way = create(:way, :with_history)
+    create(:relation_member, :member => used_way)
+    way_with_versions = create(:way, :with_history, :version => 4)
+
+    create(:way_tag, :way => way)
+    create(:way_tag, :way => used_way)
+    create(:way_tag, :way => way_with_versions)
+    propagate_tags(way, way.old_ways.last)
+    propagate_tags(used_way, used_way.old_ways.last)
+    propagate_tags(way_with_versions, way_with_versions.old_ways.last)
+
+    check_current_version(way.id)
+    check_current_version(used_way.id)
+    check_current_version(way_with_versions.id)
   end
 
   ##
-  # check that returned history is the same as getting all 
+  # check that returned history is the same as getting all
   # versions of a way from the api.
   def test_history_equals_versions
-    check_history_equals_versions(current_ways(:visible_way).id)
-    check_history_equals_versions(current_ways(:used_way).id)
-    check_history_equals_versions(current_ways(:way_with_versions).id)
+    way = create(:way, :with_history)
+    used_way = create(:way, :with_history)
+    create(:relation_member, :member => used_way)
+    way_with_versions = create(:way, :with_history, :version => 4)
+
+    check_history_equals_versions(way.id)
+    check_history_equals_versions(used_way.id)
+    check_history_equals_versions(way_with_versions.id)
   end
 
   ##
   # test the redaction of an old version of a way, while not being
   # authorised.
   def test_redact_way_unauthorised
-    do_redact_way(ways(:way_with_versions_v3),
-                  redactions(:example))
+    way = create(:way, :with_history, :version => 4)
+    way_v3 = way.old_ways.find_by(:version => 3)
+
+    do_redact_way(way_v3, create(:redaction))
     assert_response :unauthorized, "should need to be authenticated to redact."
   end
 
-    ##
-  # test the redaction of an old version of a way, while being 
+  ##
+  # test the redaction of an old version of a way, while being
   # authorised as a normal user.
   def test_redact_way_normal_user
-    basic_authorization(users(:public_user).email, "test")
+    basic_authorization create(:user).email, "test"
+    way = create(:way, :with_history, :version => 4)
+    way_v3 = way.old_ways.find_by(:version => 3)
 
-    do_redact_way(ways(:way_with_versions_v3),
-                  redactions(:example))
+    do_redact_way(way_v3, create(:redaction))
     assert_response :forbidden, "should need to be moderator to redact."
   end
 
@@ -84,107 +102,178 @@ class OldWayControllerTest < ActionController::TestCase
   # test that, even as moderator, the current version of a way
   # can't be redacted.
   def test_redact_way_current_version
-    basic_authorization(users(:moderator_user).email, "test")
+    basic_authorization create(:moderator_user).email, "test"
+    way = create(:way, :with_history, :version => 4)
+    way_latest = way.old_ways.last
 
-    do_redact_way(ways(:way_with_versions_v4),
-                   redactions(:example))
+    do_redact_way(way_latest, create(:redaction))
     assert_response :bad_request, "shouldn't be OK to redact current version as moderator."
-  end    
+  end
 
   ##
-  # test that redacted ways aren't visible, regardless of 
+  # test that redacted ways aren't visible, regardless of
   # authorisation except as moderator...
   def test_version_redacted
-    way = ways(:way_with_redacted_versions_v2)
+    way = create(:way, :with_history, :version => 2)
+    way_v1 = way.old_ways.find_by(:version => 1)
+    way_v1.redact!(create(:redaction))
 
-    get :version, :id => way.way_id, :version => way.version
-    assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
+    get :version, :params => { :id => way_v1.way_id, :version => way_v1.version }
+    assert_response :forbidden, "Redacted way shouldn't be visible via the version API."
 
     # not even to a logged-in user
-    basic_authorization(users(:public_user).email, "test")
-    get :version, :id => way.way_id, :version => way.version
-    assert_response :forbidden, "Redacted node shouldn't be visible via the version API, even when logged in."
+    basic_authorization create(:user).email, "test"
+    get :version, :params => { :id => way_v1.way_id, :version => way_v1.version }
+    assert_response :forbidden, "Redacted way shouldn't be visible via the version API, even when logged in."
   end
 
   ##
-  # test that redacted nodes aren't visible in the history
+  # test that redacted ways aren't visible in the history
   def test_history_redacted
-    way = ways(:way_with_redacted_versions_v2)
+    way = create(:way, :with_history, :version => 2)
+    way_v1 = way.old_ways.find_by(:version => 1)
+    way_v1.redact!(create(:redaction))
 
-    get :history, :id => way.way_id
+    get :history, :params => { :id => way_v1.way_id }
     assert_response :success, "Redaction shouldn't have stopped history working."
-    assert_select "osm way[id='#{way.way_id}'][version='#{way.version}']", 0, "redacted way #{way.way_id} version #{way.version} shouldn't be present in the history."
+    assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 0, "redacted way #{way_v1.way_id} version #{way_v1.version} shouldn't be present in the history."
 
     # not even to a logged-in user
-    basic_authorization(users(:public_user).email, "test")
-    get :version, :id => way.way_id, :version => way.version
-    get :history, :id => way.way_id
+    basic_authorization create(:user).email, "test"
+    get :version, :params => { :id => way_v1.way_id, :version => way_v1.version }
+    get :history, :params => { :id => way_v1.way_id }
     assert_response :success, "Redaction shouldn't have stopped history working."
-    assert_select "osm way[id='#{way.way_id}'][version='#{way.version}']", 0, "redacted node #{way.way_id} version #{way.version} shouldn't be present in the history, even when logged in."
+    assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 0, "redacted node #{way_v1.way_id} version #{way_v1.version} shouldn't be present in the history, even when logged in."
   end
 
   ##
-  # test the redaction of an old version of a way, while being 
+  # test the redaction of an old version of a way, while being
   # authorised as a moderator.
   def test_redact_way_moderator
-    way = ways(:way_with_versions_v3)
-    basic_authorization(users(:moderator_user).email, "test")
+    way = create(:way, :with_history, :version => 4)
+    way_v3 = way.old_ways.find_by(:version => 3)
+    basic_authorization create(:moderator_user).email, "test"
 
-    do_redact_way(way, redactions(:example))
+    do_redact_way(way_v3, create(:redaction))
     assert_response :success, "should be OK to redact old version as moderator."
 
     # check moderator can still see the redacted data, when passing
     # the appropriate flag
-    get :version, :id => way.way_id, :version => way.version
+    get :version, :params => { :id => way_v3.way_id, :version => way_v3.version }
     assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed."
-    get :version, :id => way.way_id, :version => way.version, :show_redactions => 'true'
+    get :version, :params => { :id => way_v3.way_id, :version => way_v3.version, :show_redactions => "true" }
     assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
-    
+
     # and when accessed via history
-    get :history, :id => way.way_id
+    get :history, :params => { :id => way_v3.way_id }
     assert_response :success, "Redaction shouldn't have stopped history working."
-    assert_select "osm way[id='#{way.way_id}'][version='#{way.version}']", 0, "way #{way.way_id} version #{way.version} should not be present in the history for moderators when not passing flag."
-    get :history, :id => way.way_id, :show_redactions => 'true'
+    assert_select "osm way[id='#{way_v3.way_id}'][version='#{way_v3.version}']", 0, "way #{way_v3.way_id} version #{way_v3.version} should not be present in the history for moderators when not passing flag."
+    get :history, :params => { :id => way_v3.way_id, :show_redactions => "true" }
     assert_response :success, "Redaction shouldn't have stopped history working."
-    assert_select "osm way[id='#{way.way_id}'][version='#{way.version}']", 1, "way #{way.way_id} version #{way.version} should still be present in the history for moderators when passing flag."
+    assert_select "osm way[id='#{way_v3.way_id}'][version='#{way_v3.version}']", 1, "way #{way_v3.way_id} version #{way_v3.version} should still be present in the history for moderators when passing flag."
   end
 
   # testing that if the moderator drops auth, he can't see the
   # redacted stuff any more.
   def test_redact_way_is_redacted
-    way = ways(:way_with_versions_v3)
-    basic_authorization(users(:moderator_user).email, "test")
+    way = create(:way, :with_history, :version => 4)
+    way_v3 = way.old_ways.find_by(:version => 3)
+    basic_authorization create(:moderator_user).email, "test"
 
-    do_redact_way(way, redactions(:example))
+    do_redact_way(way_v3, create(:redaction))
     assert_response :success, "should be OK to redact old version as moderator."
 
     # re-auth as non-moderator
-    basic_authorization(users(:public_user).email, "test")
+    basic_authorization create(:user).email, "test"
 
     # check can't see the redacted data
-    get :version, :id => way.way_id, :version => way.version
+    get :version, :params => { :id => way_v3.way_id, :version => way_v3.version }
     assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
-    
+
     # and when accessed via history
-    get :history, :id => way.way_id
+    get :history, :params => { :id => way_v3.way_id }
     assert_response :success, "Redaction shouldn't have stopped history working."
-    assert_select "osm way[id='#{way.way_id}'][version='#{way.version}']", 0, "redacted way #{way.way_id} version #{way.version} shouldn't be present in the history."
+    assert_select "osm way[id='#{way_v3.way_id}'][version='#{way_v3.version}']", 0, "redacted way #{way_v3.way_id} version #{way_v3.version} shouldn't be present in the history."
+  end
+
+  ##
+  # test the unredaction of an old version of a way, while not being
+  # authorised.
+  def test_unredact_way_unauthorised
+    way = create(:way, :with_history, :version => 2)
+    way_v1 = way.old_ways.find_by(:version => 1)
+    way_v1.redact!(create(:redaction))
+
+    post :redact, :params => { :id => way_v1.way_id, :version => way_v1.version }
+    assert_response :unauthorized, "should need to be authenticated to unredact."
   end
 
+  ##
+  # test the unredaction of an old version of a way, while being
+  # authorised as a normal user.
+  def test_unredact_way_normal_user
+    way = create(:way, :with_history, :version => 2)
+    way_v1 = way.old_ways.find_by(:version => 1)
+    way_v1.redact!(create(:redaction))
+
+    basic_authorization create(:user).email, "test"
+
+    post :redact, :params => { :id => way_v1.way_id, :version => way_v1.version }
+    assert_response :forbidden, "should need to be moderator to unredact."
+  end
+
+  ##
+  # test the unredaction of an old version of a way, while being
+  # authorised as a moderator.
+  def test_unredact_way_moderator
+    moderator_user = create(:moderator_user)
+    way = create(:way, :with_history, :version => 2)
+    way_v1 = way.old_ways.find_by(:version => 1)
+    way_v1.redact!(create(:redaction))
+
+    basic_authorization moderator_user.email, "test"
+
+    post :redact, :params => { :id => way_v1.way_id, :version => way_v1.version }
+    assert_response :success, "should be OK to unredact old version as moderator."
+
+    # check moderator can still see the unredacted data, without passing
+    # the appropriate flag
+    get :version, :params => { :id => way_v1.way_id, :version => way_v1.version }
+    assert_response :success, "After unredaction, node should not be gone for moderator."
+
+    # and when accessed via history
+    get :history, :params => { :id => way_v1.way_id }
+    assert_response :success, "Unredaction shouldn't have stopped history working."
+    assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 1, "way #{way_v1.way_id} version #{way_v1.version} should still be present in the history for moderators."
+
+    basic_authorization create(:user).email, "test"
+
+    # check normal user can now see the unredacted data
+    get :version, :params => { :id => way_v1.way_id, :version => way_v1.version }
+    assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
+
+    # and when accessed via history
+    get :history, :params => { :id => way_v1.way_id }
+    assert_response :success, "Redaction shouldn't have stopped history working."
+    assert_select "osm way[id='#{way_v1.way_id}'][version='#{way_v1.version}']", 1, "way #{way_v1.way_id} version #{way_v1.version} should still be present in the history for normal users."
+  end
+
+  private
+
   ##
   # check that the current version of a way is equivalent to the
   # version which we're getting from the versions call.
   def check_current_version(way_id)
     # get the current version
     current_way = with_controller(WayController.new) do
-      get :read, :id => way_id
+      get :read, :params => { :id => way_id }
       assert_response :success, "can't get current way #{way_id}"
       Way.from_xml(@response.body)
     end
     assert_not_nil current_way, "getting way #{way_id} returned nil"
 
     # get the "old" version of the way from the version method
-    get :version, :id => way_id, :version => current_way.version
+    get :version, :params => { :id => way_id, :version => current_way.version }
     assert_response :success, "can't get old way #{way_id}, v#{current_way.version}"
     old_way = Way.from_xml(@response.body)
 
@@ -196,7 +285,7 @@ class OldWayControllerTest < ActionController::TestCase
   # look at all the versions of the way in the history and get each version from
   # the versions call. check that they're the same.
   def check_history_equals_versions(way_id)
-    get :history, :id => way_id
+    get :history, :params => { :id => way_id }
     assert_response :success, "can't get way #{way_id} from API"
     history_doc = XML::Parser.string(@response.body).parse
     assert_not_nil history_doc, "parsing way #{way_id} history failed"
@@ -205,21 +294,26 @@ class OldWayControllerTest < ActionController::TestCase
       history_way = Way.from_xml_node(way_doc)
       assert_not_nil history_way, "parsing way #{way_id} version failed"
 
-      get :version, :id => way_id, :version => history_way.version
+      get :version, :params => { :id => way_id, :version => history_way.version }
       assert_response :success, "couldn't get way #{way_id}, v#{history_way.version}"
       version_way = Way.from_xml(@response.body)
       assert_not_nil version_way, "failed to parse #{way_id}, v#{history_way.version}"
-      
+
       assert_ways_are_equal history_way, version_way
     end
   end
 
   def do_redact_way(way, redaction)
-    get :version, :id => way.way_id, :version => way.version
-    assert_response :success, "should be able to get version #{way.version} of node #{way.way_id}."
-    
+    get :version, :params => { :id => way.way_id, :version => way.version }
+    assert_response :success, "should be able to get version #{way.version} of way #{way.way_id}."
+
     # now redact it
-    post :redact, :id => way.way_id, :version => way.version, :redaction => redaction.id
+    post :redact, :params => { :id => way.way_id, :version => way.version, :redaction => redaction.id }
   end
 
+  def propagate_tags(way, old_way)
+    way.tags.each do |k, v|
+      create(:old_way_tag, :old_way => old_way, :k => k, :v => v)
+    end
+  end
 end