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

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 40b2b50bc7911f985121862aa6b9dea8fa6ad812..19e1a2784611fa219af508a181909c7ead6f320c 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,21 +1,30 @@
-require "coveralls"
-Coveralls.wear!("rails")
-
-# Override the simplecov output message, since it is mostly unwanted noise
-module SimpleCov
-  module Formatter
-    class HTMLFormatter
-      def output_message(_result); end
+require "simplecov"
+require "simplecov-lcov"
+
+# Fix incompatibility of simplecov-lcov with older versions of simplecov that are not expresses in its gemspec.
+# https://github.com/fortissimo1997/simplecov-lcov/pull/25
+unless SimpleCov.respond_to?(:branch_coverage)
+  module SimpleCov
+    def self.branch_coverage?
+      false

     end
   end
 end
 
     end
   end
 end
 

-# Output both the local simplecov html and the coveralls report
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
-  [SimpleCov::Formatter::HTMLFormatter,
-   Coveralls::SimpleCov::Formatter]
+SimpleCov::Formatter::LcovFormatter.config do |config|
+  config.report_with_single_file = true
+  config.single_report_path = "coverage/lcov.info"
+end
+
+SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new(
+  [
+    SimpleCov::Formatter::HTMLFormatter,
+    SimpleCov::Formatter::LcovFormatter
+  ]

 )
 
 )
 

+SimpleCov.start("rails")
+

 require "securerandom"
 require "digest/sha1"
 
 require "securerandom"
 require "digest/sha1"
 


@@ -34,6 +43,14 @@ module ActiveSupport
     # Run tests in parallel with specified workers
     parallelize(:workers => :number_of_processors)
 
     # Run tests in parallel with specified workers
     parallelize(:workers => :number_of_processors)
 

+    parallelize_setup do |worker|
+      SimpleCov.command_name "#{SimpleCov.command_name}-#{worker}"
+    end
+
+    parallelize_teardown do
+      SimpleCov.result
+    end
+

     ##
     # takes a block which is executed in the context of a different
     # ActionController instance. this is used so that code can call methods
     ##
     # takes a block which is executed in the context of a different
     # ActionController instance. this is used so that code can call methods


@@ -121,6 +138,12 @@ module ActiveSupport
       { "Authorization" => format("Basic %<auth>s", :auth => Base64.encode64("#{user}:#{pass}")) }
     end
 
       { "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 = {})
     ##
     # make an OAuth signed request
     def signed_request(method, uri, options = {})


@@ -143,7 +166,7 @@ module ActiveSupport
 
       request.sign!(oauth)
 
 
       request.sign!(oauth)
 

-      method(method).call(request.signed_uri, options)
+      method(method).call(request.signed_uri, **options)

     end
 
     ##
     end
 
     ##


@@ -172,10 +195,10 @@ module ActiveSupport
 
     ##
     # Used to check that the error header and the forbidden responses are given
 
     ##
     # 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
     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 @response.headers["Error"], "You must make your edits public to upload new data", "Wrong error message"
+      assert_equal("You must make your edits public to upload new data", @response.headers["Error"], "Wrong error message")

     end
 
     ##
     end
 
     ##


@@ -222,16 +245,17 @@ module ActiveSupport
       visit login_path
       fill_in "username", :with => user.email
       fill_in "password", :with => "test"
       visit login_path
       fill_in "username", :with => user.email
       fill_in "password", :with => "test"

-      click_on "Login", :match => :first
+      click_button "Login", :match => :first

     end
 
     def session_for(user)
     end
 
     def session_for(user)

+      get login_path

       post login_path, :params => { :username => user.display_name, :password => "test" }
       follow_redirect!
     end
 
     def xml_for_node(node)
       post login_path, :params => { :username => user.display_name, :password => "test" }
       follow_redirect!
     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
       doc.root << xml_node_for_node(node)
       doc
     end


@@ -240,20 +264,20 @@ module ActiveSupport
       el = XML::Node.new "node"
       el["id"] = node.id.to_s
 
       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
 
 
       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)
 
       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
       doc.root << xml_node_for_way(way)
       doc
     end


@@ -262,7 +286,7 @@ module ActiveSupport
       el = XML::Node.new "way"
       el["id"] = way.id.to_s
 
       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 = []
 
       # make sure nodes are output in sequence_id order
       ordered_nodes = []


@@ -278,13 +302,13 @@ module ActiveSupport
         el << node_el
       end
 
         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)
 
       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
       doc.root << xml_node_for_relation(relation)
       doc
     end


@@ -293,7 +317,7 @@ module ActiveSupport
       el = XML::Node.new "relation"
       el["id"] = relation.id.to_s
 
       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"
 
       relation.relation_members.each do |member|
         member_el = XML::Node.new "member"


@@ -303,13 +327,60 @@ module ActiveSupport
         el << member_el
       end
 
         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
 
 
       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
     end
   end
 end