more merge fixups

This commit is contained in:
Tim Felgentreff 2010-10-26 18:58:54 +02:00
parent 5310327c8a
commit 8c5312e0ec
2 changed files with 2 additions and 2 deletions

View File

@ -89,7 +89,7 @@ class Issue < ActiveRecord::Base
before_create :default_assign
before_save :close_duplicates, :update_done_ratio_from_issue_status
after_save :reschedule_following_issues, :update_nested_set_attributes, :update_parent_attributes, :create_journal
after_save :reschedule_following_issues, :update_nested_set_attributes, :update_parent_attributes
after_destroy :destroy_children
after_destroy :update_parent_attributes

View File

@ -18,7 +18,7 @@
require File.dirname(__FILE__) + '/../test_helper'
class JournalObserverTest < ActiveSupport::TestCase
fixtures :issues, :issue_statuses, :journals, :journal_details
fixtures :issues, :issue_statuses, :journals
def setup
ActionMailer::Base.deliveries.clear