Remove unnecessary site.about locale scope from About page

[rails.git] / test / controllers / api / traces_controller_test.rb

diff --git a/test/controllers/api/traces_controller_test.rb b/test/controllers/api/traces_controller_test.rb
index 80b9d1a8458a445e2719c2059a8c2eefe72d49d9..de5c309a49868e0425922f9c30a11a96e1f25132 100644 (file)
--- a/test/controllers/api/traces_controller_test.rb
+++ b/test/controllers/api/traces_controller_test.rb
@@ -1,13 +1,7 @@
 require "test_helper"
 require "test_helper"

-require "minitest/mock"

 
 module Api
 
 module Api

-  class TracesControllerTest < ActionController::TestCase
-    def teardown
-      File.unlink(*Dir.glob(File.join(Settings.gpx_trace_dir, "*.gpx")))
-      File.unlink(*Dir.glob(File.join(Settings.gpx_image_dir, "*.gif")))
-    end
-
+  class TracesControllerTest < ActionDispatch::IntegrationTest

     ##
     # test all routes which lead to this controller
     def test_routes
     ##
     # test all routes which lead to this controller
     def test_routes


@@ -46,36 +40,37 @@ module Api
       public_trace_file = create(:trace, :visibility => "public")
 
       # First with no auth
       public_trace_file = create(:trace, :visibility => "public")
 
       # First with no auth

-      get :show, :params => { :id => public_trace_file.id }
+      get api_trace_path(public_trace_file)

       assert_response :unauthorized
 
       # Now with some other user, which should work since the trace is public
       assert_response :unauthorized
 
       # Now with some other user, which should work since the trace is public

-      basic_authorization create(:user).display_name, "test"
-      get :show, :params => { :id => public_trace_file.id }
+      auth_header = bearer_authorization_header
+      get api_trace_path(public_trace_file), :headers => auth_header

       assert_response :success
 
       # And finally we should be able to do it with the owner of the trace
       assert_response :success
 
       # And finally we should be able to do it with the owner of the trace

-      basic_authorization public_trace_file.user.display_name, "test"
-      get :show, :params => { :id => public_trace_file.id }
+      auth_header = bearer_authorization_header public_trace_file.user
+      get api_trace_path(public_trace_file), :headers => auth_header

       assert_response :success
       assert_response :success

+      assert_select "gpx_file[id='#{public_trace_file.id}'][uid='#{public_trace_file.user.id}']", 1

     end
 
     end
 

-    # Check an anoymous trace can't be specifically fetched by another user
+    # Check an anonymous trace can't be specifically fetched by another user

     def test_show_anon
       anon_trace_file = create(:trace, :visibility => "private")
 
       # First with no auth
     def test_show_anon
       anon_trace_file = create(:trace, :visibility => "private")
 
       # First with no auth

-      get :show, :params => { :id => anon_trace_file.id }
+      get api_trace_path(anon_trace_file)

       assert_response :unauthorized
 
       # Now try with another user, which shouldn't work since the trace is anon
       assert_response :unauthorized
 
       # Now try with another user, which shouldn't work since the trace is anon

-      basic_authorization create(:user).display_name, "test"
-      get :show, :params => { :id => anon_trace_file.id }
+      auth_header = bearer_authorization_header
+      get api_trace_path(anon_trace_file), :headers => auth_header

       assert_response :forbidden
 
       # And finally we should be able to get the trace details with the trace owner
       assert_response :forbidden
 
       # And finally we should be able to get the trace details with the trace owner

-      basic_authorization anon_trace_file.user.display_name, "test"
-      get :show, :params => { :id => anon_trace_file.id }
+      auth_header = bearer_authorization_header anon_trace_file.user
+      get api_trace_path(anon_trace_file), :headers => auth_header

       assert_response :success
     end
 
       assert_response :success
     end
 


@@ -84,17 +79,17 @@ module Api
       deleted_trace_file = create(:trace, :deleted)
 
       # Try first with no auth, as it should require it
       deleted_trace_file = create(:trace, :deleted)
 
       # Try first with no auth, as it should require it

-      get :show, :params => { :id => 0 }
+      get api_trace_path(:id => 0)

       assert_response :unauthorized
 
       # Login, and try again
       assert_response :unauthorized
 
       # Login, and try again

