X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/979a474c682c894125e0fe9ddfc5bae566ad895c..7a1615bc55aee72dd03a5dd43c08b4f13f669f06:/test/controllers/traces_controller_test.rb diff --git a/test/controllers/traces_controller_test.rb b/test/controllers/traces_controller_test.rb index 0f9a9c1db..7765bde46 100644 --- a/test/controllers/traces_controller_test.rb +++ b/test/controllers/traces_controller_test.rb @@ -1,5 +1,4 @@ require "test_helper" -require "minitest/mock" class TracesControllerTest < ActionController::TestCase # Use temporary directories with unique names for each test @@ -566,7 +565,7 @@ class TracesControllerTest < ActionController::TestCase assert_equal "New Trace", trace.description assert_equal %w[new trace], trace.tags.order(:tag).collect(&:tag) assert_equal "trackable", trace.visibility - assert_equal false, trace.inserted + assert_not trace.inserted assert_equal File.new(fixture).read, File.new(trace.trace_name).read trace.destroy assert_equal "trackable", user.preferences.where(:k => "gps.trace.visibility").first.v @@ -674,7 +673,7 @@ class TracesControllerTest < ActionController::TestCase assert_response :redirect assert_redirected_to :action => :index, :display_name => public_trace_file.user.display_name trace = Trace.find(public_trace_file.id) - assert_equal false, trace.visible + assert_not trace.visible # Finally with a trace that is destroyed by an admin public_trace_file = create(:trace, :visibility => "public") @@ -684,7 +683,7 @@ class TracesControllerTest < ActionController::TestCase assert_response :redirect assert_redirected_to :action => :index, :display_name => public_trace_file.user.display_name trace = Trace.find(public_trace_file.id) - assert_equal false, trace.visible + assert_not trace.visible end private @@ -722,7 +721,7 @@ class TracesControllerTest < ActionController::TestCase assert_select "tr", :count => traces.length do |rows| traces.zip(rows).each do |trace, row| assert_select row, "a", Regexp.new(Regexp.escape(trace.name)) - assert_select row, "span.trace_summary", Regexp.new(Regexp.escape("(#{trace.size} points)")) if trace.inserted? + assert_select row, "span", Regexp.new(Regexp.escape("(#{trace.size} points)")) if trace.inserted? assert_select row, "td", Regexp.new(Regexp.escape(trace.description)) assert_select row, "td", Regexp.new(Regexp.escape("by #{trace.user.display_name}")) end