X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/efcb56b68b4ec7b6d4e2986b141e69166c481aee..0a046673d630a4618c27559875ce613465d85d3c:/test/test_helper.rb diff --git a/test/test_helper.rb b/test/test_helper.rb index e4db27d31..68749c0f7 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,21 +1,33 @@ -require "coveralls" -Coveralls.wear!("rails") +require "simplecov" +require "simplecov-lcov" -# Override the simplecov output message, since it is mostly unwanted noise -module SimpleCov - module Formatter - class HTMLFormatter - def output_message(_result); end +# 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 -# 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" + ENV["RAILS_ENV"] = "test" require_relative "../config/environment" require "rails/test_help" @@ -28,6 +40,17 @@ module ActiveSupport include FactoryBot::Syntax::Methods include ActiveJob::TestHelper + # 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 @@ -42,6 +65,18 @@ module ActiveSupport 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 @@ -98,23 +133,72 @@ module ActiveSupport end ## - # set request headers for HTTP basic authentication - def basic_authorization(user, pass) - @request.env["HTTP_AUTHORIZATION"] = format("Basic %{auth}", :auth => Base64.encode64("#{user}:#{pass}")) + # return request header for HTTP Basic Authorization + def basic_authorization_header(user, pass) + { "Authorization" => format("Basic %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 = {}) + uri = URI.parse(uri) + uri.scheme ||= "http" + uri.host ||= "www.example.com" + + oauth = options.delete(:oauth) + params = options.fetch(:params, {}).transform_keys(&:to_s) + + oauth[:consumer] ||= oauth[:token].client_application + + helper = OAuth::Client::Helper.new(nil, oauth) + + request = OAuth::RequestProxy.proxy( + "method" => method.to_s.upcase, + "uri" => uri, + "parameters" => params.merge(helper.oauth_parameters) + ) + + request.sign!(oauth) + + method(method).call(request.signed_uri, **options) + end + + ## + # make an OAuth signed GET request + def signed_get(uri, options = {}) + signed_request(:get, uri, options) + end + + ## + # make an OAuth signed POST request + def signed_post(uri, options = {}) + signed_request(:post, uri, options) + end + + ## + # return request header for HTTP Accept + def accept_format_header(format) + { "Accept" => format } end ## - # set request readers to ask for a particular error format - def error_format(format) - @request.env["HTTP_X_ERROR_FORMAT"] = format + # return request header to ask for a particular error format + def error_format_header(f) + { "X-Error-Format" => f } 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 + # 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 @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 ## @@ -147,12 +231,6 @@ module ActiveSupport 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, "https://api.hostip.info/country.php?ip=0.0.0.0") - stub_request(:get, "https://api.hostip.info/country.php?ip=127.0.0.1") - end - def email_text_parts(message) message.parts.each_with_object([]) do |part, text_parts| if part.content_type.start_with?("text/") @@ -164,15 +242,20 @@ module ActiveSupport end def sign_in_as(user) - stub_hostip_requests 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) + get login_path + 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 @@ -181,20 +264,112 @@ 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.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 + + 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 + + add_tags_to_xml_node(el, way.way_tags) + + el + end + + def xml_for_relation(relation) + doc = OSM::API.new.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 + + 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 + + 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 end end