require "test_helper"
require "stringio"
-include Potlatch
class AmfControllerTest < ActionController::TestCase
- api_fixtures
+ include Potlatch
##
# test all routes which lead to this controller
end
def test_getpresets
- user_en_de = create(:user, :languages => %w(en de))
- user_de = create(:user, :languages => %w(de))
+ user_en_de = create(:user, :languages => %w[en de])
+ user_de = create(:user, :languages => %w[de])
[user_en_de, user_de].each do |user|
amf_content "getpresets", "/1", ["#{user.email}:test", ""]
post :amf_read
ways = map[2].collect { |x| x[0] }
assert ways.include?(way.id),
"map should include used way"
- assert !ways.include?(deleted_way.id),
- "map should not include deleted way"
+ assert_not ways.include?(deleted_way.id),
+ "map should not include deleted way"
end
##
assert_equal Array, map[2].class, "third map element should be an array"
# TODO: looks like amf_controller changed since this test was written
# so someone who knows what they're doing should check this!
- assert !map[2].include?(way.id),
- "map should not include visible way"
+ assert_not map[2].include?(way.id),
+ "map should not include visible way"
assert map[2].include?(deleted_way.id),
"map should include deleted way"
end
assert_equal 2, result.length
assert_equal -1, result[0]
- assert_match /must be logged in/, result[1]
+ assert_match(/must be logged in/, result[1])
blocked_user = create(:user)
create(:user_block, :user => blocked_user)
assert_equal 2, result.length
assert_equal -1, result[0]
- assert_match /access to the API has been blocked/, result[1]
+ assert_match(/access to the API has been blocked/, result[1])
end
def test_findgpx_by_id
end
def test_findgpx_by_name
- amf_content "findgpx", "/1", ["Trace", "test@example.com:test"]
+ user = create(:user)
+
+ amf_content "findgpx", "/1", ["Trace", "#{user.email}:test"]
post :amf_read
assert_response :success
amf_parse_response
# This node has no tags
# create a node with random lat/lon
- lat = rand(100) - 50 + rand
- lon = rand(100) - 50 + rand
+ lat = rand(-50..49) + rand
+ lon = rand(-50..49) + rand
changeset = create(:changeset)
user = changeset.user
# This node has some tags
# create a node with random lat/lon
- lat = rand(100) - 50 + rand
- lon = rand(100) - 50 + rand
+ lat = rand(-50..49) + rand
+ lon = rand(-50..49) + rand
amf_content "putpoi", "/2", ["#{user.email}:test", changeset.id, nil, nil, lon, lat, { "key" => "value", "ping" => "pong" }, nil]
post :amf_write
# This node has no tags
# create a node with random lat/lon
- lat = rand(100) - 50 + rand
- lon = rand(100) - 50 + rand
+ lat = rand(-50..49) + rand
+ lon = rand(-50..49) + rand
changeset = create(:changeset)
user = changeset.user
# This node has no tags
# create a node with random lat/lon
- lat = rand(100) - 50 + rand
- lon = rand(100) - 50 + rand
+ lat = rand(-50..49) + rand
+ lon = rand(-50..49) + rand
changeset = create(:changeset)
user = changeset.user
assert_equal 2, result.size
assert_equal -2, result[0]
- assert_match /Node is not in the world/, result[1]
+ assert_match(/Node is not in the world/, result[1])
end
# check that we can create a way
assert_equal 2, result.size
assert_equal -1, result[0]
- assert_match /Way #{way.id} is still used/, result[1]
+ assert_match(/Way #{way.id} is still used/, result[1])
new_way = Way.find(way.id)
assert_equal way.version, new_way.version
assert_equal 2, result.size
assert_equal -1, result[0]
- assert_match /relation #{relation.id} is used in/, result[1]
+ assert_match(/relation #{relation.id} is used in/, result[1])
new_relation = Relation.find(relation.id)
assert_equal relation.version, new_relation.version
# check that we can open a changeset
def test_startchangeset_valid
- amf_content "startchangeset", "/1", ["test@example.com:test", { "source" => "new" }, nil, "new", 1]
+ user = create(:user)
+
+ amf_content "startchangeset", "/1", ["#{user.email}:test", { "source" => "new" }, nil, "new", 1]
post :amf_write
assert_response :success
amf_parse_response
old_cs_id = new_cs_id
- amf_content "startchangeset", "/1", ["test@example.com:test", { "source" => "newer" }, old_cs_id, "newer", 1]
+ amf_content "startchangeset", "/1", ["#{user.email}:test", { "source" => "newer" }, old_cs_id, "newer", 1]
post :amf_write
assert_response :success
amf_parse_response
old_cs_id = new_cs_id
- amf_content "startchangeset", "/1", ["test@example.com:test", {}, old_cs_id, "", 0]
+ amf_content "startchangeset", "/1", ["#{user.email}:test", {}, old_cs_id, "", 0]
post :amf_write
assert_response :success
amf_parse_response
# check that we can't close somebody elses changeset
def test_startchangeset_invalid_wrong_user
- amf_content "startchangeset", "/1", ["test@example.com:test", { "source" => "new" }, nil, "new", 1]
+ user = create(:user)
+ user2 = create(:user)
+
+ amf_content "startchangeset", "/1", ["#{user.email}:test", { "source" => "new" }, nil, "new", 1]
post :amf_write
assert_response :success
amf_parse_response
assert_equal true, cs.is_open?
assert_equal({ "comment" => "new", "source" => "new" }, cs.tags)
- amf_content "startchangeset", "/1", ["test@openstreetmap.org:test", {}, cs_id, "delete", 0]
+ amf_content "startchangeset", "/1", ["#{user2.email}:test", {}, cs_id, "delete", 0]
post :amf_write
assert_response :success
amf_parse_response
# check that invalid characters are stripped from changeset tags
def test_startchangeset_invalid_xmlchar_comment
+ user = create(:user)
+
invalid = "\035\022"
comment = "foo#{invalid}bar"
- amf_content "startchangeset", "/1", ["test@example.com:test", {}, nil, comment, 1]
+ amf_content "startchangeset", "/1", ["#{user.email}:test", {}, nil, comment, 1]
post :amf_write
assert_response :success
amf_parse_response