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

Refactor more controller tests

Browse source
This commit is contained in:
Andy Allan 2020-04-29 17:28:42 +02:00
parent 11e97b3edb
commit e765a6691b
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/controllers/api/capabilities_controller_test.rb
View file

@ -1,7 +1,7 @@
require "test_helper"
module Api
class CapabilitiesControllerTest < ActionController::TestCase
class CapabilitiesControllerTest < ActionDispatch::IntegrationTest
##
# test all routes which lead to this controller
def test_routes
@ -16,7 +16,7 @@ module Api
end
def test_capabilities
get :show
get api_capabilities_path
assert_response :success
assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", :count => 1 do
assert_select "api", :count => 1 do

18
test/controllers/api/changes_controller_test.rb
View file

@ -1,7 +1,7 @@
require "test_helper"
module Api
class ChangesControllerTest < ActionController::TestCase
class ChangesControllerTest < ActionDispatch::IntegrationTest
##
# test all routes which lead to this controller
def test_routes
@ -28,7 +28,7 @@ module Api
create(:node, :timestamp => Time.utc(2008, 1, 1, 0, 0, 0), :lat => 7, :lon => 7)
travel_to Time.utc(2010, 4, 3, 10, 55, 0) do
get :index
get changes_path
assert_response :success
now = Time.now.getutc
hourago = now - 1.hour
@ -40,7 +40,7 @@ module Api
end
travel_to Time.utc(2007, 1, 1, 0, 30, 0) do
get :index
get changes_path
assert_response :success
# print @response.body
# As we have loaded the fixtures, we can assume that there are some
@ -58,7 +58,7 @@ module Api
def test_changes_zoom_invalid
zoom_to_test = %w[p -1 0 17 one two]
zoom_to_test.each do |zoom|
get :index, :params => { :zoom => zoom }
get changes_path(:zoom => zoom)
assert_response :bad_request
assert_equal @response.body, "Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours"
end
@ -66,7 +66,7 @@ module Api
def test_changes_zoom_valid
1.upto(16) do |zoom|
get :index, :params => { :zoom => zoom }
get changes_path(:zoom => zoom)
assert_response :success
# NOTE: there was a test here for the timing, but it was too sensitive to be a good test
# and it was annoying.
@ -79,7 +79,7 @@ module Api
def test_changes_hours_invalid
invalid = %w[-21 335 -1 0 25 26 100 one two three ping pong :]
invalid.each do |hour|
get :index, :params => { :hours => hour }
get changes_path(:hours => hour)
assert_response :bad_request, "Problem with the hour: #{hour}"
assert_equal @response.body, "Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours", "Problem with the hour: #{hour}."
end
@ -87,19 +87,19 @@ module Api
def test_changes_hours_valid
1.upto(24) do |hour|
get :index, :params => { :hours => hour }
get changes_path(:hours => hour)
assert_response :success
end
end
def test_changes_start_end_invalid
get :index, :params => { :start => "2010-04-03 10:55:00", :end => "2010-04-03 09:55:00" }
get changes_path(:start => "2010-04-03 10:55:00", :end => "2010-04-03 09:55:00")
assert_response :bad_request
assert_equal @response.body, "Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours"
end
def test_changes_start_end_valid
get :index, :params => { :start => "2010-04-03 09:55:00", :end => "2010-04-03 10:55:00" }
get changes_path(:start => "2010-04-03 09:55:00", :end => "2010-04-03 10:55:00")
assert_response :success
end
end