Localisation updates from https://translatewiki.net.

[rails.git] / test / controllers / old_node_controller_test.rb

diff --git a/test/controllers/old_node_controller_test.rb b/test/controllers/old_node_controller_test.rb
index 1b131b3404e820ec7d1c10f22545804b919e9f88..babb9df134a735135a561ccafcc03c8ea419ae19 100644 (file)
--- a/test/controllers/old_node_controller_test.rb
+++ b/test/controllers/old_node_controller_test.rb
@@ -1,5 +1,5 @@
-require 'test_helper'
-require 'old_node_controller'
+require "test_helper"
+require "old_node_controller"

 
 class OldNodeControllerTest < ActionController::TestCase
   api_fixtures
 
 class OldNodeControllerTest < ActionController::TestCase
   api_fixtures


@@ -31,7 +31,7 @@ class OldNodeControllerTest < ActionController::TestCase
   # matching versions of the object.
   #
   ##
   # matching versions of the object.
   #
   ##

-  # FIXME Move this test to being an integration test since it spans multiple controllers
+  # FIXME: Move this test to being an integration test since it spans multiple controllers

   def test_version
     ## First try this with a non-public user
     basic_authorization(users(:normal_user).email, "test")
   def test_version
     ## First try this with a non-public user
     basic_authorization(users(:normal_user).email, "test")


@@ -46,38 +46,38 @@ class OldNodeControllerTest < ActionController::TestCase
     versions = {}
 
     # save a version for later checking
     versions = {}
 
     # save a version for later checking

-    versions[xml_node['version']] = xml_doc.to_s
+    versions[xml_node["version"]] = xml_doc.to_s

 
     # randomly move the node about
     20.times do
       # move the node somewhere else
 
     # randomly move the node about
     20.times do
       # move the node somewhere else

-      xml_node['lat'] = precision(rand * 180 -  90).to_s
-      xml_node['lon'] = precision(rand * 360 - 180).to_s
+      xml_node["lat"] = precision(rand * 180 - 90).to_s
+      xml_node["lon"] = precision(rand * 360 - 180).to_s

       with_controller(NodeController.new) do
         content xml_doc
         put :update, :id => nodeid
         assert_response :forbidden, "Should have rejected node update"
       with_controller(NodeController.new) do
         content xml_doc
         put :update, :id => nodeid
         assert_response :forbidden, "Should have rejected node update"

-        xml_node['version'] = @response.body.to_s
+        xml_node["version"] = @response.body.to_s

       end
       # save a version for later checking
       end
       # save a version for later checking

-      versions[xml_node['version']] = xml_doc.to_s
+      versions[xml_node["version"]] = xml_doc.to_s

     end
 
     # add a bunch of random tags
     30.times do
       xml_tag = XML::Node.new("tag")
     end
 
     # add a bunch of random tags
     30.times do
       xml_tag = XML::Node.new("tag")

-      xml_tag['k'] = random_string
-      xml_tag['v'] = random_string
+      xml_tag["k"] = random_string
+      xml_tag["v"] = random_string

       xml_node << xml_tag
       with_controller(NodeController.new) do
         content xml_doc
         put :update, :id => nodeid
         assert_response :forbidden,
                         "should have rejected node #{nodeid} (#{@response.body}) with forbidden"
       xml_node << xml_tag
       with_controller(NodeController.new) do
         content xml_doc
         put :update, :id => nodeid
         assert_response :forbidden,
                         "should have rejected node #{nodeid} (#{@response.body}) with forbidden"

-        xml_node['version'] = @response.body.to_s
+        xml_node["version"] = @response.body.to_s

       end
       # save a version for later checking
       end
       # save a version for later checking

-      versions[xml_node['version']] = xml_doc.to_s
+      versions[xml_node["version"]] = xml_doc.to_s

     end
 
     # probably should check that they didn't get written to the database
     end
 
     # probably should check that they didn't get written to the database


@@ -86,47 +86,51 @@ class OldNodeControllerTest < ActionController::TestCase
     basic_authorization(users(:public_user).email, "test")
 
     # setup a simple XML node
     basic_authorization(users(:public_user).email, "test")
 
     # setup a simple XML node

+    create_list(:node_tag, 2, :node => current_nodes(:node_with_versions))

     xml_doc = current_nodes(:node_with_versions).to_xml
     xml_node = xml_doc.find("//osm/node").first
     nodeid = current_nodes(:node_with_versions).id
 
     xml_doc = current_nodes(:node_with_versions).to_xml
     xml_node = xml_doc.find("//osm/node").first
     nodeid = current_nodes(:node_with_versions).id
 

