X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2fabc46421f9e908ef6902ea7c4890a0032af446..e2e79ba549a7c2f668ccb9b0fab7d6245cb826c5:/test/controllers/traces_controller_test.rb diff --git a/test/controllers/traces_controller_test.rb b/test/controllers/traces_controller_test.rb index 48b5c457f..cd9f5f127 100644 --- a/test/controllers/traces_controller_test.rb +++ b/test/controllers/traces_controller_test.rb @@ -1,22 +1,6 @@ require "test_helper" class TracesControllerTest < ActionDispatch::IntegrationTest - # Use temporary directories with unique names for each test - # This allows the tests to be run in parallel. - def setup - @gpx_trace_dir_orig = Settings.gpx_trace_dir - @gpx_image_dir_orig = Settings.gpx_image_dir - Settings.gpx_trace_dir = Dir.mktmpdir("trace", Rails.root.join("test/gpx")) - Settings.gpx_image_dir = Dir.mktmpdir("image", Rails.root.join("test/gpx")) - end - - def teardown - FileUtils.remove_dir(Settings.gpx_trace_dir) - FileUtils.remove_dir(Settings.gpx_image_dir) - Settings.gpx_trace_dir = @gpx_trace_dir_orig - Settings.gpx_image_dir = @gpx_image_dir_orig - end - ## # test all routes which lead to this controller def test_routes @@ -772,7 +756,7 @@ class TracesControllerTest < ActionDispatch::IntegrationTest assert_template "index" if traces.empty? - assert_select "h4", /Nothing here yet/ + assert_select "h2", /Nothing here yet/ else assert_select "table#trace_list tbody", :count => 1 do assert_select "tr", :count => traces.length do |rows|