cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix rubocop warnings

Browse source
This commit is contained in:
Tom Hughes 2017-06-01 23:46:53 +01:00
parent 95eda2d381
commit 5b33f3f8e3
61 changed files with 547 additions and 541 deletions
Download patch file Download diff file Expand all files Collapse all files

28
test/controllers/api_controller_test.rb
View file

@ -4,14 +4,14 @@ require "api_controller"
class ApiControllerTest < ActionController::TestCase
def setup
super
@badbigbbox = %w(-0.1,-0.1,1.1,1.1 10,10,11,11)
@badmalformedbbox = %w(-0.1 hello
10N2W10.1N2.1W)
@badlatmixedbbox = %w(0,0.1,0.1,0 -0.1,80,0.1,70 0.24,54.34,0.25,54.33)
@badlonmixedbbox = %w(80,-0.1,70,0.1 54.34,0.24,54.33,0.25)
@badbigbbox = %w[-0.1,-0.1,1.1,1.1 10,10,11,11]
@badmalformedbbox = %w[-0.1 hello
10N2W10.1N2.1W]
@badlatmixedbbox = %w[0,0.1,0.1,0 -0.1,80,0.1,70 0.24,54.34,0.25,54.33]
@badlonmixedbbox = %w[80,-0.1,70,0.1 54.34,0.24,54.33,0.25]
# @badlatlonoutboundsbbox = %w{ 191,-0.1,193,0.1 -190.1,89.9,-190,90 }
@goodbbox = %w(-0.1,-0.1,0.1,0.1 51.1,-0.1,51.2,0
-0.1,%20-0.1,%200.1,%200.1 -0.1edcd,-0.1d,0.1,0.1 -0.1E,-0.1E,0.1S,0.1N S0.1,W0.1,N0.1,E0.1)
@goodbbox = %w[-0.1,-0.1,0.1,0.1 51.1,-0.1,51.2,0
-0.1,%20-0.1,%200.1,%200.1 -0.1edcd,-0.1d,0.1,0.1 -0.1E,-0.1E,0.1S,0.1N S0.1,W0.1,N0.1,E0.1]
# That last item in the goodbbox really shouldn't be there, as the API should
# reall reject it, however this is to test to see if the api changes.
end
@ -217,7 +217,7 @@ class ApiControllerTest < ActionController::TestCase
end
def test_map_without_bbox
%w(trackpoints map).each do |tq|
%w[trackpoints map].each do |tq|
get tq
assert_response :bad_request
assert_equal "The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat", @response.body, "A bbox param was expected"
@ -238,7 +238,7 @@ class ApiControllerTest < ActionController::TestCase
def test_bbox_too_big
@badbigbbox.each do |bbox|
%w(trackpoints map).each do |tq|
%w[trackpoints map].each do |tq|
get tq, :bbox => bbox
assert_response :bad_request, "The bbox:#{bbox} was expected to be too big"
assert_equal "The maximum bbox size is #{MAX_REQUEST_AREA}, and your request was too large. Either request a smaller area, or use planet.osm", @response.body, "bbox: #{bbox}"
@ -248,7 +248,7 @@ class ApiControllerTest < ActionController::TestCase
def test_bbox_malformed
@badmalformedbbox.each do |bbox|
%w(trackpoints map).each do |tq|
%w[trackpoints map].each do |tq|
get tq, :bbox => bbox
assert_response :bad_request, "The bbox:#{bbox} was expected to be malformed"
assert_equal "The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat", @response.body, "bbox: #{bbox}"
@ -258,7 +258,7 @@ class ApiControllerTest < ActionController::TestCase
def test_bbox_lon_mixedup
@badlonmixedbbox.each do |bbox|
%w(trackpoints map).each do |tq|
%w[trackpoints map].each do |tq|
get tq, :bbox => bbox
assert_response :bad_request, "The bbox:#{bbox} was expected to have the longitude mixed up"
assert_equal "The minimum longitude must be less than the maximum longitude, but it wasn't", @response.body, "bbox: #{bbox}"
@ -268,7 +268,7 @@ class ApiControllerTest < ActionController::TestCase
def test_bbox_lat_mixedup
@badlatmixedbbox.each do |bbox|
%w(trackpoints map).each do |tq|
%w[trackpoints map].each do |tq|
get tq, :bbox => bbox
assert_response :bad_request, "The bbox:#{bbox} was expected to have the latitude mixed up"
assert_equal "The minimum latitude must be less than the maximum latitude, but it wasn't", @response.body, "bbox: #{bbox}"
@ -333,7 +333,7 @@ class ApiControllerTest < ActionController::TestCase
end
def test_changes_zoom_invalid
zoom_to_test = %w(p -1 0 17 one two)
zoom_to_test = %w[p -1 0 17 one two]
zoom_to_test.each do |zoom|
get :changes, :zoom => zoom
assert_response :bad_request
@ -354,7 +354,7 @@ class ApiControllerTest < ActionController::TestCase
end
def test_changes_hours_invalid
invalid = %w(-21 335 -1 0 25 26 100 one two three ping pong :)
invalid = %w[-21 335 -1 0 25 26 100 one two three ping pong :]
invalid.each do |hour|
get :changes, :hours => hour
assert_response :bad_request, "Problem with the hour: #{hour}"