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

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 33a1c92dacbb24398ffec9ddbd987f823c91cabe..378d49bb9a02f43097cfe13c9b73c32c702e1aac 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,59 +1,32 @@
 require "coveralls"
 Coveralls.wear!("rails")
 
 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
+    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]
+)
+

 ENV["RAILS_ENV"] = "test"
 ENV["RAILS_ENV"] = "test"

-require File.expand_path("../../config/environment", __FILE__)
+require_relative "../config/environment"

 require "rails/test_help"
 require "webmock/minitest"
 require "rails/test_help"
 require "webmock/minitest"

-load "composite_primary_keys/fixtures.rb"
+
+WebMock.disable_net_connect!(:allow_localhost => true)

 
 module ActiveSupport
   class TestCase
 
 module ActiveSupport
   class TestCase

-    include FactoryGirl::Syntax::Methods
-
-    # Load standard fixtures needed to test API methods
-    def self.api_fixtures
-      # print "setting up the api_fixtures"
-      fixtures :users, :user_roles
-      fixtures :changesets
-
-      fixtures :current_nodes, :nodes
-      set_fixture_class :current_nodes => Node
-      set_fixture_class :nodes => OldNode
-
-      fixtures :current_ways
-      set_fixture_class :current_ways => Way
-
-      fixtures :current_way_nodes
-      set_fixture_class :current_way_nodes => WayNode
-
-      fixtures :ways
-      set_fixture_class :ways => OldWay
-
-      fixtures :way_nodes
-      set_fixture_class :way_nodes => OldWayNode
-
-      fixtures :current_relations
-      set_fixture_class :current_relations => Relation
-
-      fixtures :current_relation_members
-      set_fixture_class :current_relation_members => RelationMember
-
-      fixtures :relations
-      set_fixture_class :relations => OldRelation
-
-      fixtures :relation_members
-      set_fixture_class :relation_members => OldRelationMember
-
-      fixtures :gpx_files, :gps_points, :gpx_file_tags
-      set_fixture_class :gpx_files => Trace
-      set_fixture_class :gps_points => Tracepoint
-      set_fixture_class :gpx_file_tags => Tracetag
-
-      fixtures :client_applications
-
-      fixtures :redactions
-    end
+    include FactoryBot::Syntax::Methods
+    include ActiveJob::TestHelper

 
     ##
     # takes a block which is executed in the context of a different
 
     ##
     # takes a block which is executed in the context of a different


@@ -69,6 +42,18 @@ module ActiveSupport
       end
     end
 
       end
     end
 

+    ##
+    # execute a block with missing translation exceptions suppressed
+    def without_i18n_exceptions
+      exception_handler = I18n.exception_handler
+      begin
+        I18n.exception_handler = nil
+        yield
+      ensure
+        I18n.exception_handler = exception_handler
+      end
+    end
+

     ##
     # work round minitest insanity that causes it to tell you
     # to use assert_nil to test for nil, which is fine if you're
     ##
     # work round minitest insanity that causes it to tell you
     # to use assert_nil to test for nil, which is fine if you're


@@ -127,7 +112,7 @@ module ActiveSupport
     ##
     # set request headers for HTTP basic authentication
     def basic_authorization(user, pass)
     ##
     # set request headers for HTTP basic authentication
     def basic_authorization(user, pass)

-      @request.env["HTTP_AUTHORIZATION"] = format("Basic %s", Base64.encode64("#{user}:#{pass}"))
+      @request.env["HTTP_AUTHORIZATION"] = format("Basic %{auth}", :auth => Base64.encode64("#{user}:#{pass}"))

     end
 
     ##
     end
 
     ##


@@ -136,12 +121,6 @@ module ActiveSupport
       @request.env["HTTP_X_ERROR_FORMAT"] = format
     end
 
       @request.env["HTTP_X_ERROR_FORMAT"] = format
     end
 