+    # Ensure that the current tags are propagated to the history too
+    propagate_tags(current_nodes(:node_with_versions), nodes(:node_with_versions_v4))
+

     # keep a hash of the versions => string, as we'll need something
     # to test against later
     versions = {}
 
     # save a version for later checking
     # keep a hash of the versions => string, as we'll need something
     # to test against later
     versions = {}
 
     # save a version for later checking

-    versions[xml_node['version']] = xml_doc.to_s
+    versions[xml_node["version"]] = xml_doc.to_s

 
     # randomly move the node about
     20.times do
       # move the node somewhere else
 
     # randomly move the node about
     20.times do
       # move the node somewhere else

-      xml_node['lat'] = precision(rand * 180 -  90).to_s
-      xml_node['lon'] = precision(rand * 360 - 180).to_s
+      xml_node["lat"] = precision(rand * 180 - 90).to_s
+      xml_node["lon"] = precision(rand * 360 - 180).to_s

       with_controller(NodeController.new) do
         content xml_doc
         put :update, :id => nodeid
         assert_response :success
       with_controller(NodeController.new) do
         content xml_doc
         put :update, :id => nodeid
         assert_response :success

-        xml_node['version'] = @response.body.to_s
+        xml_node["version"] = @response.body.to_s

       end
       # save a version for later checking
       end
       # save a version for later checking

-      versions[xml_node['version']] = xml_doc.to_s
+      versions[xml_node["version"]] = xml_doc.to_s

     end
 
     # add a bunch of random tags
     30.times do
       xml_tag = XML::Node.new("tag")
     end
 
     # add a bunch of random tags
     30.times do
       xml_tag = XML::Node.new("tag")

-      xml_tag['k'] = random_string
-      xml_tag['v'] = random_string
+      xml_tag["k"] = random_string
+      xml_tag["v"] = random_string

       xml_node << xml_tag
       with_controller(NodeController.new) do
         content xml_doc
         put :update, :id => nodeid
         assert_response :success,
                         "couldn't update node #{nodeid} (#{@response.body})"
       xml_node << xml_tag
       with_controller(NodeController.new) do
         content xml_doc
         put :update, :id => nodeid
         assert_response :success,
                         "couldn't update node #{nodeid} (#{@response.body})"

-        xml_node['version'] = @response.body.to_s
+        xml_node["version"] = @response.body.to_s

       end
       # save a version for later checking
       end
       # save a version for later checking

-      versions[xml_node['version']] = xml_doc.to_s
+      versions[xml_node["version"]] = xml_doc.to_s

     end
 
     # check all the versions
     end
 
     # check all the versions


@@ -147,7 +151,7 @@ class OldNodeControllerTest < ActionController::TestCase
     check_not_found_id_version(70000, 312344)
     check_not_found_id_version(-1, -13)
     check_not_found_id_version(nodes(:visible_node).id, 24354)
     check_not_found_id_version(70000, 312344)
     check_not_found_id_version(-1, -13)
     check_not_found_id_version(nodes(:visible_node).id, 24354)

-    check_not_found_id_version(24356,   nodes(:visible_node).version)
+    check_not_found_id_version(24356, nodes(:visible_node).version)

   end
 
   def check_not_found_id_version(id, version)
   end
 
   def check_not_found_id_version(id, version)


@@ -161,6 +165,17 @@ class OldNodeControllerTest < ActionController::TestCase
   # Test that getting the current version is identical to picking
   # that version with the version URI call.
   def test_current_version
   # Test that getting the current version is identical to picking
   # that version with the version URI call.
   def test_current_version

+    create(:node_tag, :node => current_nodes(:visible_node))
+    create(:node_tag, :node => current_nodes(:used_node_1))
+    create(:node_tag, :node => current_nodes(:used_node_2))
+    create(:node_tag, :node => current_nodes(:node_used_by_relationship))
+    create(:node_tag, :node => current_nodes(:node_with_versions))
+    propagate_tags(current_nodes(:visible_node), nodes(:visible_node))
+    propagate_tags(current_nodes(:used_node_1), nodes(:used_node_1))
+    propagate_tags(current_nodes(:used_node_2), nodes(:used_node_2))
+    propagate_tags(current_nodes(:node_used_by_relationship), nodes(:node_used_by_relationship))
+    propagate_tags(current_nodes(:node_with_versions), nodes(:node_with_versions_v4))
+

     check_current_version(current_nodes(:visible_node))
     check_current_version(current_nodes(:used_node_1))
     check_current_version(current_nodes(:used_node_2))
     check_current_version(current_nodes(:visible_node))
     check_current_version(current_nodes(:used_node_1))
     check_current_version(current_nodes(:used_node_2))


