From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 16 Nov 2016 17:45:26 +0000 (+0000)
Subject: Rename test trace fixtures to use letters instead of numbers.
X-Git-Tag: live~4149^2~2
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/a66f0f32e977cb2d6ae7231e7014861c119cc657?hp=-c

Rename test trace fixtures to use letters instead of numbers.

This prevents them from being deleted by mistake, if trace.delete is
called on a factory-generated trace with a coincidental id.
---

a66f0f32e977cb2d6ae7231e7014861c119cc657
diff --git a/test/controllers/trace_controller_test.rb b/test/controllers/trace_controller_test.rb
index d91ab3e09..d6159ae40 100644
--- a/test/controllers/trace_controller_test.rb
+++ b/test/controllers/trace_controller_test.rb
@@ -306,7 +306,7 @@ class TraceControllerTest < ActionController::TestCase
   # Test downloading a trace
   def test_data
     public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
-    Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/1.gpx" do
+    Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/a.gpx" do
       # First with no auth, which should work since the trace is public
       get :data, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
       check_trace_data public_trace_file
@@ -324,7 +324,7 @@ class TraceControllerTest < ActionController::TestCase
   # Test downloading a compressed trace
   def test_data_compressed
     identifiable_trace_file = create(:trace, :visibility => "identifiable")
-    Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/4.gpx" do
+    Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/d.gpx" do
       # First get the data as is
       get :data, :display_name => users(:public_user).display_name, :id => identifiable_trace_file.id
       check_trace_data identifiable_trace_file, "application/x-gzip", "gpx.gz"
@@ -342,7 +342,7 @@ class TraceControllerTest < ActionController::TestCase
   # Check an anonymous trace can't be downloaded by another user
   def test_data_anon
     anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user))
-    Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/2.gpx" do
+    Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/b.gpx" do
       # First with no auth
       get :data, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
       assert_response :not_found
@@ -377,7 +377,7 @@ class TraceControllerTest < ActionController::TestCase
   # Test downloading the picture for a trace
   def test_picture
     public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
-    Trace.stub_any_instance :large_picture_name, "#{GPX_TRACE_DIR}/1.gif" do
+    Trace.stub_any_instance :large_picture_name, "#{GPX_TRACE_DIR}/a.gif" do
       # First with no auth, which should work since the trace is public
       get :picture, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
       check_trace_picture public_trace_file
@@ -395,7 +395,7 @@ class TraceControllerTest < ActionController::TestCase
   # Check the picture for an anonymous trace can't be downloaded by another user
   def test_picture_anon
     anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user))
-    Trace.stub_any_instance :large_picture_name, "#{GPX_TRACE_DIR}/2.gif" do
+    Trace.stub_any_instance :large_picture_name, "#{GPX_TRACE_DIR}/b.gif" do
       # First with no auth
       get :picture, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
       assert_response :forbidden
@@ -429,7 +429,7 @@ class TraceControllerTest < ActionController::TestCase
   # Test downloading the icon for a trace
   def test_icon
     public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
-    Trace.stub_any_instance :icon_picture_name, "#{GPX_TRACE_DIR}/1_icon.gif" do
+    Trace.stub_any_instance :icon_picture_name, "#{GPX_TRACE_DIR}/a_icon.gif" do
       # First with no auth, which should work since the trace is public
       get :icon, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
       check_trace_icon public_trace_file
@@ -447,7 +447,7 @@ class TraceControllerTest < ActionController::TestCase
   # Check the icon for an anonymous trace can't be downloaded by another user
   def test_icon_anon
     anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user))
-    Trace.stub_any_instance :icon_picture_name, "#{GPX_TRACE_DIR}/2_icon.gif" do
+    Trace.stub_any_instance :icon_picture_name, "#{GPX_TRACE_DIR}/b_icon.gif" do
       # First with no auth
       get :icon, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
       assert_response :forbidden
@@ -509,7 +509,7 @@ class TraceControllerTest < ActionController::TestCase
   # Test creating a trace
   def test_create_post
     public_trace_file = create(:trace, :visibility => "public")
-    public_trace_file.stub :trace_name, "#{GPX_TRACE_DIR}/1.gpx" do
+    public_trace_file.stub :trace_name, "#{GPX_TRACE_DIR}/a.gpx" do
       # Get file to use
       file = Rack::Test::UploadedFile.new(public_trace_file.trace_name, "application/gpx+xml")
 
