X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a32333ba12bb1fed2ca217e7994cbad0a3127dd2..62346c7e88901df3ca21afc142cab00f6fb6ae38:/test/controllers/trace_controller_test.rb diff --git a/test/controllers/trace_controller_test.rb b/test/controllers/trace_controller_test.rb index 3888b1294..85644b663 100644 --- a/test/controllers/trace_controller_test.rb +++ b/test/controllers/trace_controller_test.rb @@ -166,27 +166,48 @@ class TraceControllerTest < ActionController::TestCase ) end - # Check that the list of changesets is displayed + # Check that the list of traces is displayed def test_list + # The fourth test below is surpisingly sensitive to timestamp ordering when the timestamps are equal. + trace_a = create(:trace, :visibility => "public", :timestamp => 4.seconds.ago) do |trace| + create(:tracetag, :trace => trace, :tag => "London") + end + trace_b = create(:trace, :visibility => "public", :timestamp => 3.seconds.ago) do |trace| + create(:tracetag, :trace => trace, :tag => "Birmingham") + end + trace_c = create(:trace, :visibility => "private", :user => users(:public_user), :timestamp => 2.seconds.ago) do |trace| + create(:tracetag, :trace => trace, :tag => "London") + end + trace_d = create(:trace, :visibility => "private", :user => users(:public_user), :timestamp => 1.second.ago) do |trace| + create(:tracetag, :trace => trace, :tag => "Birmingham") + end + # First with the public list get :list - check_trace_list Trace.visible_to_all + check_trace_list [trace_b, trace_a] # Restrict traces to those with a given tag get :list, :tag => "London" - check_trace_list Trace.tagged("London").visible_to_all + check_trace_list [trace_a] # Should see more when we are logged in get :list, {}, { :user => users(:public_user).id } - check_trace_list Trace.visible_to(users(:public_user).id) + check_trace_list [trace_d, trace_c, trace_b, trace_a] # Again, we should see more when we are logged in get :list, { :tag => "London" }, { :user => users(:public_user).id } - check_trace_list Trace.tagged("London").visible_to(users(:public_user).id) + check_trace_list [trace_c, trace_a] end # Check that I can get mine def test_list_mine + create(:trace, :visibility => "public") do |trace| + create(:tracetag, :trace => trace, :tag => "Birmingham") + end + trace_b = create(:trace, :visibility => "private", :user => users(:public_user)) do |trace| + create(:tracetag, :trace => trace, :tag => "London") + end + # First try to get it when not logged in get :mine assert_redirected_to :controller => "user", :action => "login", :referer => "/traces/mine" @@ -197,30 +218,36 @@ class TraceControllerTest < ActionController::TestCase # Fetch the actual list get :list, { :display_name => users(:public_user).display_name }, { :user => users(:public_user).id } - check_trace_list users(:public_user).traces + check_trace_list [trace_b] end - # Check the list of changesets for a specific user + # Check the list of traces for a specific user def test_list_user + create(:trace) + trace_b = create(:trace, :visibility => "public", :user => users(:public_user)) + trace_c = create(:trace, :visibility => "private", :user => users(:public_user)) do |trace| + create(:tracetag, :trace => trace, :tag => "London") + end + # Test a user with no traces get :list, :display_name => users(:second_public_user).display_name - check_trace_list users(:second_public_user).traces.visible_to_all + check_trace_list [] # Test a user with some traces - should see only public ones get :list, :display_name => users(:public_user).display_name - check_trace_list users(:public_user).traces.visible_to_all + check_trace_list [trace_b] # Should still see only public ones when authenticated as another user get :list, { :display_name => users(:public_user).display_name }, { :user => users(:normal_user).id } - check_trace_list users(:public_user).traces.visible_to_all + check_trace_list [trace_b] # Should see all traces when authenticated as the target user get :list, { :display_name => users(:public_user).display_name }, { :user => users(:public_user).id } - check_trace_list users(:public_user).traces + check_trace_list [trace_c, trace_b] - # Should only see traces with the correct tag when a tag is specified + # # Should only see traces with the correct tag when a tag is specified get :list, { :display_name => users(:public_user).display_name, :tag => "London" }, { :user => users(:public_user).id } - check_trace_list users(:public_user).traces.tagged("London") + check_trace_list [trace_c] # Should get an error if the user does not exist get :list, :display_name => "UnknownUser" @@ -285,6 +312,8 @@ class TraceControllerTest < ActionController::TestCase # Test viewing a trace that doesn't exist def test_view_not_found + deleted_trace_file = create(:trace, :deleted) + # First with no auth get :view, :display_name => users(:public_user).display_name, :id => 0 assert_response :redirect @@ -296,7 +325,6 @@ class TraceControllerTest < ActionController::TestCase assert_redirected_to :action => :list # And finally we should not be able to view a deleted trace - deleted_trace_file = create(:trace, :deleted) get :view, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user).id } assert_response :redirect assert_redirected_to :action => :list @@ -305,7 +333,7 @@ class TraceControllerTest < ActionController::TestCase # Test downloading a trace def test_data public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user)) - Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/1.gpx" do + Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/a.gpx" do # First with no auth, which should work since the trace is public get :data, :display_name => users(:normal_user).display_name, :id => public_trace_file.id check_trace_data public_trace_file @@ -323,7 +351,7 @@ class TraceControllerTest < ActionController::TestCase # Test downloading a compressed trace def test_data_compressed identifiable_trace_file = create(:trace, :visibility => "identifiable") - Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/4.gpx" do + Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/d.gpx" do # First get the data as is get :data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id check_trace_data identifiable_trace_file, "application/x-gzip", "gpx.gz" @@ -341,7 +369,7 @@ class TraceControllerTest < ActionController::TestCase # Check an anonymous trace can't be downloaded by another user def test_data_anon anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user)) - Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/2.gpx" do + Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/b.gpx" do # First with no auth get :data, :display_name => users(:public_user).display_name, :id => anon_trace_file.id assert_response :not_found @@ -358,6 +386,8 @@ class TraceControllerTest < ActionController::TestCase # Test downloading a trace that doesn't exist def test_data_not_found + deleted_trace_file = create(:trace, :deleted) + # First with no auth and a trace that has never existed get :data, :display_name => users(:public_user).display_name, :id => 0 assert_response :not_found @@ -367,7 +397,6 @@ class TraceControllerTest < ActionController::TestCase assert_response :not_found # Now with a trace that has been deleted - deleted_trace_file = create(:trace, :deleted) get :data, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user).id } assert_response :not_found end @@ -375,7 +404,7 @@ class TraceControllerTest < ActionController::TestCase # Test downloading the picture for a trace def test_picture public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user)) - Trace.stub_any_instance :large_picture_name, "#{GPX_TRACE_DIR}/1.gif" do + Trace.stub_any_instance :large_picture_name, "#{GPX_TRACE_DIR}/a.gif" do # First with no auth, which should work since the trace is public get :picture, :display_name => users(:normal_user).display_name, :id => public_trace_file.id check_trace_picture public_trace_file @@ -393,7 +422,7 @@ class TraceControllerTest < ActionController::TestCase # Check the picture for an anonymous trace can't be downloaded by another user def test_picture_anon anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user)) - Trace.stub_any_instance :large_picture_name, "#{GPX_TRACE_DIR}/2.gif" do + Trace.stub_any_instance :large_picture_name, "#{GPX_TRACE_DIR}/b.gif" do # First with no auth get :picture, :display_name => users(:public_user).display_name, :id => anon_trace_file.id assert_response :forbidden @@ -427,7 +456,7 @@ class TraceControllerTest < ActionController::TestCase # Test downloading the icon for a trace def test_icon public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user)) - Trace.stub_any_instance :icon_picture_name, "#{GPX_TRACE_DIR}/1_icon.gif" do + Trace.stub_any_instance :icon_picture_name, "#{GPX_TRACE_DIR}/a_icon.gif" do # First with no auth, which should work since the trace is public get :icon, :display_name => users(:normal_user).display_name, :id => public_trace_file.id check_trace_icon public_trace_file @@ -445,7 +474,7 @@ class TraceControllerTest < ActionController::TestCase # Check the icon for an anonymous trace can't be downloaded by another user def test_icon_anon anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user)) - Trace.stub_any_instance :icon_picture_name, "#{GPX_TRACE_DIR}/2_icon.gif" do + Trace.stub_any_instance :icon_picture_name, "#{GPX_TRACE_DIR}/b_icon.gif" do # First with no auth get :icon, :display_name => users(:public_user).display_name, :id => anon_trace_file.id assert_response :forbidden @@ -507,7 +536,7 @@ class TraceControllerTest < ActionController::TestCase # Test creating a trace def test_create_post public_trace_file = create(:trace, :visibility => "public") - public_trace_file.stub :trace_name, "#{GPX_TRACE_DIR}/1.gpx" do + public_trace_file.stub :trace_name, "#{GPX_TRACE_DIR}/a.gpx" do # Get file to use file = Rack::Test::UploadedFile.new(public_trace_file.trace_name, "application/gpx+xml") @@ -523,7 +552,7 @@ class TraceControllerTest < ActionController::TestCase assert_redirected_to :action => :list, :display_name => users(:public_user).display_name assert_match /file has been uploaded/, flash[:notice] trace = Trace.order(:id => :desc).first - assert_equal "1.gpx", trace.name + assert_equal "a.gpx", trace.name assert_equal "New Trace", trace.description assert_equal %w(new trace), trace.tags.order(:tag).collect(&:tag) assert_equal "trackable", trace.visibility @@ -683,7 +712,7 @@ class TraceControllerTest < ActionController::TestCase # Test downloading a trace through the api def test_api_data public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user)) - Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/1.gpx" do + Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/a.gpx" do # First with no auth get :api_data, :display_name => users(:normal_user).display_name, :id => public_trace_file.id assert_response :unauthorized @@ -703,7 +732,7 @@ class TraceControllerTest < ActionController::TestCase # Test downloading a compressed trace through the api def test_api_data_compressed identifiable_trace_file = create(:trace, :visibility => "identifiable", :user => users(:public_user)) - Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/4.gpx" do + Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/d.gpx" do # Authenticate as the owner of the trace we will be using basic_authorization(users(:public_user).display_name, "test") @@ -724,7 +753,7 @@ class TraceControllerTest < ActionController::TestCase # Check an anonymous trace can't be downloaded by another user through the api def test_api_data_anon anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user)) - Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/2.gpx" do + Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/b.gpx" do # First with no auth get :api_data, :display_name => users(:public_user).display_name, :id => anon_trace_file.id assert_response :unauthorized @@ -762,7 +791,7 @@ class TraceControllerTest < ActionController::TestCase # Test creating a trace through the api def test_api_create public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user)) - public_trace_file.stub :trace_name, "#{GPX_TRACE_DIR}/1.gpx" do + public_trace_file.stub :trace_name, "#{GPX_TRACE_DIR}/a.gpx" do # Get file to use file = Rack::Test::UploadedFile.new(public_trace_file.trace_name, "application/gpx+xml") @@ -777,7 +806,7 @@ class TraceControllerTest < ActionController::TestCase post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable" assert_response :success trace = Trace.find(response.body.to_i) - assert_equal "1.gpx", trace.name + assert_equal "a.gpx", trace.name assert_equal "New Trace", trace.description assert_equal %w(new trace), trace.tags.order(:tag).collect(&:tag) assert_equal "trackable", trace.visibility @@ -795,7 +824,7 @@ class TraceControllerTest < ActionController::TestCase post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :public => 1 assert_response :success trace = Trace.find(response.body.to_i) - assert_equal "1.gpx", trace.name + assert_equal "a.gpx", trace.name assert_equal "New Trace", trace.description assert_equal %w(new trace), trace.tags.order(:tag).collect(&:tag) assert_equal "public", trace.visibility @@ -813,7 +842,7 @@ class TraceControllerTest < ActionController::TestCase post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :public => 0 assert_response :success trace = Trace.find(response.body.to_i) - assert_equal "1.gpx", trace.name + assert_equal "a.gpx", trace.name assert_equal "New Trace", trace.description assert_equal %w(new trace), trace.tags.order(:tag).collect(&:tag) assert_equal "private", trace.visibility @@ -830,7 +859,7 @@ class TraceControllerTest < ActionController::TestCase deleted_trace_file = create(:trace, :deleted, :user => users(:public_user)) anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user)) - public_trace_file.stub :trace_name, "#{GPX_TRACE_DIR}/1.gpx" do + public_trace_file.stub :trace_name, "#{GPX_TRACE_DIR}/a.gpx" do # First with no auth content public_trace_file.to_xml put :api_update, :id => public_trace_file.id @@ -934,10 +963,10 @@ class TraceControllerTest < ActionController::TestCase assert_response :success assert_template "list" - if traces.count > 0 + if !traces.empty? assert_select "table#trace_list tbody", :count => 1 do - assert_select "tr", :count => traces.visible.count do |rows| - traces.visible.order("timestamp DESC").zip(rows).each do |trace, row| + 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, "td", Regexp.new(Regexp.escape(trace.description))