-    ##
-    # set the raw body to be sent with a POST request
-    def content(c)
-      @request.env["RAW_POST_DATA"] = c.to_s
-    end
-

     ##
     # 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
     ##
     # 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


@@ -175,27 +154,108 @@ module ActiveSupport
     end
 
     def stub_gravatar_request(email, status = 200, body = nil)
     end
 
     def stub_gravatar_request(email, status = 200, body = nil)

-      hash = Digest::MD5.hexdigest(email.downcase)
+      hash = ::Digest::MD5.hexdigest(email.downcase)

       url = "https://www.gravatar.com/avatar/#{hash}?d=404"
       stub_request(:get, url).and_return(:status => status, :body => body)
     end
 
       url = "https://www.gravatar.com/avatar/#{hash}?d=404"
       stub_request(:get, url).and_return(:status => status, :body => body)
     end
 

-    def stub_hostip_requests
-      # Controller tests and integration tests use different IPs
-      stub_request(:get, "http://api.hostip.info/country.php?ip=0.0.0.0")
-      stub_request(:get, "http://api.hostip.info/country.php?ip=127.0.0.1")
-    end
-

     def email_text_parts(message)
     def email_text_parts(message)

-      text_parts = []
-      message.parts.each do |part|
+      message.parts.each_with_object([]) do |part, text_parts|

         if part.content_type.start_with?("text/")
           text_parts.push(part)
         elsif part.multipart?
           text_parts.concat(email_text_parts(part))
         end
       end
         if part.content_type.start_with?("text/")
           text_parts.push(part)
         elsif part.multipart?
           text_parts.concat(email_text_parts(part))
         end
       end

-      return text_parts
+    end
+
+    def sign_in_as(user)
+      visit login_path
+      fill_in "username", :with => user.email
+      fill_in "password", :with => "test"
+      click_on "Login", :match => :first
+    end
+
+    def xml_for_node(node)
+      doc = OSM::API.new.get_xml_doc
+      doc.root << xml_node_for_node(node)
+      doc
+    end
+
+    def xml_node_for_node(node)
+      el = XML::Node.new "node"
+      el["id"] = node.id.to_s
+
+      OMHelper.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)
+
+      el
+    end
+
+    def xml_for_way(way)
+      doc = OSM::API.new.get_xml_doc
+      doc.root << xml_node_for_way(way)
+      doc
+    end
+
+    def xml_node_for_way(way)
+      el = XML::Node.new "way"
+      el["id"] = way.id.to_s
+
+      OMHelper.add_metadata_to_xml_node(el, way, {}, {})
+
+      # make sure nodes are output in sequence_id order
+      ordered_nodes = []
+      way.way_nodes.each do |nd|
+        ordered_nodes[nd.sequence_id] = nd.node_id.to_s if nd.node&.visible?
+      end
+
+      ordered_nodes.each do |nd_id|
+        next unless nd_id && nd_id != "0"
+
+        node_el = XML::Node.new "nd"
+        node_el["ref"] = nd_id
+        el << node_el
+      end
+
+      OMHelper.add_tags_to_xml_node(el, way.way_tags)
+
+      el
+    end
+
+    def xml_for_relation(relation)
+      doc = OSM::API.new.get_xml_doc
+      doc.root << xml_node_for_relation(relation)
+      doc
+    end
+
+    def xml_node_for_relation(relation)
+      el = XML::Node.new "relation"
+      el["id"] = relation.id.to_s
+
+      OMHelper.add_metadata_to_xml_node(el, relation, {}, {})
+
+      relation.relation_members.each do |member|
+        member_el = XML::Node.new "member"
+        member_el["type"] = member.member_type.downcase
+        member_el["ref"] = member.member_id.to_s
+        member_el["role"] = member.member_role
+        el << member_el
+      end
+
+      OMHelper.add_tags_to_xml_node(el, relation.relation_tags)
+
+      el
+    end
+
+    class OMHelper
+      extend ObjectMetadata

     end
   end
 end
     end
   end
 end