@@ -525,7 +525,7 @@ class TraceControllerTest < ActionController::TestCase
       assert_redirected_to :action => :list, :display_name => users(:public_user).display_name
       assert_match /file has been uploaded/, flash[:notice]
       trace = Trace.order(:id => :desc).first
-      assert_equal "1.gpx", trace.name
+      assert_equal "a.gpx", trace.name
       assert_equal "New Trace", trace.description
       assert_equal %w(new trace), trace.tags.order(:tag).collect(&:tag)
       assert_equal "trackable", trace.visibility
@@ -685,7 +685,7 @@ class TraceControllerTest < ActionController::TestCase
   # Test downloading a trace through the api
   def test_api_data
     public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
-    Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/1.gpx" do
+    Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/a.gpx" do
       # First with no auth
       get :api_data, :display_name => users(:normal_user).display_name, :id => public_trace_file.id
       assert_response :unauthorized
@@ -705,7 +705,7 @@ class TraceControllerTest < ActionController::TestCase
   # Test downloading a compressed trace through the api
   def test_api_data_compressed
     identifiable_trace_file = create(:trace, :visibility => "identifiable", :user => users(:public_user))
-    Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/4.gpx" do
+    Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/d.gpx" do
       # Authenticate as the owner of the trace we will be using
       basic_authorization(users(:public_user).display_name, "test")
 
@@ -726,7 +726,7 @@ class TraceControllerTest < ActionController::TestCase
   # Check an anonymous trace can't be downloaded by another user through the api
   def test_api_data_anon
     anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user))
-    Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/2.gpx" do
+    Trace.stub_any_instance :trace_name, "#{GPX_TRACE_DIR}/b.gpx" do
       # First with no auth
       get :api_data, :display_name => users(:public_user).display_name, :id => anon_trace_file.id
       assert_response :unauthorized
@@ -764,7 +764,7 @@ class TraceControllerTest < ActionController::TestCase
   # Test creating a trace through the api
   def test_api_create
     public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
-    public_trace_file.stub :trace_name, "#{GPX_TRACE_DIR}/1.gpx" do
+    public_trace_file.stub :trace_name, "#{GPX_TRACE_DIR}/a.gpx" do
       # Get file to use
       file = Rack::Test::UploadedFile.new(public_trace_file.trace_name, "application/gpx+xml")
 
@@ -779,7 +779,7 @@ class TraceControllerTest < ActionController::TestCase
       post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable"
       assert_response :success
       trace = Trace.find(response.body.to_i)
-      assert_equal "1.gpx", trace.name
+      assert_equal "a.gpx", trace.name
       assert_equal "New Trace", trace.description
       assert_equal %w(new trace), trace.tags.order(:tag).collect(&:tag)
       assert_equal "trackable", trace.visibility
@@ -797,7 +797,7 @@ class TraceControllerTest < ActionController::TestCase
       post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :public => 1
       assert_response :success
       trace = Trace.find(response.body.to_i)
-      assert_equal "1.gpx", trace.name
+      assert_equal "a.gpx", trace.name
       assert_equal "New Trace", trace.description
       assert_equal %w(new trace), trace.tags.order(:tag).collect(&:tag)
       assert_equal "public", trace.visibility
@@ -815,7 +815,7 @@ class TraceControllerTest < ActionController::TestCase
       post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :public => 0
       assert_response :success
       trace = Trace.find(response.body.to_i)
-      assert_equal "1.gpx", trace.name
+      assert_equal "a.gpx", trace.name
       assert_equal "New Trace", trace.description
       assert_equal %w(new trace), trace.tags.order(:tag).collect(&:tag)
       assert_equal "private", trace.visibility
@@ -832,7 +832,7 @@ class TraceControllerTest < ActionController::TestCase
     deleted_trace_file = create(:trace, :deleted, :user => users(:public_user))
     anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user))
 
-    public_trace_file.stub :trace_name, "#{GPX_TRACE_DIR}/1.gpx" do
+    public_trace_file.stub :trace_name, "#{GPX_TRACE_DIR}/a.gpx" do
       # First with no auth
       content public_trace_file.to_xml
       put :api_update, :id => public_trace_file.id
