Switch traces to use ActiveStorage

[rails.git] / test / models / trace_test.rb

diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb
index 9682d6b288a0a3958f5bfa15e0daab3c68dd12c7..1322964c2734da4e5b907945c14a093970cc5497 100644 (file)
--- a/test/models/trace_test.rb
+++ b/test/models/trace_test.rb
@@ -136,11 +136,11 @@ class TraceTest < ActiveSupport::TestCase
     check_mime_type("a", "application/gpx+xml")
     check_mime_type("b", "application/gpx+xml")
     check_mime_type("c", "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("d", "application/gzip")
+    check_mime_type("f", "application/zip")

     check_mime_type("g", "application/x-tar")
     check_mime_type("g", "application/x-tar")

-    check_mime_type("h", "application/x-gzip")
-    check_mime_type("i", "application/x-bzip2")
+    check_mime_type("h", "application/x-tar+gzip")
+    check_mime_type("i", "application/x-tar+x-bzip2")

   end
 
   def test_extension_name
   end
 
   def test_extension_name


@@ -168,24 +168,16 @@ class TraceTest < ActiveSupport::TestCase
 
   def test_large_picture
     picture = File.read(Rails.root.join("test/gpx/fixtures/a.gif"), :mode => "rb")
 
   def test_large_picture
     picture = File.read(Rails.root.join("test/gpx/fixtures/a.gif"), :mode => "rb")

+    trace = create(:trace, :fixture => "a")

 
 

-    trace = Trace.create
-    trace.large_picture = picture
-    assert_equal "7c841749e084ee4a5d13f12cd3bef456", md5sum(File.new(trace.large_picture_name))

     assert_equal picture, trace.large_picture
     assert_equal picture, trace.large_picture

-
-    trace.destroy

   end
 
   def test_icon_picture
     picture = File.read(Rails.root.join("test/gpx/fixtures/a_icon.gif"), :mode => "rb")
   end
 
   def test_icon_picture
     picture = File.read(Rails.root.join("test/gpx/fixtures/a_icon.gif"), :mode => "rb")

+    trace = create(:trace, :fixture => "a")

 
 

-    trace = Trace.create
-    trace.icon_picture = picture
-    assert_equal "b47baf22ed0e85d77e808694fad0ee27", md5sum(File.new(trace.icon_picture_name))

     assert_equal picture, trace.icon_picture
     assert_equal picture, trace.icon_picture

-
-    trace.destroy

   end
 
   def test_import_removes_previous_tracepoints
   end
 
   def test_import_removes_previous_tracepoints


@@ -215,29 +207,27 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_import_creates_icon
   end
 
   def test_import_creates_icon

-    trace = create(:trace, :fixture => "a")
-    icon_path = File.join(Settings.gpx_image_dir, "#{trace.id}_icon.gif")
-    FileUtils.rm(icon_path)
-    assert_not File.exist?(icon_path)
+    trace = create(:trace, :inserted => false, :fixture => "a")
+
+    assert_not trace.icon.attached?

 
     trace.import
 
 
     trace.import
 

-    assert_path_exists(icon_path)
+    assert trace.icon.attached?

   end
 
   def test_import_creates_large_picture
   end
 
   def test_import_creates_large_picture

-    trace = create(:trace, :fixture => "a")
-    large_picture_path = File.join(Settings.gpx_image_dir, "#{trace.id}.gif")
-    FileUtils.rm(large_picture_path)
-    assert_not File.exist?(large_picture_path)
+    trace = create(:trace, :inserted => false, :fixture => "a")
+
+    assert_not trace.image.attached?

 
     trace.import
 
 
     trace.import
 

-    assert_path_exists(large_picture_path)
+    assert trace.image.attached?

   end
 
   def test_import_handles_bz2
   end
 
   def test_import_handles_bz2

-    trace = create(:trace, :fixture => "c")
+    trace = create(:trace, :inserted => false, :fixture => "c")

 
     trace.import
 
 
     trace.import
 


@@ -245,7 +235,7 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_import_handles_plain
   end
 
   def test_import_handles_plain

-    trace = create(:trace, :fixture => "a")
+    trace = create(:trace, :inserted => false, :fixture => "a")

 
     trace.import
 
 
     trace.import
 


@@ -253,7 +243,7 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_import_handles_plain_with_bom
   end
 
   def test_import_handles_plain_with_bom

-    trace = create(:trace, :fixture => "b")
+    trace = create(:trace, :inserted => false, :fixture => "b")

 
     trace.import
 
 
     trace.import
 


@@ -261,7 +251,7 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_import_handles_gz
   end
 
   def test_import_handles_gz

-    trace = create(:trace, :fixture => "d")
+    trace = create(:trace, :inserted => false, :fixture => "d")

 
     trace.import
 
 
     trace.import
 


@@ -269,7 +259,7 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_import_handles_zip
   end
 
   def test_import_handles_zip

-    trace = create(:trace, :fixture => "f")
+    trace = create(:trace, :inserted => false, :fixture => "f")

 
     trace.import
 
 
     trace.import
 


@@ -277,7 +267,7 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_import_handles_tar
   end
 
   def test_import_handles_tar

-    trace = create(:trace, :fixture => "g")
+    trace = create(:trace, :inserted => false, :fixture => "g")

 
     trace.import
 
 
     trace.import
 


@@ -285,7 +275,7 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_import_handles_tar_gz
   end
 
   def test_import_handles_tar_gz

-    trace = create(:trace, :fixture => "h")
+    trace = create(:trace, :inserted => false, :fixture => "h")

 
     trace.import
 
 
     trace.import
 


@@ -293,7 +283,7 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_import_handles_tar_bz2
   end
 
   def test_import_handles_tar_bz2

-    trace = create(:trace, :fixture => "i")
+    trace = create(:trace, :inserted => false, :fixture => "i")

 
     trace.import
 
 
     trace.import