-      basic_authorization deleted_trace_file.user.display_name, "test"
-      get :show, :params => { :id => 0 }
+      auth_header = bearer_authorization_header deleted_trace_file.user
+      get api_trace_path(:id => 0), :headers => auth_header

       assert_response :not_found
 
       # Now try a trace which did exist but has been deleted
       assert_response :not_found
 
       # Now try a trace which did exist but has been deleted

-      basic_authorization deleted_trace_file.user.display_name, "test"
-      get :show, :params => { :id => deleted_trace_file.id }
+      auth_header = bearer_authorization_header deleted_trace_file.user
+      get api_trace_path(deleted_trace_file), :headers => auth_header

       assert_response :not_found
     end
 
       assert_response :not_found
     end
 


@@ -103,17 +98,21 @@ module Api
       public_trace_file = create(:trace, :visibility => "public", :fixture => "a")
 
       # First with no auth
       public_trace_file = create(:trace, :visibility => "public", :fixture => "a")
 
       # First with no auth

-      get :data, :params => { :id => public_trace_file.id }
+      get api_trace_data_path(public_trace_file)

       assert_response :unauthorized
 
       # Now with some other user, which should work since the trace is public
       assert_response :unauthorized
 
       # Now with some other user, which should work since the trace is public

-      basic_authorization create(:user).display_name, "test"
-      get :data, :params => { :id => public_trace_file.id }
+      auth_header = bearer_authorization_header
+      get api_trace_data_path(public_trace_file), :headers => auth_header
+      follow_redirect!
+      follow_redirect!

       check_trace_data public_trace_file, "848caa72f2f456d1bd6a0fdf228aa1b9"
 
       # And finally we should be able to do it with the owner of the trace
       check_trace_data public_trace_file, "848caa72f2f456d1bd6a0fdf228aa1b9"
 
       # And finally we should be able to do it with the owner of the trace

-      basic_authorization public_trace_file.user.display_name, "test"
-      get :data, :params => { :id => public_trace_file.id }
+      auth_header = bearer_authorization_header public_trace_file.user
+      get api_trace_data_path(public_trace_file), :headers => auth_header
+      follow_redirect!
+      follow_redirect!

       check_trace_data public_trace_file, "848caa72f2f456d1bd6a0fdf228aa1b9"
     end
 
       check_trace_data public_trace_file, "848caa72f2f456d1bd6a0fdf228aa1b9"
     end
 


@@ -122,18 +121,20 @@ module Api
       identifiable_trace_file = create(:trace, :visibility => "identifiable", :fixture => "d")
 
       # Authenticate as the owner of the trace we will be using
       identifiable_trace_file = create(:trace, :visibility => "identifiable", :fixture => "d")
 
       # Authenticate as the owner of the trace we will be using

-      basic_authorization identifiable_trace_file.user.display_name, "test"
+      auth_header = bearer_authorization_header identifiable_trace_file.user

 
       # First get the data as is
 
       # First get the data as is

-      get :data, :params => { :id => identifiable_trace_file.id }
-      check_trace_data identifiable_trace_file, "c6422a3d8750faae49ed70e7e8a51b93", "application/x-gzip", "gpx.gz"
+      get api_trace_data_path(identifiable_trace_file), :headers => auth_header
+      follow_redirect!
+      follow_redirect!
+      check_trace_data identifiable_trace_file, "c6422a3d8750faae49ed70e7e8a51b93", "application/gzip", "gpx.gz"

 
       # Now ask explicitly for XML format
 
       # Now ask explicitly for XML format

-      get :data, :params => { :id => identifiable_trace_file.id, :format => "xml" }
+      get api_trace_data_path(identifiable_trace_file, :format => "xml"), :headers => auth_header

       check_trace_data identifiable_trace_file, "abd6675fdf3024a84fc0a1deac147c0d", "application/xml", "xml"
 
       # Now ask explicitly for GPX format
       check_trace_data identifiable_trace_file, "abd6675fdf3024a84fc0a1deac147c0d", "application/xml", "xml"
 
       # Now ask explicitly for GPX format

-      get :data, :params => { :id => identifiable_trace_file.id, :format => "gpx" }
+      get api_trace_data_path(identifiable_trace_file, :format => "gpx"), :headers => auth_header

       check_trace_data identifiable_trace_file, "abd6675fdf3024a84fc0a1deac147c0d"
     end
 
       check_trace_data identifiable_trace_file, "abd6675fdf3024a84fc0a1deac147c0d"
     end
 


