Merge remote-tracking branch 'upstream/pull/4489'

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index a6147ef29054e817dbe27d7cd9b3c5a146dcf6a6..222e65764d68c25032c88644778564695380403e 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -138,6 +138,12 @@ module ActiveSupport
       { "Authorization" => format("Basic %<auth>s", :auth => Base64.encode64("#{user}:#{pass}")) }
     end
 
+    ##
+    # return request header for HTTP Bearer Authorization
+    def bearer_authorization_header(token)
+      { "Authorization" => "Bearer #{token}" }
+    end
+
     ##
     # make an OAuth signed request
     def signed_request(method, uri, options = {})
@@ -189,7 +195,7 @@ module ActiveSupport
 
     ##
     # Used to check that the error header and the forbidden responses are given
-    # when the owner of the changset has their data not marked as public
+    # when the owner of the changeset has their data not marked as public
     def assert_require_public_data(msg = "Shouldn't be able to use API when the user's data is not public")
       assert_response :forbidden, msg
       assert_equal("You must make your edits public to upload new data", @response.headers["Error"], "Wrong error message")
@@ -237,9 +243,11 @@ module ActiveSupport
 
     def sign_in_as(user)
       visit login_path
-      fill_in "username", :with => user.email
-      fill_in "password", :with => "test"
-      click_on "Login", :match => :first
+      within "form", :text => "Email Address or Username" do
+        fill_in "username", :with => user.email
+        fill_in "password", :with => "test"
+        click_on "Login"
+      end
     end
 
     def session_for(user)
@@ -249,7 +257,7 @@ module ActiveSupport
     end
 
     def xml_for_node(node)
-      doc = OSM::API.new.get_xml_doc
+      doc = OSM::API.new.xml_doc
       doc.root << xml_node_for_node(node)
       doc
     end
@@ -258,20 +266,20 @@ module ActiveSupport
       el = XML::Node.new "node"
       el["id"] = node.id.to_s
 
-      OMHelper.add_metadata_to_xml_node(el, node, {}, {})
+      add_metadata_to_xml_node(el, node, {}, {})
 
       if node.visible?
         el["lat"] = node.lat.to_s
         el["lon"] = node.lon.to_s
       end
 
-      OMHelper.add_tags_to_xml_node(el, node.node_tags)
+      add_tags_to_xml_node(el, node.node_tags)
 
       el
     end
 
     def xml_for_way(way)
-      doc = OSM::API.new.get_xml_doc
+      doc = OSM::API.new.xml_doc
       doc.root << xml_node_for_way(way)
       doc
     end
@@ -280,7 +288,7 @@ module ActiveSupport
       el = XML::Node.new "way"
       el["id"] = way.id.to_s
 
-      OMHelper.add_metadata_to_xml_node(el, way, {}, {})
+      add_metadata_to_xml_node(el, way, {}, {})
 
       # make sure nodes are output in sequence_id order
       ordered_nodes = []
@@ -296,13 +304,13 @@ module ActiveSupport
         el << node_el
       end
 
-      OMHelper.add_tags_to_xml_node(el, way.way_tags)
+      add_tags_to_xml_node(el, way.way_tags)
 
       el
     end
 
     def xml_for_relation(relation)
-      doc = OSM::API.new.get_xml_doc
+      doc = OSM::API.new.xml_doc
       doc.root << xml_node_for_relation(relation)
       doc
     end
@@ -311,7 +319,7 @@ module ActiveSupport
       el = XML::Node.new "relation"
       el["id"] = relation.id.to_s
 
-      OMHelper.add_metadata_to_xml_node(el, relation, {}, {})
+      add_metadata_to_xml_node(el, relation, {}, {})
 
       relation.relation_members.each do |member|
         member_el = XML::Node.new "member"
@@ -321,13 +329,60 @@ module ActiveSupport
         el << member_el
       end
 
-      OMHelper.add_tags_to_xml_node(el, relation.relation_tags)
+      add_tags_to_xml_node(el, relation.relation_tags)
 
       el
     end
 
-    class OMHelper
-      extend ObjectMetadata
+    def add_metadata_to_xml_node(el, osm, changeset_cache, user_display_name_cache)
+      el["changeset"] = osm.changeset_id.to_s
+      el["redacted"] = osm.redaction.id.to_s if osm.redacted?
+      el["timestamp"] = osm.timestamp.xmlschema
+      el["version"] = osm.version.to_s
+      el["visible"] = osm.visible.to_s
+
+      if changeset_cache.key?(osm.changeset_id)
+        # use the cache if available
+      else
+        changeset_cache[osm.changeset_id] = osm.changeset.user_id
+      end
+
+      user_id = changeset_cache[osm.changeset_id]
+
+      if user_display_name_cache.key?(user_id)
+        # use the cache if available
+      elsif osm.changeset.user.data_public?
+        user_display_name_cache[user_id] = osm.changeset.user.display_name
+      else
+        user_display_name_cache[user_id] = nil
+      end
+
+      unless user_display_name_cache[user_id].nil?
+        el["user"] = user_display_name_cache[user_id]
+        el["uid"] = user_id.to_s
+      end
+    end
+
+    def add_tags_to_xml_node(el, tags)
+      tags.each do |tag|
+        tag_el = XML::Node.new("tag")
+
+        tag_el["k"] = tag.k
+        tag_el["v"] = tag.v
+
+        el << tag_el
+      end
+    end
+
+    def with_user_account_deletion_delay(value)
+      freeze_time
+      default_value = Settings.user_account_deletion_delay
+      Settings.user_account_deletion_delay = value
+
+      yield
+
+      Settings.user_account_deletion_delay = default_value
+      unfreeze_time
     end
   end
 end