Fix styling of nested lists in rich text

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

diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb
index 1cb94aeef247eb1e3b4b7d28cc1ad4cb1415bc2b..4a6ac109df0544d7aaa6b07b222c7d88dc83c845 100644 (file)
--- a/test/models/trace_test.rb
+++ b/test/models/trace_test.rb
@@ -3,17 +3,18 @@ require "digest"
 require "minitest/mock"
 
 class TraceTest < ActiveSupport::TestCase
 require "minitest/mock"
 
 class TraceTest < ActiveSupport::TestCase

-  fixtures :users
-

   def setup
     @gpx_trace_dir = Object.send("remove_const", "GPX_TRACE_DIR")
   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")
 
     @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
   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)
 
     Object.send("remove_const", "GPX_TRACE_DIR")
     Object.const_set("GPX_TRACE_DIR", @gpx_trace_dir)
 


@@ -28,21 +29,25 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_visible_to
   end
 
   def test_visible_to

-    public_trace_file = create(:trace, :visibility => "public", :user => users(:normal_user))
-    anon_trace_file = create(:trace, :visibility => "private", :user => users(:public_user))
-    identifiable_trace_file = create(:trace, :visibility => "identifiable", :user => users(:normal_user))
-    pending_trace_file = create(:trace, :visibility => "public", :user => users(:public_user), :inserted => false)
-    trackable_trace_file = create(:trace, :visibility => "trackable", :user => users(:public_user))
-    _other_trace_file = create(:trace, :visibility => "private", :user => users(:second_public_user))
-
-    check_query(Trace.visible_to(users(:normal_user).id), [
+    first_user = create(:user)
+    second_user = create(:user)
+    third_user = create(:user)
+    fourth_user = create(:user)
+    public_trace_file = create(:trace, :visibility => "public", :user => first_user)
+    anon_trace_file = create(:trace, :visibility => "private", :user => second_user)
+    identifiable_trace_file = create(:trace, :visibility => "identifiable", :user => first_user)
+    pending_trace_file = create(:trace, :visibility => "public", :user => second_user, :inserted => false)
+    trackable_trace_file = create(:trace, :visibility => "trackable", :user => second_user)
+    _other_trace_file = create(:trace, :visibility => "private", :user => third_user)
+
+    check_query(Trace.visible_to(first_user), [

                   public_trace_file, identifiable_trace_file, pending_trace_file
                 ])
                   public_trace_file, identifiable_trace_file, pending_trace_file
                 ])

-    check_query(Trace.visible_to(users(:public_user)), [
+    check_query(Trace.visible_to(second_user), [

                   public_trace_file, anon_trace_file, trackable_trace_file,
                   identifiable_trace_file, pending_trace_file
                 ])
                   public_trace_file, anon_trace_file, trackable_trace_file,
                   identifiable_trace_file, pending_trace_file
                 ])

-    check_query(Trace.visible_to(users(:inactive_user)), [
+    check_query(Trace.visible_to(fourth_user), [

                   public_trace_file, identifiable_trace_file, pending_trace_file
                 ])
   end
                   public_trace_file, identifiable_trace_file, pending_trace_file
                 ])
   end


@@ -132,44 +137,41 @@ class TraceTest < ActiveSupport::TestCase
 
   def test_mime_type
     # The ids refer to the .gpx fixtures in test/traces
 
   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
   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
   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
   end
 
   def test_large_picture

-    trace = create(:trace)
-    picture = trace.stub :large_picture_name, "#{GPX_IMAGE_DIR}/1.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
 
     trace = Trace.create
     trace.large_picture = picture


@@ -180,10 +182,7 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_icon_picture
   end
 
   def test_icon_picture

-    trace = create(:trace)
-    picture = trace.stub :icon_picture_name, "#{GPX_IMAGE_DIR}/1_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
 
     trace = Trace.create
     trace.icon_picture = picture


@@ -196,29 +195,20 @@ class TraceTest < ActiveSupport::TestCase
   private
 
   def check_query(query, traces)
   private
 
   def check_query(query, traces)

-    traces = traces.map { |t| t.id }.sort
+    traces = traces.map(&:id).sort

     assert_equal traces, query.order(:id).ids
   end
 
   def check_mime_type(id, mime_type)
     assert_equal traces, query.order(:id).ids
   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)
   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)
   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)
   end
 
   def trace_valid(attrs, result = true)