@@ -142,17 +143,19 @@ module Api
       anon_trace_file = create(:trace, :visibility => "private", :fixture => "b")
 
       # First with no auth
       anon_trace_file = create(:trace, :visibility => "private", :fixture => "b")
 
       # First with no auth

-      get :data, :params => { :id => anon_trace_file.id }
+      get api_trace_data_path(anon_trace_file)

       assert_response :unauthorized
 
       # Now with some other user, which shouldn't work since the trace is anon
       assert_response :unauthorized
 
       # Now with some other user, which shouldn't work since the trace is anon

-      basic_authorization create(:user).display_name, "test"
-      get :data, :params => { :id => anon_trace_file.id }
+      auth_header = bearer_authorization_header
+      get api_trace_data_path(anon_trace_file), :headers => auth_header

       assert_response :forbidden
 
       # And finally we should be able to do it with the owner of the trace
       assert_response :forbidden
 
       # And finally we should be able to do it with the owner of the trace

-      basic_authorization anon_trace_file.user.display_name, "test"
-      get :data, :params => { :id => anon_trace_file.id }
+      auth_header = bearer_authorization_header anon_trace_file.user
+      get api_trace_data_path(anon_trace_file), :headers => auth_header
+      follow_redirect!
+      follow_redirect!

       check_trace_data anon_trace_file, "db4cb5ed2d7d2b627b3b504296c4f701"
     end
 
       check_trace_data anon_trace_file, "db4cb5ed2d7d2b627b3b504296c4f701"
     end
 


@@ -161,29 +164,29 @@ module Api
       deleted_trace_file = create(:trace, :deleted)
 
       # Try first with no auth, as it should require it
       deleted_trace_file = create(:trace, :deleted)
 
       # Try first with no auth, as it should require it

-      get :data, :params => { :id => 0 }
+      get api_trace_data_path(:id => 0)

       assert_response :unauthorized
 
       # Login, and try again
       assert_response :unauthorized
 
       # Login, and try again

-      basic_authorization create(:user).display_name, "test"
-      get :data, :params => { :id => 0 }
+      auth_header = bearer_authorization_header
+      get api_trace_data_path(:id => 0), :headers => auth_header

       assert_response :not_found
 
       # Now try a trace which did exist but has been deleted
       assert_response :not_found
 
       # Now try a trace which did exist but has been deleted

-      basic_authorization deleted_trace_file.user.display_name, "test"
-      get :data, :params => { :id => deleted_trace_file.id }
+      auth_header = bearer_authorization_header deleted_trace_file.user
+      get api_trace_data_path(deleted_trace_file), :headers => auth_header

       assert_response :not_found
     end
 
     # Test creating a trace through the api
     def test_create
       # Get file to use
       assert_response :not_found
     end
 
     # Test creating a trace through the api
     def test_create
       # Get file to use

-      fixture = Rails.root.join("test", "gpx", "fixtures", "a.gpx")
+      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
       file = Rack::Test::UploadedFile.new(fixture, "application/gpx+xml")
       user = create(:user)
 
       # First with no auth

-      post :create, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable" }
+      post gpx_create_path, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable" }

       assert_response :unauthorized
 
       # Rewind the file
       assert_response :unauthorized
 
       # Rewind the file


@@ -191,56 +194,56 @@ module Api
 
       # Now authenticated
       create(:user_preference, :user => user, :k => "gps.trace.visibility", :v => "identifiable")
 
       # Now authenticated
       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 :create, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable" }
+      assert_not_equal "trackable", user.preferences.find_by(:k => "gps.trace.visibility").v
+      auth_header = bearer_authorization_header user
+      post gpx_create_path, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable" }, :headers => auth_header

       assert_response :success
       trace = Trace.find(response.body.to_i)
       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
       assert_response :success
       trace = Trace.find(response.body.to_i)
       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

-      assert_equal false, trace.inserted
-      assert_equal File.new(fixture).read, File.new(trace.trace_name).read
+      assert_not trace.inserted
+      assert_equal File.new(fixture).read, trace.file.blob.download

       trace.destroy
       trace.destroy

