diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 650a06eae6408856e397fd32e39d0d0c917c43ef..32b4e7d00c02e60e0e6625425f419d88e6c58d5a 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -808,7 +808,27 @@ class IssuesControllerTest < ActionController::TestCase
     mail = ActionMailer::Base.deliveries.last
     assert mail.body.include?('testfile.txt')
   end
-  
+
+  def test_put_update_with_attachment_that_fails_to_save
+    set_tmp_attachments_directory
+    
+    # Delete all fixtured journals, a race condition can occur causing the wrong
+    # journal to get fetched in the next find.
+    Journal.delete_all
+
+    # Mock out the unsaved attachment
+    Attachment.any_instance.stubs(:create).returns(Attachment.new)
+    
+    # anonymous user
+    put :update,
+         :id => 1,
+         :notes => '',
+         :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
+    assert_redirected_to :action => 'show', :id => '1'
+    assert_equal '1 file(s) could not be saved.', flash[:warning]
+
+  end if Object.const_defined?(:Mocha)
+
   def test_put_update_with_no_change
     issue = Issue.find(1)
     issue.journals.clear