X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/11e97b3edb057f6f449209ca2afd169feda229a4..0654be27f9826e6cca4b88c03b39517214612351:/test/controllers/traces_controller_test.rb diff --git a/test/controllers/traces_controller_test.rb b/test/controllers/traces_controller_test.rb index fd91fa617..36bee9c95 100644 --- a/test/controllers/traces_controller_test.rb +++ b/test/controllers/traces_controller_test.rb @@ -616,7 +616,7 @@ class TracesControllerTest < ActionDispatch::IntegrationTest session_for(user) post traces_path, :params => { :trace => { :gpx_file => file, :description => "", :tagstring => "new,trace", :visibility => "trackable" } } assert_template :new - assert_match "Description is too short (minimum is 1 character)", response.body + assert_match "is too short (minimum is 1 character)", response.body end # Test fetching the edit page for a trace using GET @@ -761,7 +761,9 @@ class TracesControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_template "index" - if !traces.empty? + if traces.empty? + assert_select "h4", /Nothing here yet/ + else assert_select "table#trace_list tbody", :count => 1 do assert_select "tr", :count => traces.length do |rows| traces.zip(rows).each do |trace, row| @@ -772,8 +774,6 @@ class TracesControllerTest < ActionDispatch::IntegrationTest end end end - else - assert_select "h4", /Nothing here yet/ end end