From f435fce007d7817bd35f3beb93f0e3a844446154 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 5 Feb 2017 17:24:58 +0000 Subject: [PATCH] Link GPX fixture files instead of stubbing --- Gemfile | 1 - Gemfile.lock | 2 - app/models/trace.rb | 6 +- test/controllers/trace_controller_test.rb | 547 +++++++++++----------- test/controllers/user_controller_test.rb | 2 +- test/factories/traces.rb | 15 + test/{traces => gpx/fixtures}/a.gif | Bin test/{traces => gpx/fixtures}/a.gpx | 0 test/{traces => gpx/fixtures}/a_icon.gif | Bin test/{traces => gpx/fixtures}/b.gif | Bin test/{traces => gpx/fixtures}/b.gpx | 0 test/{traces => gpx/fixtures}/b_icon.gif | Bin test/{traces => gpx/fixtures}/c.gif | Bin test/{traces => gpx/fixtures}/c.gpx | Bin test/{traces => gpx/fixtures}/c_icon.gif | Bin test/{traces => gpx/fixtures}/d.gif | Bin test/{traces => gpx/fixtures}/d.gpx | Bin test/{traces => gpx/fixtures}/d_icon.gif | Bin test/{traces => gpx/fixtures}/f.gif | Bin test/{traces => gpx/fixtures}/f.gpx | Bin test/{traces => gpx/fixtures}/f_icon.gif | Bin test/{traces => gpx/fixtures}/g.gif | Bin test/{traces => gpx/fixtures}/g.gpx | Bin test/{traces => gpx/fixtures}/g_icon.gif | Bin test/{traces => gpx/fixtures}/h.gif | Bin test/{traces => gpx/fixtures}/h.gpx | Bin test/{traces => gpx/fixtures}/h_icon.gif | Bin test/{traces => gpx/fixtures}/i.gif | Bin test/{traces => gpx/fixtures}/i.gpx | Bin test/{traces => gpx/fixtures}/i_icon.gif | Bin test/{traces => gpx/fixtures}/j.gpx | 0 test/gpx/images/.gitkeep | 0 test/gpx/traces/.gitkeep | 0 test/models/trace_test.rb | 32 +- 34 files changed, 296 insertions(+), 309 deletions(-) rename test/{traces => gpx/fixtures}/a.gif (100%) rename test/{traces => gpx/fixtures}/a.gpx (100%) rename test/{traces => gpx/fixtures}/a_icon.gif (100%) rename test/{traces => gpx/fixtures}/b.gif (100%) rename test/{traces => gpx/fixtures}/b.gpx (100%) rename test/{traces => gpx/fixtures}/b_icon.gif (100%) rename test/{traces => gpx/fixtures}/c.gif (100%) rename test/{traces => gpx/fixtures}/c.gpx (100%) rename test/{traces => gpx/fixtures}/c_icon.gif (100%) rename test/{traces => gpx/fixtures}/d.gif (100%) rename test/{traces => gpx/fixtures}/d.gpx (100%) rename test/{traces => gpx/fixtures}/d_icon.gif (100%) rename test/{traces => gpx/fixtures}/f.gif (100%) rename test/{traces => gpx/fixtures}/f.gpx (100%) rename test/{traces => gpx/fixtures}/f_icon.gif (100%) rename test/{traces => gpx/fixtures}/g.gif (100%) rename test/{traces => gpx/fixtures}/g.gpx (100%) rename test/{traces => gpx/fixtures}/g_icon.gif (100%) rename test/{traces => gpx/fixtures}/h.gif (100%) rename test/{traces => gpx/fixtures}/h.gpx (100%) rename test/{traces => gpx/fixtures}/h_icon.gif (100%) rename test/{traces => gpx/fixtures}/i.gif (100%) rename test/{traces => gpx/fixtures}/i.gpx (100%) rename test/{traces => gpx/fixtures}/i_icon.gif (100%) rename test/{traces => gpx/fixtures}/j.gpx (100%) create mode 100644 test/gpx/images/.gitkeep create mode 100644 test/gpx/traces/.gitkeep diff --git a/Gemfile b/Gemfile index c2578d6f5..34768095f 100644 --- a/Gemfile +++ b/Gemfile @@ -103,7 +103,6 @@ end # Gems needed for running tests group :test do gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20] - gem "minitest-stub_any_instance" gem "rubocop" gem "timecop" gem "webmock" diff --git a/Gemfile.lock b/Gemfile.lock index 1fade149c..a8c91f460 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -157,7 +157,6 @@ GEM mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.10.1) - minitest-stub_any_instance (1.0.1) multi_json (1.12.1) multi_xml (0.6.0) multipart-post (2.0.0) @@ -355,7 +354,6 @@ DEPENDENCIES libxml-ruby (>= 2.0.5) logstasher minitest (~> 5.1) - minitest-stub_any_instance oauth-plugin (>= 0.5.1) omniauth omniauth-facebook diff --git a/app/models/trace.rb b/app/models/trace.rb index 47e5c38b7..2d055fd28 100644 --- a/app/models/trace.rb +++ b/app/models/trace.rb @@ -95,7 +95,7 @@ class Trace < ActiveRecord::Base end def mime_type - filetype = `/usr/bin/file -bz #{trace_name}`.chomp + filetype = `/usr/bin/file -Lbz #{trace_name}`.chomp gzipped = filetype =~ /gzip compressed/ bzipped = filetype =~ /bzip2 compressed/ zipped = filetype =~ /Zip archive/ @@ -117,7 +117,7 @@ class Trace < ActiveRecord::Base end def extension_name - filetype = `/usr/bin/file -bz #{trace_name}`.chomp + filetype = `/usr/bin/file -Lbz #{trace_name}`.chomp gzipped = filetype =~ /gzip compressed/ bzipped = filetype =~ /bzip2 compressed/ zipped = filetype =~ /Zip archive/ @@ -218,7 +218,7 @@ class Trace < ActiveRecord::Base def xml_file # TODO: *nix specific, could do to work on windows... would be functionally inferior though - check for '.gz' - filetype = `/usr/bin/file -bz #{trace_name}`.chomp + filetype = `/usr/bin/file -Lbz #{trace_name}`.chomp gzipped = filetype =~ /gzip compressed/ bzipped = filetype =~ /bzip2 compressed/ zipped = filetype =~ /Zip archive/ diff --git a/test/controllers/trace_controller_test.rb b/test/controllers/trace_controller_test.rb index 616d25fc2..f27129b42 100644 --- a/test/controllers/trace_controller_test.rb +++ b/test/controllers/trace_controller_test.rb @@ -6,13 +6,16 @@ class TraceControllerTest < ActionController::TestCase def setup @gpx_trace_dir = Object.send("remove_const", "GPX_TRACE_DIR") - Object.const_set("GPX_TRACE_DIR", File.dirname(__FILE__) + "/../traces") + Object.const_set("GPX_TRACE_DIR", Rails.root.join("test", "gpx", "traces")) @gpx_image_dir = Object.send("remove_const", "GPX_IMAGE_DIR") - Object.const_set("GPX_IMAGE_DIR", File.dirname(__FILE__) + "/../traces") + Object.const_set("GPX_IMAGE_DIR", Rails.root.join("test", "gpx", "images")) end def teardown + File.unlink(*Dir.glob(File.join(GPX_TRACE_DIR, "*.gpx"))) + File.unlink(*Dir.glob(File.join(GPX_IMAGE_DIR, "*.gif"))) + Object.send("remove_const", "GPX_TRACE_DIR") Object.const_set("GPX_TRACE_DIR", @gpx_trace_dir) @@ -332,56 +335,53 @@ 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}/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 - - # 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 } - 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 } - check_trace_data public_trace_file - end + public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user), :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 + 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 } + 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 } + check_trace_data public_trace_file end # 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}/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" - - # Now ask explicitly for XML format - get :data, :display_name => users(:public_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" - check_trace_data identifiable_trace_file - end + 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 + 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" + 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" + 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)) - 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 - - # 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 } - 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 } - check_trace_data anon_trace_file - end + anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user), :fixture => "b") + + # First with no auth + get :data, :display_name => users(:public_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 } + 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 } + check_trace_data anon_trace_file end # Test downloading a trace that doesn't exist @@ -403,38 +403,36 @@ 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}/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 - - # 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 } - 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 } - check_trace_picture public_trace_file - end + public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user), :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 + 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 } + 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 } + 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)) - 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 - - # 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 } - 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 } - check_trace_picture anon_trace_file - end + anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user), :fixture => "b") + + # First with no auth + get :picture, :display_name => users(:public_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 } + 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 } + check_trace_picture anon_trace_file end # Test downloading the picture for a trace that doesn't exist @@ -455,38 +453,36 @@ 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}/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 - - # 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 } - 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 } - check_trace_icon public_trace_file - end + public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user), :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 + 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 } + 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 } + 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)) - 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 - - # 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 } - 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 } - check_trace_icon anon_trace_file - end + anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user), :fixture => "b") + + # First with no auth + get :icon, :display_name => users(:public_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 } + 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 } + check_trace_icon anon_trace_file end # Test downloading the icon for a trace that doesn't exist @@ -535,32 +531,30 @@ 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}/a.gpx" do - # Get file to use - file = Rack::Test::UploadedFile.new(public_trace_file.trace_name, "application/gpx+xml") - - # 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 } - assert_response :redirect - 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 "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(public_trace_file.trace_name).read, File.new(trace.trace_name).read - trace.destroy - assert_equal "trackable", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v - end + # Get file to use + fixture = Rails.root.join("test", "gpx", "fixtures", "a.gpx") + file = Rack::Test::UploadedFile.new(fixture, "application/gpx+xml") + + # 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 } + assert_response :redirect + 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 "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 + trace.destroy + assert_equal "trackable", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v end # Test fetching the edit page for a trace @@ -711,63 +705,60 @@ 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}/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 - - # 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 - 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 - check_trace_data public_trace_file - end + public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user), :fixture => "a") + + # First with no auth + get :api_data, :display_name => users(:normal_user).display_name, :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 + 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 + 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)) - 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") - - # First get the data as is - get :api_data, :display_name => users(:public_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 :api_data, :display_name => users(:public_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 :api_data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id, :format => "gpx" - check_trace_data identifiable_trace_file - end + identifiable_trace_file = create(:trace, :visibility => "identifiable", :user => users(:public_user), :fixture => "d") + + # Authenticate as the owner of the trace we will be using + basic_authorization(users(:public_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 + 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" + 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" + 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)) - 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 - - # 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 - 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 - check_trace_data anon_trace_file - end + anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user), :fixture => "b") + + # First with no auth + get :api_data, :display_name => users(:public_user).display_name, :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 + 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 + check_trace_data anon_trace_file end # Test downloading a trace that doesn't exist through the api @@ -790,118 +781,114 @@ 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}/a.gpx" do - # Get file to use - file = Rack::Test::UploadedFile.new(public_trace_file.trace_name, "application/gpx+xml") - - # 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") - 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 "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(public_trace_file.trace_name).read, File.new(trace.trace_name).read - trace.destroy - assert_equal "trackable", users(:public_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") - 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 "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(public_trace_file.trace_name).read, File.new(trace.trace_name).read - trace.destroy - assert_equal "public", users(: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") - 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 "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(public_trace_file.trace_name).read, File.new(trace.trace_name).read - trace.destroy - assert_equal "private", users(:second_public_user).preferences.where(:k => "gps.trace.visibility").first.v - end + # Get file to use + fixture = Rails.root.join("test", "gpx", "fixtures", "a.gpx") + file = Rack::Test::UploadedFile.new(fixture, "application/gpx+xml") + + # 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") + 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 "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 + trace.destroy + assert_equal "trackable", users(:public_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") + 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 "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 + trace.destroy + assert_equal "public", users(: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") + 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 "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 + trace.destroy + assert_equal "private", users(:second_public_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)) + 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.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 - assert_response :unauthorized - - # Now with some other user, which should fail - basic_authorization(users(:public_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") - 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") - 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") - 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") - t = public_trace_file - t.description = "Changed description" - t.visibility = "private" - content t.to_xml - put :api_update, :id => t.id - assert_response :success - nt = Trace.find(t.id) - assert_equal nt.description, t.description - assert_equal nt.visibility, t.visibility - end + # First with no auth + content public_trace_file.to_xml + put :api_update, :id => public_trace_file.id + assert_response :unauthorized + + # Now with some other user, which should fail + basic_authorization(users(:public_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") + 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") + 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") + 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") + t = public_trace_file + t.description = "Changed description" + t.visibility = "private" + content t.to_xml + put :api_update, :id => t.id + assert_response :success + nt = Trace.find(t.id) + assert_equal nt.description, t.description + assert_equal nt.visibility, t.visibility end # Check deleting a trace through the api diff --git a/test/controllers/user_controller_test.rb b/test/controllers/user_controller_test.rb index a5d723c91..027618631 100644 --- a/test/controllers/user_controller_test.rb +++ b/test/controllers/user_controller_test.rb @@ -813,7 +813,7 @@ class UserControllerTest < ActionController::TestCase assert_select "form#accountForm > fieldset > div.form-row > select#user_preferred_editor > option[selected]", false # Changing to an uploaded image should work - image = Rack::Test::UploadedFile.new("test/traces/a.gif", "image/gif") + image = Rack::Test::UploadedFile.new("test/gpx/fixtures/a.gif", "image/gif") post :account, { :display_name => user.display_name, :image_action => "new", :user => user.attributes.merge(:image => image) }, { :user => user.id } assert_response :success assert_template :account diff --git a/test/factories/traces.rb b/test/factories/traces.rb index 3f409b367..66f810468 100644 --- a/test/factories/traces.rb +++ b/test/factories/traces.rb @@ -12,5 +12,20 @@ FactoryGirl.define do trait :deleted do visible false end + + transient do + fixture nil + end + + after(:create) do |trace, evaluator| + if evaluator.fixture + File.symlink(Rails.root.join("test", "gpx", "fixtures", "#{evaluator.fixture}.gpx"), + Rails.root.join("test", "gpx", "traces", "#{trace.id}.gpx")) + File.symlink(Rails.root.join("test", "gpx", "fixtures", "#{evaluator.fixture}.gif"), + Rails.root.join("test", "gpx", "images", "#{trace.id}.gif")) + File.symlink(Rails.root.join("test", "gpx", "fixtures", "#{evaluator.fixture}_icon.gif"), + Rails.root.join("test", "gpx", "images", "#{trace.id}_icon.gif")) + end + end end end diff --git a/test/traces/a.gif b/test/gpx/fixtures/a.gif similarity index 100% rename from test/traces/a.gif rename to test/gpx/fixtures/a.gif diff --git a/test/traces/a.gpx b/test/gpx/fixtures/a.gpx similarity index 100% rename from test/traces/a.gpx rename to test/gpx/fixtures/a.gpx diff --git a/test/traces/a_icon.gif b/test/gpx/fixtures/a_icon.gif similarity index 100% rename from test/traces/a_icon.gif rename to test/gpx/fixtures/a_icon.gif diff --git a/test/traces/b.gif b/test/gpx/fixtures/b.gif similarity index 100% rename from test/traces/b.gif rename to test/gpx/fixtures/b.gif diff --git a/test/traces/b.gpx b/test/gpx/fixtures/b.gpx similarity index 100% rename from test/traces/b.gpx rename to test/gpx/fixtures/b.gpx diff --git a/test/traces/b_icon.gif b/test/gpx/fixtures/b_icon.gif similarity index 100% rename from test/traces/b_icon.gif rename to test/gpx/fixtures/b_icon.gif diff --git a/test/traces/c.gif b/test/gpx/fixtures/c.gif similarity index 100% rename from test/traces/c.gif rename to test/gpx/fixtures/c.gif diff --git a/test/traces/c.gpx b/test/gpx/fixtures/c.gpx similarity index 100% rename from test/traces/c.gpx rename to test/gpx/fixtures/c.gpx diff --git a/test/traces/c_icon.gif b/test/gpx/fixtures/c_icon.gif similarity index 100% rename from test/traces/c_icon.gif rename to test/gpx/fixtures/c_icon.gif diff --git a/test/traces/d.gif b/test/gpx/fixtures/d.gif similarity index 100% rename from test/traces/d.gif rename to test/gpx/fixtures/d.gif diff --git a/test/traces/d.gpx b/test/gpx/fixtures/d.gpx similarity index 100% rename from test/traces/d.gpx rename to test/gpx/fixtures/d.gpx diff --git a/test/traces/d_icon.gif b/test/gpx/fixtures/d_icon.gif similarity index 100% rename from test/traces/d_icon.gif rename to test/gpx/fixtures/d_icon.gif diff --git a/test/traces/f.gif b/test/gpx/fixtures/f.gif similarity index 100% rename from test/traces/f.gif rename to test/gpx/fixtures/f.gif diff --git a/test/traces/f.gpx b/test/gpx/fixtures/f.gpx similarity index 100% rename from test/traces/f.gpx rename to test/gpx/fixtures/f.gpx diff --git a/test/traces/f_icon.gif b/test/gpx/fixtures/f_icon.gif similarity index 100% rename from test/traces/f_icon.gif rename to test/gpx/fixtures/f_icon.gif diff --git a/test/traces/g.gif b/test/gpx/fixtures/g.gif similarity index 100% rename from test/traces/g.gif rename to test/gpx/fixtures/g.gif diff --git a/test/traces/g.gpx b/test/gpx/fixtures/g.gpx similarity index 100% rename from test/traces/g.gpx rename to test/gpx/fixtures/g.gpx diff --git a/test/traces/g_icon.gif b/test/gpx/fixtures/g_icon.gif similarity index 100% rename from test/traces/g_icon.gif rename to test/gpx/fixtures/g_icon.gif diff --git a/test/traces/h.gif b/test/gpx/fixtures/h.gif similarity index 100% rename from test/traces/h.gif rename to test/gpx/fixtures/h.gif diff --git a/test/traces/h.gpx b/test/gpx/fixtures/h.gpx similarity index 100% rename from test/traces/h.gpx rename to test/gpx/fixtures/h.gpx diff --git a/test/traces/h_icon.gif b/test/gpx/fixtures/h_icon.gif similarity index 100% rename from test/traces/h_icon.gif rename to test/gpx/fixtures/h_icon.gif diff --git a/test/traces/i.gif b/test/gpx/fixtures/i.gif similarity index 100% rename from test/traces/i.gif rename to test/gpx/fixtures/i.gif diff --git a/test/traces/i.gpx b/test/gpx/fixtures/i.gpx similarity index 100% rename from test/traces/i.gpx rename to test/gpx/fixtures/i.gpx diff --git a/test/traces/i_icon.gif b/test/gpx/fixtures/i_icon.gif similarity index 100% rename from test/traces/i_icon.gif rename to test/gpx/fixtures/i_icon.gif diff --git a/test/traces/j.gpx b/test/gpx/fixtures/j.gpx similarity index 100% rename from test/traces/j.gpx rename to test/gpx/fixtures/j.gpx diff --git a/test/gpx/images/.gitkeep b/test/gpx/images/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/test/gpx/traces/.gitkeep b/test/gpx/traces/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb index c9530b067..bc5122c13 100644 --- a/test/models/trace_test.rb +++ b/test/models/trace_test.rb @@ -7,13 +7,16 @@ class TraceTest < ActiveSupport::TestCase def setup @gpx_trace_dir = Object.send("remove_const", "GPX_TRACE_DIR") - Object.const_set("GPX_TRACE_DIR", File.dirname(__FILE__) + "/../traces") + Object.const_set("GPX_TRACE_DIR", Rails.root.join("test", "gpx", "traces")) @gpx_image_dir = Object.send("remove_const", "GPX_IMAGE_DIR") - Object.const_set("GPX_IMAGE_DIR", File.dirname(__FILE__) + "/../traces") + Object.const_set("GPX_IMAGE_DIR", Rails.root.join("test", "gpx", "images")) end def teardown + File.unlink(*Dir.glob(File.join(GPX_TRACE_DIR, "*.gpx"))) + File.unlink(*Dir.glob(File.join(GPX_IMAGE_DIR, "*.gif"))) + Object.send("remove_const", "GPX_TRACE_DIR") Object.const_set("GPX_TRACE_DIR", @gpx_trace_dir) @@ -166,10 +169,7 @@ class TraceTest < ActiveSupport::TestCase end def test_large_picture - trace = create(:trace) - picture = trace.stub :large_picture_name, "#{GPX_IMAGE_DIR}/a.gif" do - trace.large_picture - end + picture = File.read(Rails.root.join("test", "gpx", "fixtures", "a.gif"), :mode => "rb") trace = Trace.create trace.large_picture = picture @@ -180,10 +180,7 @@ class TraceTest < ActiveSupport::TestCase end def test_icon_picture - trace = create(:trace) - picture = trace.stub :icon_picture_name, "#{GPX_IMAGE_DIR}/a_icon.gif" do - trace.icon_picture - end + picture = File.read(Rails.root.join("test", "gpx", "fixtures", "a_icon.gif"), :mode => "rb") trace = Trace.create trace.icon_picture = picture @@ -201,24 +198,15 @@ class TraceTest < ActiveSupport::TestCase end def check_mime_type(id, mime_type) - trace = create(:trace) - trace.stub :trace_name, "#{GPX_TRACE_DIR}/#{id}.gpx" do - assert_equal mime_type, trace.mime_type - end + assert_equal mime_type, create(:trace, :fixture => id).mime_type end def check_extension_name(id, extension_name) - trace = create(:trace) - trace.stub :trace_name, "#{GPX_TRACE_DIR}/#{id}.gpx" do - assert_equal extension_name, trace.extension_name - end + assert_equal extension_name, create(:trace, :fixture => id).extension_name end def check_xml_file(id, md5sum) - trace = create(:trace) - trace.stub :trace_name, "#{GPX_TRACE_DIR}/#{id}.gpx" do - assert_equal md5sum, md5sum(trace.xml_file) - end + assert_equal md5sum, md5sum(create(:trace, :fixture => id).xml_file) end def trace_valid(attrs, result = true) -- 2.43.2