X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0bdf29f10bd290cfb6943e6b64a027927ebb8248..f0bacf837d2deeabfc9db11de89d7aa238f0b63a:/test/controllers/trace_controller_test.rb diff --git a/test/controllers/trace_controller_test.rb b/test/controllers/trace_controller_test.rb index b238df04c..9821352e1 100644 --- a/test/controllers/trace_controller_test.rb +++ b/test/controllers/trace_controller_test.rb @@ -2,8 +2,6 @@ require "test_helper" require "minitest/mock" class TraceControllerTest < ActionController::TestCase - fixtures :users - def setup @gpx_trace_dir = Object.send("remove_const", "GPX_TRACE_DIR") Object.const_set("GPX_TRACE_DIR", Rails.root.join("test", "gpx", "traces")) @@ -159,10 +157,6 @@ class TraceControllerTest < ActionController::TestCase { :path => "/trace/1/edit", :method => :post }, { :controller => "trace", :action => "edit", :id => "1" } ) - assert_routing( - { :path => "/trace/1/edit", :method => :patch }, - { :controller => "trace", :action => "edit", :id => "1" } - ) assert_routing( { :path => "/trace/1/delete", :method => :post }, { :controller => "trace", :action => "delete", :id => "1" } @@ -171,6 +165,7 @@ class TraceControllerTest < ActionController::TestCase # Check that the list of traces is displayed def test_list + user = create(:user) # 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") @@ -178,10 +173,10 @@ class TraceControllerTest < ActionController::TestCase 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| + trace_c = create(:trace, :visibility => "private", :user => 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| + trace_d = create(:trace, :visibility => "private", :user => user, :timestamp => 1.second.ago) do |trace| create(:tracetag, :trace => trace, :tag => "Birmingham") end @@ -194,20 +189,21 @@ class TraceControllerTest < ActionController::TestCase check_trace_list [trace_a] # Should see more when we are logged in - get :list, {}, { :user => users(:public_user).id } + get :list, {}, { :user => user } 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 } + get :list, { :tag => "London" }, { :user => user } check_trace_list [trace_c, trace_a] end # Check that I can get mine def test_list_mine + user = create(:user) 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| + trace_b = create(:trace, :visibility => "private", :user => user) do |trace| create(:tracetag, :trace => trace, :tag => "London") end @@ -216,40 +212,43 @@ class TraceControllerTest < ActionController::TestCase assert_redirected_to :controller => "user", :action => "login", :referer => "/traces/mine" # Now try when logged in - get :mine, {}, { :user => users(:public_user).id } - assert_redirected_to :controller => "trace", :action => "list", :display_name => users(:public_user).display_name + get :mine, {}, { :user => user } + assert_redirected_to :controller => "trace", :action => "list", :display_name => user.display_name # Fetch the actual list - get :list, { :display_name => users(:public_user).display_name }, { :user => users(:public_user).id } + get :list, { :display_name => user.display_name }, { :user => user } check_trace_list [trace_b] end # Check the list of traces for a specific user def test_list_user + user = create(:user) + second_user = create(:user) + third_user = create(: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| + trace_b = create(:trace, :visibility => "public", :user => user) + trace_c = create(:trace, :visibility => "private", :user => 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 + get :list, :display_name => second_user.display_name check_trace_list [] - # Test a user with some traces - should see only public ones - get :list, :display_name => users(:public_user).display_name + # Test the user with the traces - should see only public ones + get :list, :display_name => user.display_name 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 } + get :list, { :display_name => user.display_name }, { :user => third_user } 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 } + get :list, { :display_name => user.display_name }, { :user => user } check_trace_list [trace_c, trace_b] # 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 } + get :list, { :display_name => user.display_name, :tag => "London" }, { :user => user } check_trace_list [trace_c] # Should get an error if the user does not exist @@ -260,6 +259,8 @@ class TraceControllerTest < ActionController::TestCase # Check that the rss loads def test_rss + user = create(:user) + # First with the public feed get :georss, :format => :rss check_trace_feed Trace.visible_to_all @@ -269,12 +270,12 @@ class TraceControllerTest < ActionController::TestCase check_trace_feed Trace.tagged("London").visible_to_all # Restrict traces to those for a given user - get :georss, :display_name => users(:public_user).display_name, :format => :rss - check_trace_feed users(:public_user).traces.visible_to_all + get :georss, :display_name => user.display_name, :format => :rss + check_trace_feed user.traces.visible_to_all # Restrict traces to those for a given user with a tiven tag - get :georss, :display_name => users(:public_user).display_name, :tag => "Birmingham", :format => :rss - check_trace_feed users(:public_user).traces.tagged("Birmingham").visible_to_all + get :georss, :display_name => user.display_name, :tag => "Birmingham", :format => :rss + check_trace_feed user.traces.tagged("Birmingham").visible_to_all end # Test viewing a trace @@ -282,34 +283,34 @@ class TraceControllerTest < ActionController::TestCase public_trace_file = create(:trace, :visibility => "public") # First with no auth, which should work since the trace is public - get :view, :display_name => users(:normal_user).display_name, :id => public_trace_file.id + get :view, :display_name => public_trace_file.user.display_name, :id => public_trace_file.id check_trace_view public_trace_file # Now with some other user, which should work since the trace is public - get :view, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user).id } + get :view, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => create(:user) } check_trace_view public_trace_file # And finally we should be able to do it with the owner of the trace - get :view, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user).id } + get :view, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => public_trace_file.user } check_trace_view public_trace_file end # Check an anonymous trace can't be viewed by another user def test_view_anon - anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user)) + anon_trace_file = create(:trace, :visibility => "private") # First with no auth - get :view, :display_name => users(:public_user).display_name, :id => anon_trace_file.id + get :view, :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id assert_response :redirect assert_redirected_to :action => :list # Now with some other user, which should not work since the trace is anon - get :view, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:normal_user).id } + get :view, { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, { :user => create(:user) } assert_response :redirect assert_redirected_to :action => :list # And finally we should be able to do it with the owner of the trace - get :view, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:public_user).id } + get :view, { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, { :user => anon_trace_file.user } check_trace_view anon_trace_file end @@ -317,36 +318,31 @@ class TraceControllerTest < ActionController::TestCase 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 + # First with a trace that has never existed + get :view, :display_name => create(:user).display_name, :id => 0 assert_response :redirect assert_redirected_to :action => :list - # Now with some other user - get :view, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user).id } - assert_response :redirect - assert_redirected_to :action => :list - - # And finally we should not be able to view a deleted trace - get :view, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user).id } + # Now with a trace that has been deleted + get :view, { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, { :user => deleted_trace_file.user } assert_response :redirect assert_redirected_to :action => :list end # Test downloading a trace def test_data - public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user), :fixture => "a") + public_trace_file = create(:trace, :visibility => "public", :fixture => "a") # 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 + get :data, :display_name => public_trace_file.user.display_name, :id => public_trace_file.id check_trace_data public_trace_file # Now with some other user, which should work since the trace is public - get :data, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user).id } + get :data, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => create(:user) } check_trace_data public_trace_file # And finally we should be able to do it with the owner of the trace - get :data, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user).id } + get :data, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => public_trace_file.user } check_trace_data public_trace_file end @@ -355,32 +351,32 @@ class TraceControllerTest < ActionController::TestCase identifiable_trace_file = create(:trace, :visibility => "identifiable", :fixture => "d") # First get the data as is - get :data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id + get :data, :display_name => identifiable_trace_file.user.display_name, :id => identifiable_trace_file.id check_trace_data identifiable_trace_file, "application/x-gzip", "gpx.gz" # Now ask explicitly for XML format - get :data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id, :format => "xml" + get :data, :display_name => identifiable_trace_file.user.display_name, :id => identifiable_trace_file.id, :format => "xml" check_trace_data identifiable_trace_file, "application/xml", "xml" # Now ask explicitly for GPX format - get :data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id, :format => "gpx" + get :data, :display_name => identifiable_trace_file.user.display_name, :id => identifiable_trace_file.id, :format => "gpx" check_trace_data identifiable_trace_file end # 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), :fixture => "b") + anon_trace_file = create(:trace, :visibility => "private", :fixture => "b") # First with no auth - get :data, :display_name => users(:public_user).display_name, :id => anon_trace_file.id + get :data, :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id assert_response :not_found # Now with some other user, which shouldn't work since the trace is anon - get :data, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:normal_user).id } + get :data, { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, { :user => create(:user) } assert_response :not_found # And finally we should be able to do it with the owner of the trace - get :data, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:public_user).id } + get :data, { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, { :user => anon_trace_file.user } check_trace_data anon_trace_file end @@ -388,116 +384,106 @@ class TraceControllerTest < ActionController::TestCase 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 - - # Now with a trace that has never existed - get :data, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user).id } + # First with a trace that has never existed + get :data, :display_name => create(:user).display_name, :id => 0 assert_response :not_found # Now with a trace that has been deleted - get :data, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user).id } + get :data, { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, { :user => deleted_trace_file.user } assert_response :not_found end # Test downloading the picture for a trace def test_picture - public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user), :fixture => "a") + public_trace_file = create(:trace, :visibility => "public", :fixture => "a") # 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 + get :picture, :display_name => public_trace_file.user.display_name, :id => public_trace_file.id check_trace_picture public_trace_file # Now with some other user, which should work since the trace is public - get :picture, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user).id } + get :picture, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => create(:user) } check_trace_picture public_trace_file # And finally we should be able to do it with the owner of the trace - get :picture, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user).id } + get :picture, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => public_trace_file.user } check_trace_picture public_trace_file end # 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), :fixture => "b") + anon_trace_file = create(:trace, :visibility => "private", :fixture => "b") # First with no auth - get :picture, :display_name => users(:public_user).display_name, :id => anon_trace_file.id + get :picture, :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id assert_response :forbidden # Now with some other user, which shouldn't work since the trace is anon - get :picture, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:normal_user).id } + get :picture, { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, { :user => create(:user) } assert_response :forbidden # And finally we should be able to do it with the owner of the trace - get :picture, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:public_user).id } + get :picture, { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, { :user => anon_trace_file.user } check_trace_picture anon_trace_file end # Test downloading the picture for a trace that doesn't exist def test_picture_not_found - # First with no auth, which should work since the trace is public - get :picture, :display_name => users(:public_user).display_name, :id => 0 - assert_response :not_found + deleted_trace_file = create(:trace, :deleted) - # Now with some other user, which should work since the trace is public - get :picture, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user).id } + # First with a trace that has never existed + get :picture, :display_name => create(:user).display_name, :id => 0 assert_response :not_found - # And finally we should not be able to do it with a deleted trace - deleted_trace_file = create(:trace, :deleted) - get :picture, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user).id } + # Now with a trace that has been deleted + get :picture, { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, { :user => deleted_trace_file.user } assert_response :not_found end # Test downloading the icon for a trace def test_icon - public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user), :fixture => "a") + public_trace_file = create(:trace, :visibility => "public", :fixture => "a") # 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 + get :icon, :display_name => public_trace_file.user.display_name, :id => public_trace_file.id check_trace_icon public_trace_file # Now with some other user, which should work since the trace is public - get :icon, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user).id } + get :icon, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => create(:user) } check_trace_icon public_trace_file # And finally we should be able to do it with the owner of the trace - get :icon, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user).id } + get :icon, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => public_trace_file.user } check_trace_icon public_trace_file end # 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), :fixture => "b") + anon_trace_file = create(:trace, :visibility => "private", :fixture => "b") # First with no auth - get :icon, :display_name => users(:public_user).display_name, :id => anon_trace_file.id + get :icon, :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id assert_response :forbidden # Now with some other user, which shouldn't work since the trace is anon - get :icon, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:normal_user).id } + get :icon, { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, { :user => create(:user) } assert_response :forbidden # And finally we should be able to do it with the owner of the trace - get :icon, { :display_name => users(:public_user).display_name, :id => anon_trace_file.id }, { :user => users(:public_user).id } + get :icon, { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, { :user => anon_trace_file.user } check_trace_icon anon_trace_file end # Test downloading the icon for a trace that doesn't exist def test_icon_not_found - # First with no auth - get :icon, :display_name => users(:public_user).display_name, :id => 0 - assert_response :not_found + deleted_trace_file = create(:trace, :deleted) - # Now with some other user - get :icon, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user).id } + # First with a trace that has never existed + get :icon, :display_name => create(:user).display_name, :id => 0 assert_response :not_found - # And finally we should not be able to do it with a deleted trace - deleted_trace_file = create(:trace, :deleted) - get :icon, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user).id } + # Now with a trace that has been deleted + get :icon, { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, { :user => deleted_trace_file.user } assert_response :not_found end @@ -509,21 +495,24 @@ class TraceControllerTest < ActionController::TestCase assert_redirected_to :controller => :user, :action => :login, :referer => trace_create_path # Now authenticated as a user with gps.trace.visibility set - create(:user_preference, :user => users(:public_user), :k => "gps.trace.visibility", :v => "identifiable") - get :create, {}, { :user => users(:public_user).id } + user = create(:user) + create(:user_preference, :user => user, :k => "gps.trace.visibility", :v => "identifiable") + get :create, {}, { :user => user } assert_response :success assert_template :create assert_select "select#trace_visibility option[value=identifiable][selected]", 1 # Now authenticated as a user with gps.trace.public set - create(:user_preference, :user => users(:second_public_user), :k => "gps.trace.public", :v => "default") - get :create, {}, { :user => users(:second_public_user).id } + second_user = create(:user) + create(:user_preference, :user => second_user, :k => "gps.trace.public", :v => "default") + get :create, {}, { :user => second_user } assert_response :success assert_template :create assert_select "select#trace_visibility option[value=public][selected]", 1 # Now authenticated as a user with no preferences - get :create, {}, { :user => users(:normal_user).id } + third_user = create(:user) + get :create, {}, { :user => third_user } assert_response :success assert_template :create assert_select "select#trace_visibility option[value=private][selected]", 1 @@ -534,17 +523,18 @@ class TraceControllerTest < ActionController::TestCase # Get file to use fixture = Rails.root.join("test", "gpx", "fixtures", "a.gpx") file = Rack::Test::UploadedFile.new(fixture, "application/gpx+xml") + user = create(:user) # First with no auth post :create, :trace => { :gpx_file => file, :description => "New Trace", :tagstring => "new,trace", :visibility => "trackable" } assert_response :forbidden # Now authenticated - create(:user_preference, :user => users(:public_user), :k => "gps.trace.visibility", :v => "identifiable") - assert_not_equal "trackable", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v - post :create, { :trace => { :gpx_file => file, :description => "New Trace", :tagstring => "new,trace", :visibility => "trackable" } }, { :user => users(:public_user).id } + create(:user_preference, :user => user, :k => "gps.trace.visibility", :v => "identifiable") + assert_not_equal "trackable", user.preferences.where(:k => "gps.trace.visibility").first.v + post :create, { :trace => { :gpx_file => file, :description => "New Trace", :tagstring => "new,trace", :visibility => "trackable" } }, { :user => user } assert_response :redirect - assert_redirected_to :action => :list, :display_name => users(:public_user).display_name + assert_redirected_to :action => :list, :display_name => user.display_name assert_match /file has been uploaded/, flash[:notice] trace = Trace.order(:id => :desc).first assert_equal "a.gpx", trace.name @@ -554,90 +544,90 @@ class TraceControllerTest < ActionController::TestCase assert_equal false, trace.inserted assert_equal File.new(fixture).read, File.new(trace.trace_name).read trace.destroy - assert_equal "trackable", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v + assert_equal "trackable", user.preferences.where(:k => "gps.trace.visibility").first.v end # Test fetching the edit page for a trace using GET def test_edit_get - public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user)) - deleted_trace_file = create(:trace, :deleted, :user => users(:public_user)) + public_trace_file = create(:trace, :visibility => "public") + deleted_trace_file = create(:trace, :deleted) # First with no auth - get :edit, :display_name => users(:normal_user).display_name, :id => public_trace_file.id + get :edit, :display_name => public_trace_file.user.display_name, :id => public_trace_file.id assert_response :redirect - assert_redirected_to :controller => :user, :action => :login, :referer => trace_edit_path(:display_name => users(:normal_user).display_name, :id => public_trace_file.id) + assert_redirected_to :controller => :user, :action => :login, :referer => trace_edit_path(:display_name => public_trace_file.user.display_name, :id => public_trace_file.id) # Now with some other user, which should fail - get :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user).id } + get :edit, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => create(:user) } assert_response :forbidden # Now with a trace which doesn't exist - get :edit, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user).id } + get :edit, { :display_name => create(:user).display_name, :id => 0 }, { :user => create(:user) } assert_response :not_found # Now with a trace which has been deleted - get :edit, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user).id } + get :edit, { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, { :user => deleted_trace_file.user } assert_response :not_found # Finally with a trace that we are allowed to edit - get :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user).id } + get :edit, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => public_trace_file.user } assert_response :success end # Test fetching the edit page for a trace using POST def test_edit_post_no_details - public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user)) - deleted_trace_file = create(:trace, :deleted, :user => users(:public_user)) + public_trace_file = create(:trace, :visibility => "public") + deleted_trace_file = create(:trace, :deleted) # First with no auth - post :edit, :display_name => users(:normal_user).display_name, :id => public_trace_file.id + post :edit, :display_name => public_trace_file.user.display_name, :id => public_trace_file.id assert_response :forbidden # Now with some other user, which should fail - post :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user).id } + post :edit, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => create(:user) } assert_response :forbidden # Now with a trace which doesn't exist - post :edit, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user).id } + post :edit, { :display_name => create(:user).display_name, :id => 0 }, { :user => create(:user) } assert_response :not_found # Now with a trace which has been deleted - post :edit, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user).id } + post :edit, { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, { :user => deleted_trace_file.user } assert_response :not_found # Finally with a trace that we are allowed to edit - post :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user).id } + post :edit, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => public_trace_file.user } assert_response :success end # Test saving edits to a trace def test_edit_post_with_details - public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user)) - deleted_trace_file = create(:trace, :deleted, :user => users(:public_user)) + public_trace_file = create(:trace, :visibility => "public") + deleted_trace_file = create(:trace, :deleted) # New details new_details = { :description => "Changed description", :tagstring => "new_tag", :visibility => "private" } # First with no auth - post :edit, :display_name => users(:normal_user).display_name, :id => public_trace_file.id, :trace => new_details + post :edit, :display_name => public_trace_file.user.display_name, :id => public_trace_file.id, :trace => new_details assert_response :forbidden # Now with some other user, which should fail - post :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id, :trace => new_details }, { :user => users(:public_user).id } + post :edit, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id, :trace => new_details }, { :user => create(:user) } assert_response :forbidden # Now with a trace which doesn't exist - post :edit, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user).id, :trace => new_details } + post :edit, { :display_name => create(:user).display_name, :id => 0 }, { :user => create(:user), :trace => new_details } assert_response :not_found # Now with a trace which has been deleted - post :edit, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id, :trace => new_details }, { :user => users(:public_user).id } + post :edit, { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id, :trace => new_details }, { :user => deleted_trace_file.user } assert_response :not_found # Finally with a trace that we are allowed to edit - post :edit, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id, :trace => new_details }, { :user => users(:normal_user).id } + post :edit, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id, :trace => new_details }, { :user => public_trace_file.user } assert_response :redirect - assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name + assert_redirected_to :action => :view, :display_name => public_trace_file.user.display_name trace = Trace.find(public_trace_file.id) assert_equal new_details[:description], trace.description assert_equal new_details[:tagstring], trace.tagstring @@ -646,163 +636,164 @@ class TraceControllerTest < ActionController::TestCase # Test deleting a trace def test_delete - public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user)) - deleted_trace_file = create(:trace, :deleted, :user => users(:public_user)) + public_trace_file = create(:trace, :visibility => "public") + deleted_trace_file = create(:trace, :deleted) # First with no auth - post :delete, :display_name => users(:normal_user).display_name, :id => public_trace_file.id + post :delete, :display_name => public_trace_file.user.display_name, :id => public_trace_file.id assert_response :forbidden # Now with some other user, which should fail - post :delete, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:public_user).id } + post :delete, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => create(:user) } assert_response :forbidden # Now with a trace which doesn't exist - post :delete, { :display_name => users(:public_user).display_name, :id => 0 }, { :user => users(:public_user).id } + post :delete, { :display_name => create(:user).display_name, :id => 0 }, { :user => create(:user) } assert_response :not_found # Now with a trace has already been deleted - post :delete, { :display_name => users(:public_user).display_name, :id => deleted_trace_file.id }, { :user => users(:public_user).id } + post :delete, { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, { :user => deleted_trace_file.user } assert_response :not_found # Finally with a trace that we are allowed to delete - post :delete, { :display_name => users(:normal_user).display_name, :id => public_trace_file.id }, { :user => users(:normal_user).id } + post :delete, { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, { :user => public_trace_file.user } assert_response :redirect - assert_redirected_to :action => :list, :display_name => users(:normal_user).display_name + assert_redirected_to :action => :list, :display_name => public_trace_file.user.display_name trace = Trace.find(public_trace_file.id) assert_equal false, trace.visible end # Check getting a specific trace through the api def test_api_read - public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user)) + public_trace_file = create(:trace, :visibility => "public") # First with no auth get :api_read, :id => public_trace_file.id assert_response :unauthorized # Now with some other user, which should work since the trace is public - basic_authorization(users(:public_user).display_name, "test") + basic_authorization(create(:user).display_name, "test") get :api_read, :id => public_trace_file.id assert_response :success # And finally we should be able to do it with the owner of the trace - basic_authorization(users(:normal_user).display_name, "test") + basic_authorization(public_trace_file.user.display_name, "test") get :api_read, :id => public_trace_file.id assert_response :success end # Check an anoymous trace can't be specifically fetched by another user def test_api_read_anon - anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user)) + anon_trace_file = create(:trace, :visibility => "private") # First with no auth get :api_read, :id => anon_trace_file.id assert_response :unauthorized # Now try with another user, which shouldn't work since the trace is anon - basic_authorization(users(:normal_user).display_name, "test") + basic_authorization(create(:user).display_name, "test") get :api_read, :id => anon_trace_file.id assert_response :forbidden # And finally we should be able to get the trace details with the trace owner - basic_authorization(users(:public_user).display_name, "test") + basic_authorization(anon_trace_file.user.display_name, "test") get :api_read, :id => anon_trace_file.id assert_response :success end # Check the api details for a trace that doesn't exist def test_api_read_not_found - deleted_trace_file = create(:trace, :deleted, :user => users(:public_user)) + deleted_trace_file = create(:trace, :deleted) # Try first with no auth, as it should require it get :api_read, :id => 0 assert_response :unauthorized # Login, and try again - basic_authorization(users(:public_user).display_name, "test") + basic_authorization(deleted_trace_file.user.display_name, "test") get :api_read, :id => 0 assert_response :not_found # Now try a trace which did exist but has been deleted - basic_authorization(users(:public_user).display_name, "test") + basic_authorization(deleted_trace_file.user.display_name, "test") get :api_read, :id => deleted_trace_file.id assert_response :not_found end # Test downloading a trace through the api def test_api_data - public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user), :fixture => "a") + public_trace_file = create(:trace, :visibility => "public", :fixture => "a") # First with no auth - get :api_data, :display_name => users(:normal_user).display_name, :id => public_trace_file.id + get :api_data, :id => public_trace_file.id assert_response :unauthorized # Now with some other user, which should work since the trace is public - basic_authorization(users(:public_user).display_name, "test") - get :api_data, :display_name => users(:normal_user).display_name, :id => public_trace_file.id + basic_authorization(create(:user).display_name, "test") + get :api_data, :id => public_trace_file.id check_trace_data public_trace_file # And finally we should be able to do it with the owner of the trace - basic_authorization(users(:normal_user).display_name, "test") - get :api_data, :display_name => users(:normal_user).display_name, :id => public_trace_file.id + basic_authorization(public_trace_file.user.display_name, "test") + get :api_data, :id => public_trace_file.id check_trace_data public_trace_file end # Test downloading a compressed trace through the api def test_api_data_compressed - identifiable_trace_file = create(:trace, :visibility => "identifiable", :user => users(:public_user), :fixture => "d") + identifiable_trace_file = create(:trace, :visibility => "identifiable", :fixture => "d") # Authenticate as the owner of the trace we will be using - basic_authorization(users(:public_user).display_name, "test") + basic_authorization(identifiable_trace_file.user.display_name, "test") # First get the data as is - get :api_data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id + get :api_data, :id => identifiable_trace_file.id check_trace_data identifiable_trace_file, "application/x-gzip", "gpx.gz" # Now ask explicitly for XML format - get :api_data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id, :format => "xml" + get :api_data, :id => identifiable_trace_file.id, :format => "xml" check_trace_data identifiable_trace_file, "application/xml", "xml" # Now ask explicitly for GPX format - get :api_data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id, :format => "gpx" + get :api_data, :id => identifiable_trace_file.id, :format => "gpx" check_trace_data identifiable_trace_file end # 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), :fixture => "b") + anon_trace_file = create(:trace, :visibility => "private", :fixture => "b") # First with no auth - get :api_data, :display_name => users(:public_user).display_name, :id => anon_trace_file.id + get :api_data, :id => anon_trace_file.id assert_response :unauthorized # Now with some other user, which shouldn't work since the trace is anon - basic_authorization(users(:normal_user).display_name, "test") - get :api_data, :display_name => users(:public_user).display_name, :id => anon_trace_file.id + basic_authorization(create(:user).display_name, "test") + get :api_data, :id => anon_trace_file.id assert_response :forbidden # And finally we should be able to do it with the owner of the trace - basic_authorization(users(:public_user).display_name, "test") - get :api_data, :display_name => users(:public_user).display_name, :id => anon_trace_file.id + basic_authorization(anon_trace_file.user.display_name, "test") + get :api_data, :id => anon_trace_file.id check_trace_data anon_trace_file end # Test downloading a trace that doesn't exist through the api def test_api_data_not_found - # First with no auth - get :api_data, :display_name => users(:public_user).display_name, :id => 0 + deleted_trace_file = create(:trace, :deleted) + + # Try first with no auth, as it should require it + get :api_data, :id => 0 assert_response :unauthorized - # Now with a trace that has never existed - basic_authorization(users(:public_user).display_name, "test") - get :api_data, :display_name => users(:public_user).display_name, :id => 0 + # Login, and try again + basic_authorization(create(:user).display_name, "test") + get :api_data, :id => 0 assert_response :not_found - # Now with a trace that has been deleted - deleted_trace_file = create(:trace, :deleted) - basic_authorization(users(:public_user).display_name, "test") - get :api_data, :display_name => users(:public_user).display_name, :id => deleted_trace_file.id + # Now try a trace which did exist but has been deleted + basic_authorization(deleted_trace_file.user.display_name, "test") + get :api_data, :id => deleted_trace_file.id assert_response :not_found end @@ -811,15 +802,16 @@ class TraceControllerTest < ActionController::TestCase # Get file to use fixture = Rails.root.join("test", "gpx", "fixtures", "a.gpx") file = Rack::Test::UploadedFile.new(fixture, "application/gpx+xml") + user = create(:user) # First with no auth post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable" assert_response :unauthorized # Now authenticated - create(:user_preference, :user => users(:public_user), :k => "gps.trace.visibility", :v => "identifiable") - assert_not_equal "trackable", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v - basic_authorization(users(:public_user).display_name, "test") + create(:user_preference, :user => user, :k => "gps.trace.visibility", :v => "identifiable") + assert_not_equal "trackable", user.preferences.where(:k => "gps.trace.visibility").first.v + basic_authorization(user.display_name, "test") post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable" assert_response :success trace = Trace.find(response.body.to_i) @@ -830,14 +822,14 @@ class TraceControllerTest < ActionController::TestCase assert_equal false, trace.inserted assert_equal File.new(fixture).read, File.new(trace.trace_name).read trace.destroy - assert_equal "trackable", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v + assert_equal "trackable", user.preferences.where(:k => "gps.trace.visibility").first.v # Rewind the file file.rewind # Now authenticated, with the legacy public flag - assert_not_equal "public", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v - basic_authorization(users(:public_user).display_name, "test") + assert_not_equal "public", user.preferences.where(:k => "gps.trace.visibility").first.v + basic_authorization(user.display_name, "test") post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :public => 1 assert_response :success trace = Trace.find(response.body.to_i) @@ -848,14 +840,15 @@ class TraceControllerTest < ActionController::TestCase assert_equal false, trace.inserted assert_equal File.new(fixture).read, File.new(trace.trace_name).read trace.destroy - assert_equal "public", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v + assert_equal "public", user.preferences.where(:k => "gps.trace.visibility").first.v # Rewind the file file.rewind # Now authenticated, with the legacy private flag - assert_nil users(:second_public_user).preferences.where(:k => "gps.trace.visibility").first - basic_authorization(users(:second_public_user).display_name, "test") + second_user = create(:user) + assert_nil second_user.preferences.where(:k => "gps.trace.visibility").first + basic_authorization(second_user.display_name, "test") post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :public => 0 assert_response :success trace = Trace.find(response.body.to_i) @@ -866,14 +859,14 @@ class TraceControllerTest < ActionController::TestCase assert_equal false, trace.inserted assert_equal File.new(fixture).read, File.new(trace.trace_name).read trace.destroy - assert_equal "private", users(:second_public_user).preferences.where(:k => "gps.trace.visibility").first.v + assert_equal "private", second_user.preferences.where(:k => "gps.trace.visibility").first.v end # Check updating a trace through the api def test_api_update - public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user), :fixture => "a") - deleted_trace_file = create(:trace, :deleted, :user => users(:public_user)) - anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user)) + public_trace_file = create(:trace, :visibility => "public", :fixture => "a") + deleted_trace_file = create(:trace, :deleted) + anon_trace_file = create(:trace, :visibility => "private") # First with no auth content public_trace_file.to_xml @@ -881,32 +874,32 @@ class TraceControllerTest < ActionController::TestCase assert_response :unauthorized # Now with some other user, which should fail - basic_authorization(users(:public_user).display_name, "test") + basic_authorization(create(:user).display_name, "test") content public_trace_file.to_xml put :api_update, :id => public_trace_file.id assert_response :forbidden # Now with a trace which doesn't exist - basic_authorization(users(:public_user).display_name, "test") + basic_authorization(create(:user).display_name, "test") content public_trace_file.to_xml put :api_update, :id => 0 assert_response :not_found # Now with a trace which did exist but has been deleted - basic_authorization(users(:public_user).display_name, "test") + basic_authorization(deleted_trace_file.user.display_name, "test") content deleted_trace_file.to_xml put :api_update, :id => deleted_trace_file.id assert_response :not_found # Now try an update with the wrong ID - basic_authorization(users(:normal_user).display_name, "test") + basic_authorization(public_trace_file.user.display_name, "test") content anon_trace_file.to_xml put :api_update, :id => public_trace_file.id assert_response :bad_request, "should not be able to update a trace with a different ID from the XML" # And finally try an update that should work - basic_authorization(users(:normal_user).display_name, "test") + basic_authorization(public_trace_file.user.display_name, "test") t = public_trace_file t.description = "Changed description" t.visibility = "private" @@ -920,29 +913,29 @@ class TraceControllerTest < ActionController::TestCase # Check deleting a trace through the api def test_api_delete - public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user)) + public_trace_file = create(:trace, :visibility => "public") # First with no auth delete :api_delete, :id => public_trace_file.id assert_response :unauthorized # Now with some other user, which should fail - basic_authorization(users(:public_user).display_name, "test") + basic_authorization(create(:user).display_name, "test") delete :api_delete, :id => public_trace_file.id assert_response :forbidden # Now with a trace which doesn't exist - basic_authorization(users(:public_user).display_name, "test") + basic_authorization(create(:user).display_name, "test") delete :api_delete, :id => 0 assert_response :not_found # And finally we should be able to do it with the owner of the trace - basic_authorization(users(:normal_user).display_name, "test") + basic_authorization(public_trace_file.user.display_name, "test") delete :api_delete, :id => public_trace_file.id assert_response :success # Try it a second time, which should fail - basic_authorization(users(:normal_user).display_name, "test") + basic_authorization(public_trace_file.user.display_name, "test") delete :api_delete, :id => public_trace_file.id assert_response :not_found end