-      assert_equal "trackable", user.preferences.where(:k => "gps.trace.visibility").first.v
+      assert_equal "trackable", user.preferences.find_by(:k => "gps.trace.visibility").v

 
       # Rewind the file
       file.rewind
 
       # Now authenticated, with the legacy public flag
 
       # Rewind the file
       file.rewind
 
       # Now authenticated, with the legacy public flag

-      assert_not_equal "public", user.preferences.where(:k => "gps.trace.visibility").first.v
-      basic_authorization user.display_name, "test"
-      post :create, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :public => 1 }
+      assert_not_equal "public", user.preferences.find_by(:k => "gps.trace.visibility").v
+      auth_header = bearer_authorization_header user
+      post gpx_create_path, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :public => 1 }, :headers => auth_header

       assert_response :success
       trace = Trace.find(response.body.to_i)
       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
       assert_response :success
       trace = Trace.find(response.body.to_i)
       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

-      assert_equal false, trace.inserted
-      assert_equal File.new(fixture).read, File.new(trace.trace_name).read
+      assert_not trace.inserted
+      assert_equal File.new(fixture).read, trace.file.blob.download

       trace.destroy
       trace.destroy

-      assert_equal "public", user.preferences.where(:k => "gps.trace.visibility").first.v
+      assert_equal "public", user.preferences.find_by(:k => "gps.trace.visibility").v

 
       # Rewind the file
       file.rewind
 
       # Now authenticated, with the legacy private flag
       second_user = create(:user)
 
       # Rewind the file
       file.rewind
 
       # Now authenticated, with the legacy private flag
       second_user = create(:user)

-      assert_nil second_user.preferences.where(:k => "gps.trace.visibility").first
-      basic_authorization second_user.display_name, "test"
-      post :create, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :public => 0 }
+      assert_nil second_user.preferences.find_by(:k => "gps.trace.visibility")
+      auth_header = bearer_authorization_header second_user
+      post gpx_create_path, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :public => 0 }, :headers => auth_header

       assert_response :success
       trace = Trace.find(response.body.to_i)
       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
       assert_response :success
       trace = Trace.find(response.body.to_i)
       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

-      assert_equal false, trace.inserted
-      assert_equal File.new(fixture).read, File.new(trace.trace_name).read
+      assert_not trace.inserted
+      assert_equal File.new(fixture).read, trace.file.blob.download

       trace.destroy
       trace.destroy

-      assert_equal "private", second_user.preferences.where(:k => "gps.trace.visibility").first.v
+      assert_equal "private", second_user.preferences.find_by(:k => "gps.trace.visibility").v

     end
 
     # Check updating a trace through the api
     end
 
     # Check updating a trace through the api


@@ -250,36 +253,36 @@ module Api
       anon_trace_file = create(:trace, :visibility => "private")
 
       # First with no auth
       anon_trace_file = create(:trace, :visibility => "private")
 
       # First with no auth

-      put :update, :params => { :id => public_trace_file.id }, :body => create_trace_xml(public_trace_file)
+      put api_trace_path(public_trace_file), :params => create_trace_xml(public_trace_file)

       assert_response :unauthorized
 
       # Now with some other user, which should fail
       assert_response :unauthorized
 
       # Now with some other user, which should fail

-      basic_authorization create(:user).display_name, "test"
-      put :update, :params => { :id => public_trace_file.id }, :body => create_trace_xml(public_trace_file)
+      auth_header = bearer_authorization_header
+      put api_trace_path(public_trace_file), :params => create_trace_xml(public_trace_file), :headers => auth_header

       assert_response :forbidden
 
       # Now with a trace which doesn't exist
       assert_response :forbidden
 
       # Now with a trace which doesn't exist

-      basic_authorization create(:user).display_name, "test"
-      put :update, :params => { :id => 0 }, :body => create_trace_xml(public_trace_file)
+      auth_header = bearer_authorization_header
+      put api_trace_path(:id => 0), :params => create_trace_xml(public_trace_file), :headers => auth_header

       assert_response :not_found
 
       # Now with a trace which did exist but has been deleted
       assert_response :not_found
 
       # Now with a trace which did exist but has been deleted