diff --git a/test/controllers/user_controller_test.rb b/test/controllers/user_controller_test.rb
index 717089b64..9e499b605 100644
--- a/test/controllers/user_controller_test.rb
+++ b/test/controllers/user_controller_test.rb
@@ -804,7 +804,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/1.gif", "image/gif")
+    image = Rack::Test::UploadedFile.new("test/traces/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/models/trace_test.rb b/test/models/trace_test.rb
index bdc187c99..c9530b067 100644
--- a/test/models/trace_test.rb
+++ b/test/models/trace_test.rb
@@ -132,42 +132,42 @@ class TraceTest < ActiveSupport::TestCase
 
   def test_mime_type
     # The ids refer to the .gpx fixtures in test/traces
-    check_mime_type(1, "application/gpx+xml")
-    check_mime_type(2, "application/gpx+xml")
-    check_mime_type(3, "application/x-bzip2")
-    check_mime_type(4, "application/x-gzip")
-    check_mime_type(6, "application/x-zip")
-    check_mime_type(7, "application/x-tar")
-    check_mime_type(8, "application/x-gzip")
-    check_mime_type(9, "application/x-bzip2")
+    check_mime_type("a", "application/gpx+xml")
+    check_mime_type("b", "application/gpx+xml")
+    check_mime_type("c", "application/x-bzip2")
+    check_mime_type("d", "application/x-gzip")
+    check_mime_type("f", "application/x-zip")
+    check_mime_type("g", "application/x-tar")
+    check_mime_type("h", "application/x-gzip")
+    check_mime_type("i", "application/x-bzip2")
   end
 
   def test_extension_name
     # The ids refer to the .gpx fixtures in test/traces
-    check_extension_name(1, ".gpx")
-    check_extension_name(2, ".gpx")
-    check_extension_name(3, ".gpx.bz2")
-    check_extension_name(4, ".gpx.gz")
-    check_extension_name(6, ".zip")
-    check_extension_name(7, ".tar")
-    check_extension_name(8, ".tar.gz")
-    check_extension_name(9, ".tar.bz2")
+    check_extension_name("a", ".gpx")
+    check_extension_name("b", ".gpx")
+    check_extension_name("c", ".gpx.bz2")
+    check_extension_name("d", ".gpx.gz")
+    check_extension_name("f", ".zip")
+    check_extension_name("g", ".tar")
+    check_extension_name("h", ".tar.gz")
+    check_extension_name("i", ".tar.bz2")
   end
 
   def test_xml_file
-    check_xml_file(1, "848caa72f2f456d1bd6a0fdf228aa1b9")
-    check_xml_file(2, "66179ca44f1e93d8df62e2b88cbea732")
-    check_xml_file(3, "848caa72f2f456d1bd6a0fdf228aa1b9")
-    check_xml_file(4, "abd6675fdf3024a84fc0a1deac147c0d")
-    check_xml_file(6, "848caa72f2f456d1bd6a0fdf228aa1b9")
-    check_xml_file(7, "848caa72f2f456d1bd6a0fdf228aa1b9")
-    check_xml_file(8, "848caa72f2f456d1bd6a0fdf228aa1b9")
-    check_xml_file(9, "848caa72f2f456d1bd6a0fdf228aa1b9")
+    check_xml_file("a", "848caa72f2f456d1bd6a0fdf228aa1b9")
+    check_xml_file("b", "66179ca44f1e93d8df62e2b88cbea732")
+    check_xml_file("c", "848caa72f2f456d1bd6a0fdf228aa1b9")
+    check_xml_file("d", "abd6675fdf3024a84fc0a1deac147c0d")
+    check_xml_file("f", "848caa72f2f456d1bd6a0fdf228aa1b9")
+    check_xml_file("g", "848caa72f2f456d1bd6a0fdf228aa1b9")
+    check_xml_file("h", "848caa72f2f456d1bd6a0fdf228aa1b9")
+    check_xml_file("i", "848caa72f2f456d1bd6a0fdf228aa1b9")
   end
 
   def test_large_picture
     trace = create(:trace)
-    picture = trace.stub :large_picture_name, "#{GPX_IMAGE_DIR}/1.gif" do
+    picture = trace.stub :large_picture_name, "#{GPX_IMAGE_DIR}/a.gif" do
       trace.large_picture
     end
 
@@ -181,7 +181,7 @@ class TraceTest < ActiveSupport::TestCase
 
   def test_icon_picture
     trace = create(:trace)
-    picture = trace.stub :icon_picture_name, "#{GPX_IMAGE_DIR}/1_icon.gif" do
+    picture = trace.stub :icon_picture_name, "#{GPX_IMAGE_DIR}/a_icon.gif" do
       trace.icon_picture
     end
 
diff --git a/test/traces/1.gif b/test/traces/a.gif
similarity index 100%
rename from test/traces/1.gif
rename to test/traces/a.gif
diff --git a/test/traces/1.gpx b/test/traces/a.gpx
similarity index 100%
rename from test/traces/1.gpx
rename to test/traces/a.gpx
diff --git a/test/traces/1_icon.gif b/test/traces/a_icon.gif
similarity index 100%
rename from test/traces/1_icon.gif
rename to test/traces/a_icon.gif
diff --git a/test/traces/2.gif b/test/traces/b.gif
similarity index 100%
rename from test/traces/2.gif
rename to test/traces/b.gif
diff --git a/test/traces/10.gpx b/test/traces/b.gpx
similarity index 100%
rename from test/traces/10.gpx
rename to test/traces/b.gpx
diff --git a/test/traces/2_icon.gif b/test/traces/b_icon.gif
similarity index 100%
rename from test/traces/2_icon.gif
rename to test/traces/b_icon.gif
diff --git a/test/traces/3.gif b/test/traces/c.gif
similarity index 100%
rename from test/traces/3.gif
rename to test/traces/c.gif
diff --git a/test/traces/3.gpx b/test/traces/c.gpx
similarity index 100%
rename from test/traces/3.gpx
rename to test/traces/c.gpx
diff --git a/test/traces/3_icon.gif b/test/traces/c_icon.gif
similarity index 100%
rename from test/traces/3_icon.gif
rename to test/traces/c_icon.gif
diff --git a/test/traces/4.gif b/test/traces/d.gif
similarity index 100%
rename from test/traces/4.gif
rename to test/traces/d.gif
diff --git a/test/traces/4.gpx b/test/traces/d.gpx
similarity index 100%
rename from test/traces/4.gpx
rename to test/traces/d.gpx
diff --git a/test/traces/4_icon.gif b/test/traces/d_icon.gif
similarity index 100%
rename from test/traces/4_icon.gif
rename to test/traces/d_icon.gif
diff --git a/test/traces/6.gif b/test/traces/f.gif
similarity index 100%
rename from test/traces/6.gif
rename to test/traces/f.gif
diff --git a/test/traces/6.gpx b/test/traces/f.gpx
similarity index 100%
rename from test/traces/6.gpx
rename to test/traces/f.gpx
diff --git a/test/traces/6_icon.gif b/test/traces/f_icon.gif
similarity index 100%
rename from test/traces/6_icon.gif
rename to test/traces/f_icon.gif
diff --git a/test/traces/7.gif b/test/traces/g.gif
similarity index 100%
rename from test/traces/7.gif
rename to test/traces/g.gif
diff --git a/test/traces/7.gpx b/test/traces/g.gpx
similarity index 100%
rename from test/traces/7.gpx
rename to test/traces/g.gpx
diff --git a/test/traces/7_icon.gif b/test/traces/g_icon.gif
similarity index 100%
rename from test/traces/7_icon.gif
rename to test/traces/g_icon.gif
diff --git a/test/traces/8.gif b/test/traces/h.gif
similarity index 100%
rename from test/traces/8.gif
rename to test/traces/h.gif
diff --git a/test/traces/8.gpx b/test/traces/h.gpx
similarity index 100%
rename from test/traces/8.gpx
rename to test/traces/h.gpx
diff --git a/test/traces/8_icon.gif b/test/traces/h_icon.gif
similarity index 100%
rename from test/traces/8_icon.gif
rename to test/traces/h_icon.gif
diff --git a/test/traces/9.gif b/test/traces/i.gif
similarity index 100%
rename from test/traces/9.gif
rename to test/traces/i.gif
diff --git a/test/traces/9.gpx b/test/traces/i.gpx
similarity index 100%
rename from test/traces/9.gpx
rename to test/traces/i.gpx
diff --git a/test/traces/9_icon.gif b/test/traces/i_icon.gif
similarity index 100%
rename from test/traces/9_icon.gif
rename to test/traces/i_icon.gif
diff --git a/test/traces/2.gpx b/test/traces/j.gpx
similarity index 100%
rename from test/traces/2.gpx
rename to test/traces/j.gpx