Resolve 34 Rubocop Lint/AmbiguousOperator conflicts
This commit is contained in:
Wil
Andy Allan
parent
cf107bca70
commit
1d2a3841ab
5 changed files with 34 additions and 42 deletions
|
|
@ -6,14 +6,6 @@
|
|||
# Note that changes in the inspected code, or installation of new
|
||||
# versions of RuboCop, may require this file to be generated again.
|
||||
|
||||
# Offense count: 34
|
||||
Lint/AmbiguousOperator:
|
||||
Exclude:
|
||||
- 'test/controllers/amf_controller_test.rb'
|
||||
- 'test/controllers/changeset_controller_test.rb'
|
||||
- 'test/lib/bounding_box_test.rb'
|
||||
- 'test/lib/country_test.rb'
|
||||
|
||||
# Offense count: 32
|
||||
# Configuration parameters: AllowSafeAssignment.
|
||||
Lint/AssignmentInCondition:
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ class AmfControllerTest < ActionController::TestCase
|
|||
assert_response :success
|
||||
amf_parse_response
|
||||
result = amf_result("/1")
|
||||
assert_equal -4, result[0]
|
||||
assert_equal(-4, result[0])
|
||||
assert_equal "way", result[1]
|
||||
assert_equal id, result[2]
|
||||
assert(result[3].nil? && result[4].nil? && result[5].nil? && result[6].nil?)
|
||||
|
|
@ -154,7 +154,7 @@ class AmfControllerTest < ActionController::TestCase
|
|||
assert_response :success
|
||||
amf_parse_response
|
||||
way = amf_result("/1")
|
||||
assert_equal -4, way[0]
|
||||
assert_equal(-4, way[0])
|
||||
assert_equal "way", way[1]
|
||||
assert_equal 0, way[2]
|
||||
assert(way[3].nil?) && way[4].nil? && way[5].nil? && way[6].nil?
|
||||
|
|
@ -370,7 +370,7 @@ class AmfControllerTest < ActionController::TestCase
|
|||
assert_response :success
|
||||
amf_parse_response
|
||||
returned_way = amf_result("/1")
|
||||
assert_equal -1, returned_way[0]
|
||||
assert_equal(-1, returned_way[0])
|
||||
assert returned_way[3].nil?
|
||||
assert returned_way[4].nil?
|
||||
assert returned_way[5].nil?
|
||||
|
|
@ -391,7 +391,7 @@ class AmfControllerTest < ActionController::TestCase
|
|||
assert_response :success
|
||||
amf_parse_response
|
||||
returned_way = amf_result("/1")
|
||||
assert_equal -1, returned_way[0]
|
||||
assert_equal(-1, returned_way[0])
|
||||
assert returned_way[3].nil?
|
||||
assert returned_way[4].nil?
|
||||
assert returned_way[5].nil?
|
||||
|
|
@ -408,7 +408,7 @@ class AmfControllerTest < ActionController::TestCase
|
|||
assert_response :success
|
||||
amf_parse_response
|
||||
returned_way = amf_result("/1")
|
||||
assert_equal -1, returned_way[0]
|
||||
assert_equal(-1, returned_way[0])
|
||||
assert returned_way[3].nil?
|
||||
assert returned_way[4].nil?
|
||||
assert returned_way[5].nil?
|
||||
|
|
@ -498,7 +498,7 @@ class AmfControllerTest < ActionController::TestCase
|
|||
result = amf_result("/1")
|
||||
|
||||
assert_equal 2, result.length
|
||||
assert_equal -1, result[0]
|
||||
assert_equal(-1, result[0])
|
||||
assert_match(/must be logged in/, result[1])
|
||||
|
||||
blocked_user = create(:user)
|
||||
|
|
@ -510,7 +510,7 @@ class AmfControllerTest < ActionController::TestCase
|
|||
result = amf_result("/1")
|
||||
|
||||
assert_equal 2, result.length
|
||||
assert_equal -1, result[0]
|
||||
assert_equal(-1, result[0])
|
||||
assert_match(/access to the API has been blocked/, result[1])
|
||||
end
|
||||
|
||||
|
|
@ -546,7 +546,7 @@ class AmfControllerTest < ActionController::TestCase
|
|||
|
||||
# find by name fails as it uses mysql text search syntax...
|
||||
assert_equal 2, result.length
|
||||
assert_equal -2, result[0]
|
||||
assert_equal(-2, result[0])
|
||||
end
|
||||
|
||||
def test_findrelations_by_id
|
||||
|
|
@ -636,7 +636,7 @@ class AmfControllerTest < ActionController::TestCase
|
|||
result = amf_result("/1")
|
||||
|
||||
assert_equal 3, result.length
|
||||
assert_equal -4, result[0]
|
||||
assert_equal(-4, result[0])
|
||||
assert_equal "node", result[1]
|
||||
assert_equal 999999, result[2]
|
||||
end
|
||||
|
|
@ -671,7 +671,7 @@ class AmfControllerTest < ActionController::TestCase
|
|||
result = amf_result("/1")
|
||||
|
||||
assert_equal 3, result.length
|
||||
assert_equal -4, result[0]
|
||||
assert_equal(-4, result[0])
|
||||
assert_equal "node", result[1]
|
||||
assert_equal node.node_id, result[2]
|
||||
|
||||
|
|
@ -682,7 +682,7 @@ class AmfControllerTest < ActionController::TestCase
|
|||
result = amf_result("/1")
|
||||
|
||||
assert_equal 3, result.length
|
||||
assert_equal -4, result[0]
|
||||
assert_equal(-4, result[0])
|
||||
assert_equal "node", result[1]
|
||||
assert_equal 999999, result[2]
|
||||
end
|
||||
|
|
@ -864,7 +864,7 @@ class AmfControllerTest < ActionController::TestCase
|
|||
result = amf_result("/1")
|
||||
|
||||
assert_equal 2, result.size
|
||||
assert_equal -1, result[0], "Expected to get the status FAIL in the amf"
|
||||
assert_equal(-1, result[0], "Expected to get the status FAIL in the amf")
|
||||
assert_equal "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1.", result[1]
|
||||
end
|
||||
|
||||
|
|
@ -904,7 +904,7 @@ class AmfControllerTest < ActionController::TestCase
|
|||
result = amf_result("/1")
|
||||
|
||||
assert_equal 3, result.size
|
||||
assert_equal -4, result[0]
|
||||
assert_equal(-4, result[0])
|
||||
assert_equal "node", result[1]
|
||||
assert_equal nd.id, result[2]
|
||||
end
|
||||
|
|
@ -922,7 +922,7 @@ class AmfControllerTest < ActionController::TestCase
|
|||
result = amf_result("/1")
|
||||
|
||||
assert_equal 3, result.size
|
||||
assert_equal -4, result[0]
|
||||
assert_equal(-4, result[0])
|
||||
assert_equal "node", result[1]
|
||||
assert_equal 999999, result[2]
|
||||
end
|
||||
|
|
@ -940,7 +940,7 @@ class AmfControllerTest < ActionController::TestCase
|
|||
result = amf_result("/1")
|
||||
|
||||
assert_equal 2, result.size
|
||||
assert_equal -2, result[0]
|
||||
assert_equal(-2, result[0])
|
||||
assert_match(/Node is not in the world/, result[1])
|
||||
end
|
||||
|
||||
|
|
@ -966,8 +966,8 @@ class AmfControllerTest < ActionController::TestCase
|
|||
assert_equal 8, result.size
|
||||
assert_equal 0, result[0]
|
||||
assert_equal "", result[1]
|
||||
assert_equal -1, result[2]
|
||||
assert_not_equal -1, result[3]
|
||||
assert_equal(-1, result[2])
|
||||
assert_not_equal(-1, result[3])
|
||||
assert_equal({}, result[4])
|
||||
assert_equal 1, result[5]
|
||||
assert_equal({}, result[6])
|
||||
|
|
@ -988,8 +988,8 @@ class AmfControllerTest < ActionController::TestCase
|
|||
assert_equal 8, result.size
|
||||
assert_equal 0, result[0]
|
||||
assert_equal "", result[1]
|
||||
assert_equal -1, result[2]
|
||||
assert_not_equal -1, result[3]
|
||||
assert_equal(-1, result[2])
|
||||
assert_not_equal(-1, result[3])
|
||||
assert_equal({}, result[4])
|
||||
assert_equal 1, result[5]
|
||||
assert_equal({}, result[6])
|
||||
|
|
@ -1011,8 +1011,8 @@ class AmfControllerTest < ActionController::TestCase
|
|||
assert_equal 8, result.size
|
||||
assert_equal 0, result[0]
|
||||
assert_equal "", result[1]
|
||||
assert_equal -1, result[2]
|
||||
assert_not_equal -1, result[3]
|
||||
assert_equal(-1, result[2])
|
||||
assert_not_equal(-1, result[3])
|
||||
assert_equal({ "-1" => new_node_id }, result[4])
|
||||
assert_equal 1, result[5]
|
||||
assert_equal({ new_node_id.to_s => 1, d.to_s => 2 }, result[6])
|
||||
|
|
@ -1193,7 +1193,7 @@ class AmfControllerTest < ActionController::TestCase
|
|||
result = amf_result("/1")
|
||||
|
||||
assert_equal 2, result.size
|
||||
assert_equal -1, result[0]
|
||||
assert_equal(-1, result[0])
|
||||
assert_match(/Way #{way.id} is still used/, result[1])
|
||||
|
||||
new_way = Way.find(way.id)
|
||||
|
|
@ -1225,8 +1225,8 @@ class AmfControllerTest < ActionController::TestCase
|
|||
assert_equal 5, result.size
|
||||
assert_equal 0, result[0]
|
||||
assert_equal "", result[1]
|
||||
assert_equal -1, result[2]
|
||||
assert_not_equal -1, result[3]
|
||||
assert_equal(-1, result[2])
|
||||
assert_not_equal(-1, result[3])
|
||||
assert_equal 1, result[4]
|
||||
|
||||
new_relation = Relation.find(new_relation_id)
|
||||
|
|
@ -1307,7 +1307,7 @@ class AmfControllerTest < ActionController::TestCase
|
|||
result = amf_result("/1")
|
||||
|
||||
assert_equal 2, result.size
|
||||
assert_equal -1, result[0]
|
||||
assert_equal(-1, result[0])
|
||||
assert_match(/relation #{relation.id} is used in/, result[1])
|
||||
|
||||
new_relation = Relation.find(relation.id)
|
||||
|
|
@ -1404,7 +1404,7 @@ class AmfControllerTest < ActionController::TestCase
|
|||
result = amf_result("/1")
|
||||
|
||||
assert_equal 2, result.size
|
||||
assert_equal -2, result[0]
|
||||
assert_equal(-2, result[0])
|
||||
assert_equal "The user doesn't own that changeset", result[1]
|
||||
|
||||
cs = Changeset.find(cs_id)
|
||||
|
|
|
|||
|
|
@ -469,9 +469,9 @@ CHANGESET
|
|||
new_rel_id = doc.find("//diffResult/relation").first["new_id"].to_i
|
||||
|
||||
# check the old IDs are all present and negative one
|
||||
assert_equal -1, doc.find("//diffResult/node").first["old_id"].to_i
|
||||
assert_equal -1, doc.find("//diffResult/way").first["old_id"].to_i
|
||||
assert_equal -1, doc.find("//diffResult/relation").first["old_id"].to_i
|
||||
assert_equal(-1, doc.find("//diffResult/node").first["old_id"].to_i)
|
||||
assert_equal(-1, doc.find("//diffResult/way").first["old_id"].to_i)
|
||||
assert_equal(-1, doc.find("//diffResult/relation").first["old_id"].to_i)
|
||||
|
||||
# check the versions are present and equal one
|
||||
assert_equal 1, doc.find("//diffResult/node").first["new_version"].to_i
|
||||
|
|
|
|||
|
|
@ -168,8 +168,8 @@ class BoundingBoxTest < ActiveSupport::TestCase
|
|||
@bad_negative_boundary_bbox.each do |bbox_string|
|
||||
bbox = BoundingBox.from_bbox_params(:bbox => bbox_string)
|
||||
array = bbox.to_a
|
||||
assert_equal -180, [array[0], array[2]].min
|
||||
assert_equal -90, [array[1], array[3]].min
|
||||
assert_equal(-180, [array[0], array[2]].min)
|
||||
assert_equal(-90, [array[1], array[3]].min)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ class CountryTest < ActiveSupport::TestCase
|
|||
gb = Country.find("GB")
|
||||
assert_not_nil gb
|
||||
assert_equal "GB", gb.code
|
||||
assert_equal -8.623555, gb.min_lon
|
||||
assert_equal(-8.623555, gb.min_lon)
|
||||
assert_equal 59.360249, gb.max_lat
|
||||
assert_equal 1.759, gb.max_lon
|
||||
assert_equal 49.906193, gb.min_lat
|
||||
|
|
@ -16,9 +16,9 @@ class CountryTest < ActiveSupport::TestCase
|
|||
assert_not_nil au
|
||||
assert_equal "AU", au.code
|
||||
assert_equal 112.911057, au.min_lon
|
||||
assert_equal -10.062805, au.max_lat
|
||||
assert_equal(-10.062805, au.max_lat)
|
||||
assert_equal 153.639252, au.max_lon
|
||||
assert_equal -43.64397, au.min_lat
|
||||
assert_equal(-43.64397, au.min_lat)
|
||||
end
|
||||
|
||||
def test_xx
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue