Fix the mock_file test helper.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4010 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fix the mock_file test helper.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4010 e93f8b46-1217-0410-a6f0-8f06a7374b81
96965578 · Eric Davis · e4c5a91d · 96965578 · 96965578
Commit 96965578 authored Aug 19, 2010 by Eric Davis
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

attachment_exemplar.rb test/exemplars/attachment_exemplar.rb +1 -1

test_helper.rb test/test_helper.rb +6 -2

No files found.
--- a/test/exemplars/attachment_exemplar.rb
+++ b/test/exemplars/attachment_exemplar.rb
@@ -12,6 +12,6 @@ class Attachment < ActiveRecord::Base
  end
  def self.generate_file
-    @file = mock_file
+    @file = ActiveSupport::TestCase.mock_file
  end
 end
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -63,7 +63,7 @@ class ActiveSupport::TestCase
  end
  # Mock out a file
-  def mock_file
+  def self.mock_file
    file = 'a_file.png'
    file.stubs(:size).returns(32)
    file.stubs(:original_filename).returns('a_file.png')
@@ -72,6 +72,10 @@ class ActiveSupport::TestCase
    file
  end
+  def mock_file
+    self.class.mock_file
+  end
  # Use a temporary directory for attachment related tests
  def set_tmp_attachments_directory
    Dir.mkdir "#{RAILS_ROOT}/tmp/test" unless File.directory?("#{RAILS_ROOT}/tmp/test")