Merge remote-tracking branch 'upstream/pull/5157'

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

diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb
index 24c66c4900868fa98a315a5ef5f9a3eeb25a9acd..f95ebe4c320bd3dafa90de6d4ecb9cfb2633be1b 100644 (file)
--- a/test/models/trace_test.rb
+++ b/test/models/trace_test.rb
@@ -1,12 +1,7 @@
 require "test_helper"
 require "test_helper"

-require "minitest/mock"
+require "gpx"

 
 class TraceTest < ActiveSupport::TestCase
 
 class TraceTest < ActiveSupport::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
-

   def test_visible
     public_trace_file = create(:trace)
     create(:trace, :deleted)
   def test_visible
     public_trace_file = create(:trace)
     create(:trace, :deleted)


@@ -65,30 +60,34 @@ class TraceTest < ActiveSupport::TestCase
 
   def test_validations
     trace_valid({})
 
   def test_validations
     trace_valid({})

-    trace_valid({ :user_id => nil }, false)
-    trace_valid(:name => "a" * 255)
-    trace_valid({ :name => "a" * 256 }, false)
-    trace_valid({ :description => nil }, false)
-    trace_valid(:description => "a" * 255)
-    trace_valid({ :description => "a" * 256 }, false)
-    trace_valid(:visibility => "private")
-    trace_valid(:visibility => "public")
-    trace_valid(:visibility => "trackable")
-    trace_valid(:visibility => "identifiable")
-    trace_valid({ :visibility => "foo" }, false)
-  end
-
-  def test_tagstring
+    trace_valid({ :user_id => nil }, :valid => false)
+    trace_valid({ :name => "a" * 255 })
+    trace_valid({ :name => "a" * 256 }, :valid => false)
+    trace_valid({ :description => nil }, :valid => false)
+    trace_valid({ :description => "a" * 255 })
+    trace_valid({ :description => "a" * 256 }, :valid => false)
+    trace_valid({ :visibility => "private" })
+    trace_valid({ :visibility => "public" })
+    trace_valid({ :visibility => "trackable" })
+    trace_valid({ :visibility => "identifiable" })
+    trace_valid({ :visibility => "foo" }, :valid => false)
+  end
+
+  def test_tagstring_handles_space_separated_tags

     trace = build(:trace)
     trace.tagstring = "foo bar baz"
     trace = build(:trace)
     trace.tagstring = "foo bar baz"

-    assert trace.valid?
+    assert_predicate trace, :valid?

     assert_equal 3, trace.tags.length
     assert_equal "foo", trace.tags[0].tag
     assert_equal "bar", trace.tags[1].tag
     assert_equal "baz", trace.tags[2].tag
     assert_equal "foo, bar, baz", trace.tagstring
     assert_equal 3, trace.tags.length
     assert_equal "foo", trace.tags[0].tag
     assert_equal "bar", trace.tags[1].tag
     assert_equal "baz", trace.tags[2].tag
     assert_equal "foo, bar, baz", trace.tagstring

+  end
+
+  def test_tagstring_handles_comma_separated_tags
+    trace = build(:trace)

     trace.tagstring = "foo, bar baz ,qux"
     trace.tagstring = "foo, bar baz ,qux"

-    assert trace.valid?
+    assert_predicate trace, :valid?

     assert_equal 3, trace.tags.length
     assert_equal "foo", trace.tags[0].tag
     assert_equal "bar baz", trace.tags[1].tag
     assert_equal 3, trace.tags.length
     assert_equal "foo", trace.tags[0].tag
     assert_equal "bar baz", trace.tags[1].tag


@@ -96,28 +95,39 @@ class TraceTest < ActiveSupport::TestCase
     assert_equal "foo, bar baz, qux", trace.tagstring
   end
 
     assert_equal "foo, bar baz, qux", trace.tagstring
   end
 

+  def test_tagstring_strips_whitespace
+    trace = build(:trace)
+    trace.tagstring = "   zero  ,  one , two  "
+    assert_predicate trace, :valid?
+    assert_equal 3, trace.tags.length
+    assert_equal "zero", trace.tags[0].tag
+    assert_equal "one", trace.tags[1].tag
+    assert_equal "two", trace.tags[2].tag
+    assert_equal "zero, one, two", trace.tagstring
+  end
+

   def test_public?
   def test_public?

-    assert_equal true, build(:trace, :visibility => "public").public?
-    assert_equal false, build(:trace, :visibility => "private").public?
-    assert_equal false, build(:trace, :visibility => "trackable").public?
-    assert_equal true, build(:trace, :visibility => "identifiable").public?
-    assert_equal true, build(:trace, :deleted, :visibility => "public").public?
+    assert_predicate build(:trace, :visibility => "public"), :public?
+    assert_not_predicate build(:trace, :visibility => "private"), :public?
+    assert_not_predicate build(:trace, :visibility => "trackable"), :public?
+    assert_predicate build(:trace, :visibility => "identifiable"), :public?
+    assert_predicate build(:trace, :deleted, :visibility => "public"), :public?

   end
 
   def test_trackable?
   end
 
   def test_trackable?

