X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22..dc2a2c8ebd1a11e4a64555fda22c6859a51defff:/test/test_helper.rb diff --git a/test/test_helper.rb b/test/test_helper.rb index 703347c9c..8f75a7ab0 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,150 +1,166 @@ ENV["RAILS_ENV"] = "test" -require File.expand_path('../../config/environment', __FILE__) -require 'rails/test_help' -load 'composite_primary_keys/fixtures.rb' - -class ActiveSupport::TestCase - # Load standard fixtures needed to test API methods - def self.api_fixtures - #print "setting up the api_fixtures" - fixtures :users, :user_roles, :changesets, :changeset_tags - - fixtures :current_nodes, :nodes - set_fixture_class :current_nodes => 'Node' - set_fixture_class :nodes => 'OldNode' - - fixtures :current_node_tags,:node_tags - set_fixture_class :current_node_tags => 'NodeTag' - set_fixture_class :node_tags => 'OldNodeTag' - - fixtures :current_ways - set_fixture_class :current_ways => 'Way' - - fixtures :current_way_nodes, :current_way_tags - set_fixture_class :current_way_nodes => 'WayNode' - set_fixture_class :current_way_tags => 'WayTag' - - fixtures :ways - set_fixture_class :ways => 'OldWay' - - fixtures :way_nodes, :way_tags - set_fixture_class :way_nodes => 'OldWayNode' - set_fixture_class :way_tags => 'OldWayTag' - - fixtures :current_relations - set_fixture_class :current_relations => 'Relation' - - fixtures :current_relation_members, :current_relation_tags - set_fixture_class :current_relation_members => 'RelationMember' - set_fixture_class :current_relation_tags => 'RelationTag' - - fixtures :relations - set_fixture_class :relations => 'OldRelation' - - fixtures :relation_members, :relation_tags - set_fixture_class :relation_members => 'OldRelationMember' - set_fixture_class :relation_tags => 'OldRelationTag' - - 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 +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +load "composite_primary_keys/fixtures.rb" + +module ActiveSupport + class TestCase + # Load standard fixtures needed to test API methods + def self.api_fixtures + # print "setting up the api_fixtures" + fixtures :users, :user_roles, :changesets, :changeset_tags + + fixtures :current_nodes, :nodes + set_fixture_class :current_nodes => Node + set_fixture_class :nodes => OldNode + + fixtures :current_node_tags, :node_tags + set_fixture_class :current_node_tags => NodeTag + set_fixture_class :node_tags => OldNodeTag + + fixtures :current_ways + set_fixture_class :current_ways => Way + + fixtures :current_way_nodes, :current_way_tags + set_fixture_class :current_way_nodes => WayNode + set_fixture_class :current_way_tags => WayTag + + fixtures :ways + set_fixture_class :ways => OldWay + + fixtures :way_nodes, :way_tags + set_fixture_class :way_nodes => OldWayNode + set_fixture_class :way_tags => OldWayTag + + fixtures :current_relations + set_fixture_class :current_relations => Relation + + fixtures :current_relation_members, :current_relation_tags + set_fixture_class :current_relation_members => RelationMember + set_fixture_class :current_relation_tags => RelationTag + + fixtures :relations + set_fixture_class :relations => OldRelation - ## - # takes a block which is executed in the context of a different - # ActionController instance. this is used so that code can call methods - # on the node controller whilst testing the old_node controller. - def with_controller(new_controller) - controller_save = @controller - begin - @controller = new_controller - yield - ensure - @controller = controller_save + fixtures :relation_members, :relation_tags + set_fixture_class :relation_members => OldRelationMember + set_fixture_class :relation_tags => OldRelationTag + + 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 + + fixtures :notes, :note_comments end - end - ## - # for some reason assert_equal a, b fails when the ways are actually - # equal, so this method manually checks the fields... - def assert_ways_are_equal(a, b) - assert_not_nil a, "first way is not allowed to be nil" - assert_not_nil b, "second way #{a.id} is not allowed to be nil" - assert_equal a.id, b.id, "way IDs" - assert_equal a.changeset_id, b.changeset_id, "changeset ID on way #{a.id}" - assert_equal a.visible, b.visible, "visible on way #{a.id}, #{a.visible.inspect} != #{b.visible.inspect}" - assert_equal a.version, b.version, "version on way #{a.id}" - assert_equal a.tags, b.tags, "tags on way #{a.id}" - assert_equal a.nds, b.nds, "node references on way #{a.id}" - end + ## + # takes a block which is executed in the context of a different + # ActionController instance. this is used so that code can call methods + # on the node controller whilst testing the old_node controller. + def with_controller(new_controller) + controller_save = @controller + begin + @controller = new_controller + yield + ensure + @controller = controller_save + end + end - ## - # for some reason a==b is false, but there doesn't seem to be any - # difference between the nodes, so i'm checking all the attributes - # manually and blaming it on ActiveRecord - def assert_nodes_are_equal(a, b) - assert_equal a.id, b.id, "node IDs" - assert_equal a.latitude, b.latitude, "latitude on node #{a.id}" - assert_equal a.longitude, b.longitude, "longitude on node #{a.id}" - assert_equal a.changeset_id, b.changeset_id, "changeset ID on node #{a.id}" - assert_equal a.visible, b.visible, "visible on node #{a.id}" - assert_equal a.version, b.version, "version on node #{a.id}" - assert_equal a.tags, b.tags, "tags on node #{a.id}" - end + ## + # for some reason assert_equal a, b fails when the relations are + # actually equal, so this method manually checks the fields... + def assert_relations_are_equal(a, b) + assert_not_nil a, "first relation is not allowed to be nil" + assert_not_nil b, "second relation #{a.id} is not allowed to be nil" + assert_equal a.id, b.id, "relation IDs" + assert_equal a.changeset_id, b.changeset_id, "changeset ID on relation #{a.id}" + assert_equal a.visible, b.visible, "visible on relation #{a.id}, #{a.visible.inspect} != #{b.visible.inspect}" + assert_equal a.version, b.version, "version on relation #{a.id}" + assert_equal a.tags, b.tags, "tags on relation #{a.id}" + assert_equal a.members, b.members, "member references on relation #{a.id}" + end - def basic_authorization(user, pass) - @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}") - end + ## + # for some reason assert_equal a, b fails when the ways are actually + # equal, so this method manually checks the fields... + def assert_ways_are_equal(a, b) + assert_not_nil a, "first way is not allowed to be nil" + assert_not_nil b, "second way #{a.id} is not allowed to be nil" + assert_equal a.id, b.id, "way IDs" + assert_equal a.changeset_id, b.changeset_id, "changeset ID on way #{a.id}" + assert_equal a.visible, b.visible, "visible on way #{a.id}, #{a.visible.inspect} != #{b.visible.inspect}" + assert_equal a.version, b.version, "version on way #{a.id}" + assert_equal a.tags, b.tags, "tags on way #{a.id}" + assert_equal a.nds, b.nds, "node references on way #{a.id}" + end - def error_format(format) - @request.env["HTTP_X_ERROR_FORMAT"] = format - end + ## + # for some reason a==b is false, but there doesn't seem to be any + # difference between the nodes, so i'm checking all the attributes + # manually and blaming it on ActiveRecord + def assert_nodes_are_equal(a, b) + assert_equal a.id, b.id, "node IDs" + assert_equal a.latitude, b.latitude, "latitude on node #{a.id}" + assert_equal a.longitude, b.longitude, "longitude on node #{a.id}" + assert_equal a.changeset_id, b.changeset_id, "changeset ID on node #{a.id}" + assert_equal a.visible, b.visible, "visible on node #{a.id}" + assert_equal a.version, b.version, "version on node #{a.id}" + assert_equal a.tags, b.tags, "tags on node #{a.id}" + end - 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 - 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" - end - - # Not sure this is the best response we could give - def assert_inactive_user(msg = "an inactive user shouldn't be able to access the API") - assert_response :unauthorized, msg - #assert_equal @response.headers['Error'], "" - end - - def assert_no_missing_translations(msg="") - assert_select "span[class=translation_missing]", false, "Missing translation #{msg}" - end + def basic_authorization(user, pass) + @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}") + end + + def error_format(format) + @request.env["HTTP_X_ERROR_FORMAT"] = format + end + + 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 + 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" + end - # Set things up for OpenID testing - def openid_setup - begin - # Test if the ROTS (Ruby OpenID Test Server) is already running - rots_response = Net::HTTP.get_response(URI.parse("http://localhost:1123/")) + # Not sure this is the best response we could give + def assert_inactive_user(msg = "an inactive user shouldn't be able to access the API") + assert_response :unauthorized, msg + # assert_equal @response.headers['Error'], "" + end + + def assert_no_missing_translations(msg = "") + assert_select "span[class=translation_missing]", false, "Missing translation #{msg}" + end + + # Set things up for OpenID testing + def openid_setup + Net::HTTP.get_response(URI.parse("http://localhost:1123/")) rescue # It isn't, so start a new instance. rots = IO.popen("#{Rails.root}/vendor/gems/rots-0.2.1/bin/rots --silent") # Wait for up to 30 seconds for the server to start and respond before continuing - for i in (1 .. 30) - begin - sleep 1 - rots_response = Net::HTTP.get_response(URI.parse("http://localhost:1123/")) - # If the rescue block doesn't fire, ROTS is up and running and we can continue - break - rescue - # If the connection failed, do nothing and repeat the loop - end + 1.upto(30).each do + begin + sleep 1 + Net::HTTP.get_response(URI.parse("http://localhost:1123/")) + # If the rescue block doesn't fire, ROTS is up and running and we can continue + break + rescue + # If the connection failed, do nothing and repeat the loop + next + end end # Arrange to kill the process when we exit - note that we need @@ -153,16 +169,15 @@ class ActiveSupport::TestCase Process.kill("KILL", rots.pid) end end - end - def openid_request(openid_request_uri) - openid_response = Net::HTTP.get_response(URI.parse(openid_request_uri)) - openid_response_uri = URI(openid_response['Location']) - openid_response_qs = Rack::Utils.parse_query(openid_response_uri.query) + def openid_request(openid_request_uri) + openid_response = Net::HTTP.get_response(URI.parse(openid_request_uri)) + openid_response_uri = URI(openid_response["Location"]) + openid_response_qs = Rack::Utils.parse_query(openid_response_uri.query) - return openid_response_qs - end + openid_response_qs + end - - # Add more helper methods to be used by all tests here... + # Add more helper methods to be used by all tests here... + end end