Move all settings to settings.yml

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

diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb
index 2ab1a3d5a4da50c3e770b1183c30d0b5de2f6c07..f03488a6115324e631624edf397f461d1960f8ed 100644 (file)
--- a/test/models/trace_test.rb
+++ b/test/models/trace_test.rb
@@ -2,23 +2,9 @@ require "test_helper"
 require "minitest/mock"
 
 class TraceTest < ActiveSupport::TestCase
 require "minitest/mock"
 
 class TraceTest < ActiveSupport::TestCase

-  def setup
-    @gpx_trace_dir = Object.send("remove_const", "GPX_TRACE_DIR")
-    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", Rails.root.join("test", "gpx", "images"))
-  end
-

   def teardown
   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_IMAGE_DIR")
-    Object.const_set("GPX_IMAGE_DIR", @gpx_image_dir)
+    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
   end
 
   def test_visible


@@ -227,7 +213,7 @@ class TraceTest < ActiveSupport::TestCase
     FakeFS do
       FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
       trace = create(:trace, :fixture => "a")
     FakeFS do
       FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
       trace = create(:trace, :fixture => "a")

-      icon_path = File.join(GPX_IMAGE_DIR, "#{trace.id}_icon.gif")
+      icon_path = File.join(Settings.gpx_image_dir, "#{trace.id}_icon.gif")

       FileUtils.rm(icon_path)
       assert_equal false, File.exist?(icon_path)
 
       FileUtils.rm(icon_path)
       assert_equal false, File.exist?(icon_path)
 


@@ -241,7 +227,7 @@ class TraceTest < ActiveSupport::TestCase
     FakeFS do
       FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
       trace = create(:trace, :fixture => "a")
     FakeFS do
       FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
       trace = create(:trace, :fixture => "a")

-      large_picture_path = File.join(GPX_IMAGE_DIR, "#{trace.id}.gif")
+      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)
 
       FileUtils.rm(large_picture_path)
       assert_equal false, File.exist?(large_picture_path)
 


@@ -271,8 +257,7 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def trace_valid(attrs, result = true)
   end
 
   def trace_valid(attrs, result = true)

-    entry = build(:trace)
-    entry.assign_attributes(attrs)
+    entry = build(:trace, attrs)

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