-      basic_authorization deleted_trace_file.user.display_name, "test"
-      put :update, :params => { :id => deleted_trace_file.id }, :body => create_trace_xml(deleted_trace_file)
+      auth_header = bearer_authorization_header deleted_trace_file.user
+      put api_trace_path(deleted_trace_file), :params => create_trace_xml(deleted_trace_file), :headers => auth_header

       assert_response :not_found
 
       # Now try an update with the wrong ID
       assert_response :not_found
 
       # Now try an update with the wrong ID

-      basic_authorization public_trace_file.user.display_name, "test"
-      put :update, :params => { :id => public_trace_file.id }, :body => create_trace_xml(anon_trace_file)
+      auth_header = bearer_authorization_header public_trace_file.user
+      put api_trace_path(public_trace_file), :params => create_trace_xml(anon_trace_file), :headers => auth_header

       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
       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 public_trace_file.user.display_name, "test"
+      auth_header = bearer_authorization_header public_trace_file.user

       t = public_trace_file
       t.description = "Changed description"
       t.visibility = "private"
       t = public_trace_file
       t.description = "Changed description"
       t.visibility = "private"

-      put :update, :params => { :id => t.id }, :body => create_trace_xml(t)
+      put api_trace_path(t), :params => create_trace_xml(t), :headers => auth_header

       assert_response :success
       nt = Trace.find(t.id)
       assert_equal nt.description, t.description
       assert_response :success
       nt = Trace.find(t.id)
       assert_equal nt.description, t.description


@@ -290,14 +293,14 @@ module Api
     def test_update_tags
       tracetag = create(:tracetag)
       trace = tracetag.trace
     def test_update_tags
       tracetag = create(:tracetag)
       trace = tracetag.trace

-      basic_authorization trace.user.display_name, "test"
+      auth_header = bearer_authorization_header trace.user

 
 

-      put :update, :params => { :id => trace.id }, :body => create_trace_xml(trace)
+      put api_trace_path(trace), :params => create_trace_xml(trace), :headers => auth_header

       assert_response :success
 
       updated = Trace.find(trace.id)
       # Ensure there's only one tag in the database after updating
       assert_response :success
 
       updated = Trace.find(trace.id)
       # Ensure there's only one tag in the database after updating

-      assert_equal Tracetag.count, 1
+      assert_equal(1, Tracetag.count)

       # The new tag object might have a different id, so check the string representation
       assert_equal trace.tagstring, updated.tagstring
     end
       # The new tag object might have a different id, so check the string representation
       assert_equal trace.tagstring, updated.tagstring
     end


@@ -307,27 +310,27 @@ module Api
       public_trace_file = create(:trace, :visibility => "public")
 
       # First with no auth
       public_trace_file = create(:trace, :visibility => "public")
 
       # First with no auth

-      delete :destroy, :params => { :id => public_trace_file.id }
+      delete api_trace_path(public_trace_file)

       assert_response :unauthorized
 
       # Now with some other user, which should fail
       assert_response :unauthorized
 
       # Now with some other user, which should fail

-      basic_authorization create(:user).display_name, "test"
-      delete :destroy, :params => { :id => public_trace_file.id }
+      auth_header = bearer_authorization_header
+      delete api_trace_path(public_trace_file), :headers => auth_header

       assert_response :forbidden
 
       # Now with a trace which doesn't exist
       assert_response :forbidden
 
       # Now with a trace which doesn't exist

-      basic_authorization create(:user).display_name, "test"
-      delete :destroy, :params => { :id => 0 }
+      auth_header = bearer_authorization_header
+      delete api_trace_path(:id => 0), :headers => auth_header

       assert_response :not_found
 
       # And finally we should be able to do it with the owner of the trace
       assert_response :not_found
 
       # And finally we should be able to do it with the owner of the trace

-      basic_authorization public_trace_file.user.display_name, "test"
-      delete :destroy, :params => { :id => public_trace_file.id }
+      auth_header = bearer_authorization_header public_trace_file.user
+      delete api_trace_path(public_trace_file), :headers => auth_header

       assert_response :success
 
       # Try it a second time, which should fail
       assert_response :success
 
       # Try it a second time, which should fail

-      basic_authorization public_trace_file.user.display_name, "test"
-      delete :destroy, :params => { :id => public_trace_file.id }
+      auth_header = bearer_authorization_header public_trace_file.user
+      delete api_trace_path(public_trace_file), :headers => auth_header

       assert_response :not_found
     end
 
       assert_response :not_found
     end