Merge remote-tracking branch 'openstreetmap/pull/903'

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

diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb
index 4be160959c26d8c9e98a421cd484cdf7fdcd0a3d..524ec637a85e23903b1c8be2d075bc33dbdbef2b 100644 (file)
--- a/test/models/trace_test.rb
+++ b/test/models/trace_test.rb
@@ -7,41 +7,48 @@ 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")
+
+    @gpx_image_dir = Object.send("remove_const", "GPX_IMAGE_DIR")
+    Object.const_set("GPX_IMAGE_DIR", File.dirname(__FILE__) + "/../traces")
   end
 
   def teardown
     Object.send("remove_const", "GPX_TRACE_DIR")
     Object.const_set("GPX_TRACE_DIR", @gpx_trace_dir)
+
+    Object.send("remove_const", "GPX_IMAGE_DIR")
+    Object.const_set("GPX_IMAGE_DIR", @gpx_image_dir)
   end
 
   def test_trace_count
-    assert_equal 9, Trace.count
+    assert_equal 10, Trace.count
   end
 
   def test_visible
     check_query(Trace.visible, [
       :public_trace_file, :anon_trace_file, :trackable_trace_file,
       :identifiable_trace_file, :zipped_trace_file, :tar_trace_file,
-      :tar_gzip_trace_file, :tar_bzip_trace_file
+      :tar_gzip_trace_file, :tar_bzip_trace_file, :pending_trace_file
     ])
   end
 
   def test_visible_to
     check_query(Trace.visible_to(1), [
-      :public_trace_file, :identifiable_trace_file
+      :public_trace_file, :identifiable_trace_file, :pending_trace_file
     ])
     check_query(Trace.visible_to(2), [
       :public_trace_file, :anon_trace_file, :trackable_trace_file,
-      :identifiable_trace_file
+      :identifiable_trace_file, :pending_trace_file
     ])
     check_query(Trace.visible_to(3), [
-      :public_trace_file, :identifiable_trace_file
+      :public_trace_file, :identifiable_trace_file, :pending_trace_file
     ])
   end
 
   def test_visible_to_all
     check_query(Trace.visible_to_all, [
-      :public_trace_file, :identifiable_trace_file, :deleted_trace_file
+      :public_trace_file, :identifiable_trace_file,
+      :deleted_trace_file, :pending_trace_file
     ])
   end
 
@@ -141,6 +148,28 @@ class TraceTest < ActiveSupport::TestCase
     assert_equal "848caa72f2f456d1bd6a0fdf228aa1b9", md5sum(gpx_files(:tar_bzip_trace_file).xml_file)
   end
 
+  def test_large_picture
+    picture = gpx_files(:public_trace_file).large_picture
+    trace = Trace.create
+
+    trace.large_picture = picture
+    assert_equal "7c841749e084ee4a5d13f12cd3bef456", md5sum(File.new(trace.large_picture_name))
+    assert_equal picture, trace.large_picture
+
+    trace.destroy
+  end
+
+  def test_icon_picture
+    picture = gpx_files(:public_trace_file).icon_picture
+    trace = Trace.create
+
+    trace.icon_picture = picture
+    assert_equal "b47baf22ed0e85d77e808694fad0ee27", md5sum(File.new(trace.icon_picture_name))
+    assert_equal picture, trace.icon_picture
+
+    trace.destroy
+  end
+
   private
 
   def check_query(query, traces)