From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 10 May 2017 12:38:10 +0000 (+0100)
Subject: Update old_ways_controller tests to use factories.
X-Git-Tag: live~4034^2~1
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/3fa3658efa4c528c499e72abf7464748cc6c7fb8

Update old_ways_controller tests to use factories.
---

diff --git a/test/controllers/old_way_controller_test.rb b/test/controllers/old_way_controller_test.rb
index 9e779abb5..eae9d8a2e 100644
--- a/test/controllers/old_way_controller_test.rb
+++ b/test/controllers/old_way_controller_test.rb
@@ -27,13 +27,13 @@ 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, :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, :id => create(:way, :with_history, :deleted).id
     assert_response :success
   end
 
@@ -46,33 +46,45 @@ class OldWayControllerTest < ActionController::TestCase
   ##
   # check that we can retrieve versions of a way
   def test_version
-    create(:way_tag, :way => current_ways(:visible_way))
-    create(:way_tag, :way => current_ways(:used_way))
-    create(:way_tag, :way => current_ways(:way_with_versions))
-    propagate_tags(current_ways(:visible_way), ways(:visible_way))
-    propagate_tags(current_ways(:used_way), ways(:used_way))
-    propagate_tags(current_ways(:way_with_versions), ways(:way_with_versions_v4))
-
-    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
   # 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),
-                  create(:redaction))
+    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
 
@@ -81,9 +93,10 @@ class OldWayControllerTest < ActionController::TestCase
   # authorised as a normal user.
   def test_redact_way_normal_user
     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),
-                  create(:redaction))
+    do_redact_way(way_v3, create(:redaction))
     assert_response :forbidden, "should need to be moderator to redact."
   end
 
@@ -92,9 +105,10 @@ class OldWayControllerTest < ActionController::TestCase
   # can't be redacted.
   def test_redact_way_current_version
     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),
-                  create(:redaction))
+    do_redact_way(way_latest, create(:redaction))
     assert_response :bad_request, "shouldn't be OK to redact current version as moderator."
   end
 
@@ -102,89 +116,97 @@ class OldWayControllerTest < ActionController::TestCase
   # 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, :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(create(: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."
+    get :version, :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, :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(create(:user).email, "test")
-    get :version, :id => way.way_id, :version => way.version
-    get :history, :id => way.way_id
+    get :version, :id => way_v1.way_id, :version => way_v1.version
+    get :history, :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
   # authorised as a moderator.
   def test_redact_way_moderator
-    way = ways(:way_with_versions_v3)
+    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, create(:redaction))
+    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, :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, :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, :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, :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)
+    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, create(:redaction))
+    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(create(:user).email, "test")
 
     # check can't see the redacted data
-    get :version, :id => way.way_id, :version => way.version
+    get :version, :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, :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 = ways(:way_with_redacted_versions_v3)
+    way = create(:way, :with_history, :version => 2)
+    way_v1 = way.old_ways.find_by(:version => 1)
+    way_v1.redact!(create(:redaction))
 
-    post :redact, :id => way.way_id, :version => way.version
+    post :redact, :id => way_v1.way_id, :version => way_v1.version
     assert_response :unauthorized, "should need to be authenticated to unredact."
   end
 
@@ -192,10 +214,13 @@ class OldWayControllerTest < ActionController::TestCase
   # test the unredaction of an old version of a way, while being
   # authorised as a normal user.
   def test_unredact_way_normal_user
-    way = ways(:way_with_redacted_versions_v3)
+    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, :id => way.way_id, :version => way.version
+    post :redact, :id => way_v1.way_id, :version => way_v1.version
     assert_response :forbidden, "should need to be moderator to unredact."
   end
 
@@ -204,32 +229,35 @@ class OldWayControllerTest < ActionController::TestCase
   # authorised as a moderator.
   def test_unredact_way_moderator
     moderator_user = create(:moderator_user)
-    way = ways(:way_with_redacted_versions_v3)
+    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, :id => way.way_id, :version => way.version
+    post :redact, :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 redacted data, without passing
+    # check moderator can still see the unredacted data, without passing
     # the appropriate flag
-    get :version, :id => way.way_id, :version => way.version
-    assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
+    get :version, :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, :id => way.way_id
-    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."
+    get :history, :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(users(:normal_user).email, "test")
+    basic_authorization(create(:user).email, "test")
 
-    # check normal user can now see the redacted data
-    get :version, :id => way.way_id, :version => way.version
+    # check normal user can now see the unredacted data
+    get :version, :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, :id => way.way_id
+    get :history, :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}']", 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_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
diff --git a/test/factories/way.rb b/test/factories/way.rb
index 89409e807..1c31de3d0 100644
--- a/test/factories/way.rb
+++ b/test/factories/way.rb
@@ -10,6 +10,21 @@ FactoryGirl.define do
       visible false
     end
 
+    trait :with_history do
+      after(:create) do |way, _evaluator|
+        (1..way.version).each do |n|
+          create(:old_way, :way_id => way.id, :version => n, :changeset => way.changeset)
+        end
+
+        # For deleted ways, make sure the most recent old_way is also deleted.
+        if way.visible == false
+          latest = way.old_ways.find_by(:version => way.version)
+          latest.visible = false
+          latest.save
+        end
+      end
+    end
+
     factory :way_with_nodes do
       transient do
         nodes_count 1