From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 5 Apr 2011 11:40:31 +0000 (+0000)
Subject: Code cleanup.
X-Git-Tag: 1.2.0~528
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1af6527e427bcfeba189eac10c3642fa177dfa6e;p=redmine.git

Code cleanup.

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

diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index 0fa7f5729..611420a28 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -213,19 +213,13 @@ class TimelogControllerTest < ActionController::TestCase
   
   def test_destroy_should_fail
     # simulate that this fails (e.g. due to a plugin), see #5700
-    TimeEntry.class_eval do
-      before_destroy :stop_callback_chain
-      def stop_callback_chain ; return false ; end
-    end
+    TimeEntry.any_instance.expects(:destroy).returns(false)
 
     @request.session[:user_id] = 2
     delete :destroy, :id => 1
     assert_redirected_to :action => 'index', :project_id => 'ecookbook'
     assert_equal I18n.t(:notice_unable_delete_time_entry), flash[:error]
     assert_not_nil TimeEntry.find_by_id(1)
-
-    # remove the simulation
-    TimeEntry.before_destroy.reject! {|callback| callback.method == :stop_callback_chain }
   end
   
   def test_index_all_projects