@@ -173,7 +188,7 @@ class OldNodeControllerTest < ActionController::TestCase
   # authorised.
   def test_redact_node_unauthorised
     do_redact_node(nodes(:node_with_versions_v3),
   # authorised.
   def test_redact_node_unauthorised
     do_redact_node(nodes(:node_with_versions_v3),

-                   redactions(:example))
+                   create(:redaction))

     assert_response :unauthorized, "should need to be authenticated to redact."
   end
 
     assert_response :unauthorized, "should need to be authenticated to redact."
   end
 


@@ -181,10 +196,10 @@ class OldNodeControllerTest < ActionController::TestCase
   # test the redaction of an old version of a node, while being
   # authorised as a normal user.
   def test_redact_node_normal_user
   # test the redaction of an old version of a node, while being
   # authorised as a normal user.
   def test_redact_node_normal_user

-    basic_authorization(users(:public_user).email, "test")
+    basic_authorization(create(:user).email, "test")

 
     do_redact_node(nodes(:node_with_versions_v3),
 
     do_redact_node(nodes(:node_with_versions_v3),

-                   redactions(:example))
+                   create(:redaction))

     assert_response :forbidden, "should need to be moderator to redact."
   end
 
     assert_response :forbidden, "should need to be moderator to redact."
   end
 


@@ -192,10 +207,10 @@ class OldNodeControllerTest < ActionController::TestCase
   # test that, even as moderator, the current version of a node
   # can't be redacted.
   def test_redact_node_current_version
   # test that, even as moderator, the current version of a node
   # can't be redacted.
   def test_redact_node_current_version

-    basic_authorization(users(:moderator_user).email, "test")
+    basic_authorization(create(:moderator_user).email, "test")

 
     do_redact_node(nodes(:node_with_versions_v4),
 
     do_redact_node(nodes(:node_with_versions_v4),

-                   redactions(:example))
+                   create(:redaction))

     assert_response :bad_request, "shouldn't be OK to redact current version as moderator."
   end
 
     assert_response :bad_request, "shouldn't be OK to redact current version as moderator."
   end
 


@@ -235,23 +250,23 @@ class OldNodeControllerTest < ActionController::TestCase
   # authorised as a moderator.
   def test_redact_node_moderator
     node = nodes(:node_with_versions_v3)
   # authorised as a moderator.
   def test_redact_node_moderator
     node = nodes(:node_with_versions_v3)

-    basic_authorization(users(:moderator_user).email, "test")
+    basic_authorization(create(:moderator_user).email, "test")

 
 