-    assert_equal false, build(:trace, :visibility => "public").trackable?
-    assert_equal false, build(:trace, :visibility => "private").trackable?
-    assert_equal true, build(:trace, :visibility => "trackable").trackable?
-    assert_equal true, build(:trace, :visibility => "identifiable").trackable?
-    assert_equal false, build(:trace, :deleted, :visibility => "public").trackable?
+    assert_not_predicate build(:trace, :visibility => "public"), :trackable?
+    assert_not_predicate build(:trace, :visibility => "private"), :trackable?
+    assert_predicate build(:trace, :visibility => "trackable"), :trackable?
+    assert_predicate build(:trace, :visibility => "identifiable"), :trackable?
+    assert_not_predicate build(:trace, :deleted, :visibility => "public"), :trackable?

   end
 
   def test_identifiable?
   end
 
   def test_identifiable?

-    assert_equal false, build(:trace, :visibility => "public").identifiable?
-    assert_equal false, build(:trace, :visibility => "private").identifiable?
-    assert_equal false, build(:trace, :visibility => "trackable").identifiable?
-    assert_equal true, build(:trace, :visibility => "identifiable").identifiable?
-    assert_equal false, build(:trace, :deleted, :visibility => "public").identifiable?
+    assert_not_predicate build(:trace, :visibility => "public"), :identifiable?
+    assert_not_predicate build(:trace, :visibility => "private"), :identifiable?
+    assert_not_predicate build(:trace, :visibility => "trackable"), :identifiable?
+    assert_predicate build(:trace, :visibility => "identifiable"), :identifiable?
+    assert_not_predicate build(:trace, :deleted, :visibility => "public"), :identifiable?

   end
 
   def test_mime_type
   end
 
   def test_mime_type


@@ -125,11 +135,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


@@ -146,7 +156,7 @@ class TraceTest < ActiveSupport::TestCase
 
   def test_xml_file
     check_xml_file("a", "848caa72f2f456d1bd6a0fdf228aa1b9")
 
   def test_xml_file
     check_xml_file("a", "848caa72f2f456d1bd6a0fdf228aa1b9")

-    check_xml_file("b", "66179ca44f1e93d8df62e2b88cbea732")
+    check_xml_file("b", "db4cb5ed2d7d2b627b3b504296c4f701")

     check_xml_file("c", "848caa72f2f456d1bd6a0fdf228aa1b9")
     check_xml_file("d", "abd6675fdf3024a84fc0a1deac147c0d")
     check_xml_file("f", "a7c05d676c77dc14369c21be216a3713")
     check_xml_file("c", "848caa72f2f456d1bd6a0fdf228aa1b9")
     check_xml_file("d", "abd6675fdf3024a84fc0a1deac147c0d")
     check_xml_file("f", "a7c05d676c77dc14369c21be216a3713")


@@ -156,176 +166,139 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_large_picture
   end
 
   def test_large_picture

