X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a66f0f32e977cb2d6ae7231e7014861c119cc657..ae83554929f3841c36fa543c58cad07d4d13013f:/test/models/trace_test.rb?ds=sidebyside

diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb
index c9530b067..4a6ac109d 100644
--- 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
-  fixtures :users
-
   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")
-    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
+    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)
 
@@ -28,21 +29,25 @@ class TraceTest < ActiveSupport::TestCase
   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
                 ])
-    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
                 ])
-    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
@@ -166,10 +171,7 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_large_picture
-    trace = create(:trace)
-    picture = trace.stub :large_picture_name, "#{GPX_IMAGE_DIR}/a.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
@@ -180,10 +182,7 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_icon_picture
-    trace = create(:trace)
-    picture = trace.stub :icon_picture_name, "#{GPX_IMAGE_DIR}/a_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
@@ -201,24 +200,15 @@ class TraceTest < ActiveSupport::TestCase
   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)
-    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)
-    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)