-    do_redact_node(node, redactions(:example))
+    do_redact_node(node, 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 => node.node_id, :version => node.version
     assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed."
     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 => node.node_id, :version => node.version
     assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed."

-    get :version, :id => node.node_id, :version => node.version, :show_redactions => 'true'
+    get :version, :id => node.node_id, :version => node.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 => node.node_id
     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm node[id='#{node.node_id}'][version='#{node.version}']", 0, "node #{node.node_id} version #{node.version} should not be present in the history for moderators when not passing flag."
     assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
 
     # and when accessed via history
     get :history, :id => node.node_id
     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm node[id='#{node.node_id}'][version='#{node.version}']", 0, "node #{node.node_id} version #{node.version} should not be present in the history for moderators when not passing flag."

-    get :history, :id => node.node_id, :show_redactions => 'true'
+    get :history, :id => node.node_id, :show_redactions => "true"

     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm node[id='#{node.node_id}'][version='#{node.version}']", 1, "node #{node.node_id} version #{node.version} should still be present in the history for moderators when passing flag."
   end
     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm node[id='#{node.node_id}'][version='#{node.version}']", 1, "node #{node.node_id} version #{node.version} should still be present in the history for moderators when passing flag."
   end


@@ -260,13 +275,13 @@ class OldNodeControllerTest < ActionController::TestCase
   # redacted stuff any more.
   def test_redact_node_is_redacted
     node = nodes(:node_with_versions_v3)
   # redacted stuff any more.
   def test_redact_node_is_redacted
     node = nodes(:node_with_versions_v3)

-    basic_authorization(users(:moderator_user).email, "test")
+    basic_authorization(create(:moderator_user).email, "test")

 
 

-    do_redact_node(node, redactions(:example))
+    do_redact_node(node, create(:redaction))

     assert_response :success, "should be OK to redact old version as moderator."
 
     # re-auth as non-moderator
     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 => node.node_id, :version => node.version
 
     # check can't see the redacted data
     get :version, :id => node.node_id, :version => node.version


@@ -278,6 +293,63 @@ class OldNodeControllerTest < ActionController::TestCase
     assert_select "osm node[id='#{node.node_id}'][version='#{node.version}']", 0, "redacted node #{node.node_id} version #{node.version} shouldn't be present in the history."
   end
 
     assert_select "osm node[id='#{node.node_id}'][version='#{node.version}']", 0, "redacted node #{node.node_id} version #{node.version} shouldn't be present in the history."
   end
 

+  ##
+  # test the unredaction of an old version of a node, while not being
+  # authorised.
+  def test_unredact_node_unauthorised
+    node = nodes(:redacted_node_redacted_version)
+
+    post :redact, :id => node.node_id, :version => node.version
+    assert_response :unauthorized, "should need to be authenticated to unredact."
+  end
+
+  ##
+  # test the unredaction of an old version of a node, while being
+  # authorised as a normal user.
+  def test_unredact_node_normal_user
+    user = create(:user)
+    node = nodes(:redacted_node_redacted_version)
+    basic_authorization(user.email, "test")
+
+    post :redact, :id => node.node_id, :version => node.version
+    assert_response :forbidden, "should need to be moderator to unredact."
+  end
+
+  ##
+  # test the unredaction of an old version of a node, while being
+  # authorised as a moderator.
+  def test_unredact_node_moderator
+    moderator_user = create(:moderator_user)
+    node = nodes(:redacted_node_redacted_version)
+    basic_authorization(moderator_user.email, "test")
+
+    post :redact, :id => node.node_id, :version => node.version
+    assert_response :success, "should be OK to redact old version as moderator."
+
+    # check moderator can now see the redacted data, when not
+    # passing the aspecial flag
+    get :version, :id => node.node_id, :version => node.version
+    assert_response :success, "After unredaction, node should not be gone for moderator."
+
+    # and when accessed via history
+    get :history, :id => node.node_id
+    assert_response :success, "Unredaction shouldn't have stopped history working."
+    assert_select "osm node[id='#{node.node_id}'][version='#{node.version}']", 1, "node #{node.node_id} version #{node.version} should now be present in the history for moderators without passing flag."
+
+    basic_authorization(create(:user).email, "test")
+
+    # check normal user can now see the redacted data
+    get :version, :id => node.node_id, :version => node.version
+    assert_response :success, "After unredaction, node should be visible to normal users."
+
+    # and when accessed via history
+    get :history, :id => node.node_id
+    assert_response :success, "Unredaction shouldn't have stopped history working."
+    assert_select "osm node[id='#{node.node_id}'][version='#{node.version}']", 1, "node #{node.node_id} version #{node.version} should now be present in the history for normal users without passing flag."
+  end
+
+  private
+

   def do_redact_node(node, redaction)
     get :version, :id => node.node_id, :version => node.version
     assert_response :success, "should be able to get version #{node.version} of node #{node.node_id}."
   def do_redact_node(node, redaction)
     get :version, :id => node.node_id, :version => node.version
     assert_response :success, "should be able to get version #{node.version} of node #{node.node_id}."


@@ -308,10 +380,10 @@ class OldNodeControllerTest < ActionController::TestCase
   # returns a 16 character long string with some nasty characters in it.
   # this ought to stress-test the tag handling as well as the versioning.
   def random_string
   # returns a 16 character long string with some nasty characters in it.
   # this ought to stress-test the tag handling as well as the versioning.
   def random_string

-    letters = [['!', '"', '$', '&', ';', '@'],
-               ('a'..'z').to_a,
-               ('A'..'Z').to_a,
-               ('0'..'9').to_a].flatten
+    letters = [["!", '"', "$", "&", ";", "@"],
+               ("a".."z").to_a,
+               ("A".."Z").to_a,
+               ("0".."9").to_a].flatten

     (1..16).map { |_i| letters[rand(letters.length)] }.join
   end
 
     (1..16).map { |_i| letters[rand(letters.length)] }.join
   end
 


@@ -322,4 +394,10 @@ class OldNodeControllerTest < ActionController::TestCase
   def precision(f)
     (f * GeoRecord::SCALE).round.to_f / GeoRecord::SCALE
   end
   def precision(f)
     (f * GeoRecord::SCALE).round.to_f / GeoRecord::SCALE
   end

+
+  def propagate_tags(node, old_node)
+    node.tags.each do |k, v|
+      create(:old_node_tag, :old_node => old_node, :k => k, :v => v)
+    end
+  end

 end
 end