-    picture = File.read(Rails.root.join("test", "gpx", "fixtures", "a.gif"), :mode => "rb")
+    picture = Rails.root.join("test/gpx/fixtures/a.gif").read(: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
   end
 
   def test_icon_picture

-    picture = File.read(Rails.root.join("test", "gpx", "fixtures", "a_icon.gif"), :mode => "rb")
+    picture = Rails.root.join("test/gpx/fixtures/a_icon.gif").read(: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
 
   end
 

-  # When testing the trace.import method, care needs to be taken regarding the icon
-  # fixture files, since the fixtures could be overwritten by newly generated files.
-  # We use FakeFS to temporarily protect the real fixture files from being overwritten.
-

   def test_import_removes_previous_tracepoints
   def test_import_removes_previous_tracepoints

-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace = create(:trace, :fixture => "a")
-      # Tracepoints don't have a primary key, so we use a specific latitude to
-      # check for successful deletion
-      create(:tracepoint, :latitude => 54321, :trace => trace)
-      assert_equal 1, Tracepoint.where(:latitude => 54321).count
+    trace = create(:trace, :fixture => "a")
+    # Tracepoints don't have a primary key, so we use a specific latitude to
+    # check for successful deletion
+    create(:tracepoint, :latitude => 54321, :trace => trace)
+    assert_equal 1, Tracepoint.where(:latitude => 54321).count

 
 

-      trace.import
+    trace.import

 
 

-      assert_equal 0, Tracepoint.where(:latitude => 54321).count
-    end
+    assert_equal 0, Tracepoint.where(:latitude => 54321).count

   end
 
   def test_import_creates_tracepoints
   end
 
   def test_import_creates_tracepoints

-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace = create(:trace, :fixture => "a")
-      assert_equal 0, Tracepoint.where(:gpx_id => trace.id).count
+    trace = create(:trace, :fixture => "a")
+    assert_equal 0, Tracepoint.where(:trace => trace).count

 
 

-      trace.import
+    trace.import

 
 

-      trace.reload
-      assert_equal 1, Tracepoint.where(:gpx_id => trace.id).count
+    trace.reload
+    assert_equal 1, Tracepoint.where(:trace => trace).count

 
 

-      # Check that the tile has been set prior to the bulk import
-      # i.e. that the callbacks have been run correctly
-      assert_equal 3221331576, Tracepoint.where(:gpx_id => trace.id).first.tile
-    end
+    # Check that the tile has been set prior to the bulk import
+    # i.e. that the callbacks have been run correctly
+    assert_equal 3221331576, Tracepoint.find_by(:trace => trace).tile

   end
 
   def test_import_creates_icon
   end
 
   def test_import_creates_icon

-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace = create(:trace, :fixture => "a")
-      icon_path = File.join(Settings.gpx_image_dir, "#{trace.id}_icon.gif")
-      FileUtils.rm(icon_path)
-      assert_equal false, File.exist?(icon_path)
+    trace = create(:trace, :inserted => false, :fixture => "a")

 
 

-      trace.import
+    assert_not_predicate trace.icon, :attached?

 
 

-      assert_equal true, File.exist?(icon_path)
-    end
+    trace.import
+
+    assert_predicate trace.icon, :attached?

   end
 
   def test_import_creates_large_picture
   end
 
   def test_import_creates_large_picture

-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace = create(:trace, :fixture => "a")
-      large_picture_path = File.join(Settings.gpx_image_dir, "#{trace.id}.gif")
-      FileUtils.rm(large_picture_path)
-      assert_equal false, File.exist?(large_picture_path)
+    trace = create(:trace, :inserted => false, :fixture => "a")

 
 

-      trace.import
+    assert_not_predicate trace.image, :attached?

 
 

-      assert_equal true, File.exist?(large_picture_path)
-    end
+    trace.import
+
+    assert_predicate trace.image, :attached?

   end
 
   def test_import_handles_bz2
   end
 
   def test_import_handles_bz2

-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace = create(:trace, :fixture => "c")
+    trace = create(:trace, :inserted => false, :fixture => "c")

 
 

-      trace.import
+    trace.import

 
 

-      assert_equal 1, trace.size
-    end
+    assert_equal 1, trace.size

   end
 
   def test_import_handles_plain
   end
 
   def test_import_handles_plain

-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace = create(:trace, :fixture => "a")
+    trace = create(:trace, :inserted => false, :fixture => "a")

 
 

-      trace.import
+    trace.import

 
 

-      assert_equal 1, trace.size
-    end
+    assert_equal 1, trace.size
+  end
+
+  def test_import_handles_plain_with_bom
+    trace = create(:trace, :inserted => false, :fixture => "b")
+
+    trace.import
+
+    assert_equal 1, trace.size

   end
 
   def test_import_handles_gz
   end
 
   def test_import_handles_gz

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

 
 

-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace.import
+    trace.import

 
 

-      assert_equal 1, trace.size
-    ensure
-      trace.destroy
-    end
+    assert_equal 1, trace.size

   end
 
   def test_import_handles_zip
   end
 
   def test_import_handles_zip

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

 
 

-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace.import
+    trace.import

 
 

-      assert_equal 2, trace.size
-    ensure
-      trace.destroy
-    end
+    assert_equal 2, trace.size

   end
 
   def test_import_handles_tar
   end
 
   def test_import_handles_tar

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

 
 

-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace.import
+    trace.import

 
 

-      assert_equal 2, trace.size
-    ensure
-      trace.destroy
-    end
+    assert_equal 2, trace.size

   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")

 
 

-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace.import
+    trace.import

 
 

-      assert_equal 2, trace.size
-    ensure
-      trace.destroy
-    end
+    assert_equal 2, trace.size

   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")

 
 

-    FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
-      trace.import
+    trace.import

 
 

-      assert_equal 2, trace.size
-    ensure
-      trace.destroy
+    assert_equal 2, trace.size
+  end
+
+  def test_import_enforces_limit
+    trace = create(:trace, :inserted => false, :fixture => "f")
+
+    with_settings(:max_trace_size => 1) do
+      assert_raise GPX::FileTooBigError do
+        trace.import
+      end

     end
     end

+
+    assert_not trace.inserted

   end
 
   private
   end
 
   private


@@ -347,9 +320,9 @@ class TraceTest < ActiveSupport::TestCase
     assert_equal md5sum, md5sum(create(:trace, :fixture => id).xml_file)
   end
 
     assert_equal md5sum, md5sum(create(:trace, :fixture => id).xml_file)
   end
 

-  def trace_valid(attrs, result = true)
+  def trace_valid(attrs, valid: true)

     entry = build(:trace, attrs)
     entry = build(:trace, attrs)

-    assert_equal result, entry.valid?, "Expected #{attrs.inspect} to be #{result}"
+    assert_equal valid, entry.valid?, "Expected #{attrs.inspect} to be #{valid}"

   end
 
   def md5sum(io)
   end
 
   def md5sum(io)