Refactor: extract test method

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

Refactor: extract test method
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3773 e93f8b46-1217-0410-a6f0-8f06a7374b81
cf334cee · Eric Davis · c56c0f41 · cf334cee · cf334cee · cf334cee
Commit cf334cee authored Jun 19, 2010 by Eric Davis
Show whitespace changes
Inline Side-by-side

Showing with 13 additions and 14 deletions

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

test_helper.rb test/test_helper.rb +10 -0

attachment_test.rb test/unit/attachment_test.rb +2 -9

No files found.
--- a/test/exemplars/attachment_exemplar.rb
+++ b/test/exemplars/attachment_exemplar.rb
@@ -12,10 +12,6 @@ class Attachment < ActiveRecord::Base
  end

  def self.generate_file
-    @file = 'a_file.png'
-    @file.stubs(:original_filename).returns('a_file.png')
-    @file.stubs(:content_type).returns('image/png')
-    @file.stubs(:read).returns(false)
-    @file
+    @file = mock_file
  end
 end
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -62,6 +62,16 @@ class ActiveSupport::TestCase
    ActionController::TestUploadedFile.new(ActiveSupport::TestCase.fixture_path + "/files/#{name}", mime)
  end

+  # Mock out a file
+  def mock_file
+    file = 'a_file.png'
+    file.stubs(:size).returns(32)
+    file.stubs(:original_filename).returns('a_file.png')
+    file.stubs(:content_type).returns('image/png')
+    file.stubs(:read).returns(false)
+    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")

--- a/test/unit/attachment_test.rb
+++ b/test/unit/attachment_test.rb
@@ -68,17 +68,10 @@ class AttachmentTest < ActiveSupport::TestCase
    should "add unsaved files to the object as unsaved attachments" do
      # Max size of 0 to force Attachment creation failures
      with_settings(:attachment_max_size => 0) do
-        # Mock out a file
-        @file = 'a_file.png'
-        @file.stubs(:size).returns(32)
-        @file.stubs(:original_filename).returns('a_file.png')
-        @file.stubs(:content_type).returns('image/png')
-        @file.stubs(:read).returns(false)
-        
        @project = Project.generate!
        response = Attachment.attach_files(@project, {
-                                             '1' => {'file' => @file, 'description' => 'test'},
-                                             '2' => {'file' => @file, 'description' => 'test'}
+                                             '1' => {'file' => mock_file, 'description' => 'test'},
+                                             '2' => {'file' => mock_file, 'description' => 'test'}
                                           })

        assert response[:unsaved].present?