summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorEric Davis <edavis@littlestreamsoftware.com>2009-03-28 00:38:57 +0000
committerEric Davis <edavis@littlestreamsoftware.com>2009-03-28 00:38:57 +0000
commitb4be8849c0de81841c458c0f059787a9cc9bc022 (patch)
tree2db816db1cb3cf2fd0761f1e3ad0bc1373f9f12e /test
parent3557e767e0b0c1e9fd7f97414a92f3d9dc00d98e (diff)
downloadredmine-b4be8849c0de81841c458c0f059787a9cc9bc022.tar.gz
redmine-b4be8849c0de81841c458c0f059787a9cc9bc022.zip
Added observers to watch model objects for mail delivery instead of calling Mailer.
* Added an IssueObserver to watch when Issues are created * Added a JournalObserver to watch when Journals are created (Issue updates) * Added a NewsObserver for News items. * Added a DocumentObserver for Document notifications. * Setup IssuesController#new to use the IssueObserver. * Setup IssuesController#edit to use the IssueObserver. * Setup IssuesController#bulk_edit to use the JournalObserver. * Removed the Mailer call in Changeset#scan_commit_for_issue_ids, the JournalObserver will handle it. * Removed Mailer calls in MailHandler in favor of the Observers. #2659 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2637 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test')
-rw-r--r--test/functional/documents_controller_test.rb3
-rw-r--r--test/functional/issues_controller_test.rb45
-rw-r--r--test/functional/news_controller_test.rb4
-rw-r--r--test/unit/changeset_test.rb2
-rw-r--r--test/unit/document_test.rb9
-rw-r--r--test/unit/issue_test.rb8
-rw-r--r--test/unit/journal_test.rb11
-rw-r--r--test/unit/mail_handler_test.rb15
-rw-r--r--test/unit/news_test.rb20
9 files changed, 114 insertions, 3 deletions
diff --git a/test/functional/documents_controller_test.rb b/test/functional/documents_controller_test.rb
index 2ad94aacf..b5788c776 100644
--- a/test/functional/documents_controller_test.rb
+++ b/test/functional/documents_controller_test.rb
@@ -66,6 +66,8 @@ class DocumentsControllerTest < Test::Unit::TestCase
end
def test_new_with_one_attachment
+ ActionMailer::Base.deliveries.clear
+ Setting.notified_events << 'document_added'
@request.session[:user_id] = 2
set_tmp_attachments_directory
@@ -82,6 +84,7 @@ class DocumentsControllerTest < Test::Unit::TestCase
assert_equal Enumeration.find(2), document.category
assert_equal 1, document.attachments.size
assert_equal 'testfile.txt', document.attachments.first.filename
+ assert_equal 1, ActionMailer::Base.deliveries.size
end
def test_edit_routing
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 9dd188011..0df66abdb 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -503,6 +503,21 @@ class IssuesControllerTest < Test::Unit::TestCase
assert [mail.bcc, mail.cc].flatten.include?(User.find(3).mail)
end
+ def test_post_new_should_send_a_notification
+ ActionMailer::Base.deliveries.clear
+ @request.session[:user_id] = 2
+ post :new, :project_id => 1,
+ :issue => {:tracker_id => 3,
+ :subject => 'This is the test_new issue',
+ :description => 'This is the description',
+ :priority_id => 5,
+ :estimated_hours => '',
+ :custom_field_values => {'2' => 'Value for field 2'}}
+ assert_redirected_to :action => 'show'
+
+ assert_equal 1, ActionMailer::Base.deliveries.size
+ end
+
def test_post_should_preserve_fields_values_on_validation_failure
@request.session[:user_id] = 2
post :new, :project_id => 1,
@@ -760,6 +775,20 @@ class IssuesControllerTest < Test::Unit::TestCase
# No email should be sent
assert ActionMailer::Base.deliveries.empty?
end
+
+ def test_post_edit_should_send_a_notification
+ @request.session[:user_id] = 2
+ ActionMailer::Base.deliveries.clear
+ issue = Issue.find(1)
+ old_subject = issue.subject
+ new_subject = 'Subject modified by IssuesControllerTest#test_post_edit'
+
+ post :edit, :id => 1, :issue => {:subject => new_subject,
+ :priority_id => '6',
+ :category_id => '1' # no change
+ }
+ assert_equal 1, ActionMailer::Base.deliveries.size
+ end
def test_post_edit_with_invalid_spent_time
@request.session[:user_id] = 2
@@ -797,6 +826,22 @@ class IssuesControllerTest < Test::Unit::TestCase
assert_equal 1, journal.details.size
end
+ def test_bullk_edit_should_send_a_notification
+ @request.session[:user_id] = 2
+ ActionMailer::Base.deliveries.clear
+ post(:bulk_edit,
+ {
+ :ids => [1, 2],
+ :priority_id => 7,
+ :assigned_to_id => '',
+ :custom_field_values => {'2' => ''},
+ :notes => 'Bulk editing'
+ })
+
+ assert_response 302
+ assert_equal 2, ActionMailer::Base.deliveries.size
+ end
+
def test_bulk_edit_custom_field
@request.session[:user_id] = 2
# update issues priority
diff --git a/test/functional/news_controller_test.rb b/test/functional/news_controller_test.rb
index 009e58c73..22ad2d241 100644
--- a/test/functional/news_controller_test.rb
+++ b/test/functional/news_controller_test.rb
@@ -112,6 +112,9 @@ class NewsControllerTest < Test::Unit::TestCase
end
def test_post_new
+ ActionMailer::Base.deliveries.clear
+ Setting.notified_events << 'news_added'
+
@request.session[:user_id] = 2
post :new, :project_id => 1, :news => { :title => 'NewsControllerTest',
:description => 'This is the description',
@@ -123,6 +126,7 @@ class NewsControllerTest < Test::Unit::TestCase
assert_equal 'This is the description', news.description
assert_equal User.find(2), news.author
assert_equal Project.find(1), news.project
+ assert_equal 1, ActionMailer::Base.deliveries.size
end
def test_edit_routing
diff --git a/test/unit/changeset_test.rb b/test/unit/changeset_test.rb
index 6cc53d852..6a0df2c5d 100644
--- a/test/unit/changeset_test.rb
+++ b/test/unit/changeset_test.rb
@@ -24,6 +24,7 @@ class ChangesetTest < Test::Unit::TestCase
end
def test_ref_keywords_any
+ ActionMailer::Base.deliveries.clear
Setting.commit_fix_status_id = IssueStatus.find(:first, :conditions => ["is_closed = ?", true]).id
Setting.commit_fix_done_ratio = '90'
Setting.commit_ref_keywords = '*'
@@ -38,6 +39,7 @@ class ChangesetTest < Test::Unit::TestCase
fixed = Issue.find(1)
assert fixed.closed?
assert_equal 90, fixed.done_ratio
+ assert_equal 1, ActionMailer::Base.deliveries.size
end
def test_ref_keywords_any_line_start
diff --git a/test/unit/document_test.rb b/test/unit/document_test.rb
index 17a0ad6ea..1950f8558 100644
--- a/test/unit/document_test.rb
+++ b/test/unit/document_test.rb
@@ -25,6 +25,15 @@ class DocumentTest < Test::Unit::TestCase
assert doc.save
end
+ def test_create_should_send_email_notification
+ ActionMailer::Base.deliveries.clear
+ Setting.notified_events << 'document_added'
+ doc = Document.new(:project => Project.find(1), :title => 'New document', :category => Enumeration.find_by_name('User documentation'))
+
+ assert doc.save
+ assert_equal 1, ActionMailer::Base.deliveries.size
+ end
+
def test_create_with_default_category
# Sets a default category
e = Enumeration.find_by_name('Technical documentation')
diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb
index 365316034..ae3fa5bda 100644
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -241,4 +241,12 @@ class IssueTest < Test::Unit::TestCase
assert !Issue.new(:due_date => nil).overdue?
assert !Issue.new(:due_date => 1.day.ago.to_date, :status => IssueStatus.find(:first, :conditions => {:is_closed => true})).overdue?
end
+
+ def test_create_should_send_email_notification
+ ActionMailer::Base.deliveries.clear
+ issue = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 3, :status_id => 1, :priority => Enumeration.priorities.first, :subject => 'test_create', :estimated_hours => '1:30')
+
+ assert issue.save
+ assert_equal 1, ActionMailer::Base.deliveries.size
+ end
end
diff --git a/test/unit/journal_test.rb b/test/unit/journal_test.rb
index b177f3198..147af4aae 100644
--- a/test/unit/journal_test.rb
+++ b/test/unit/journal_test.rb
@@ -36,4 +36,15 @@ class JournalTest < Test::Unit::TestCase
assert_kind_of IssueStatus, status
assert_equal 2, status.id
end
+
+ def test_create_should_send_email_notification
+ ActionMailer::Base.deliveries.clear
+ issue = Issue.find(:first)
+ user = User.find(:first)
+ journal = issue.init_journal(user, issue)
+
+ assert journal.save
+ assert_equal 1, ActionMailer::Base.deliveries.size
+ end
+
end
diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb
index 1e9e7f19e..704e12c7f 100644
--- a/test/unit/mail_handler_test.rb
+++ b/test/unit/mail_handler_test.rb
@@ -133,6 +133,14 @@ class MailHandlerTest < Test::Unit::TestCase
Role.anonymous.add_permission!(:add_issues)
assert_equal false, submit_email('ticket_without_from_header.eml')
end
+
+ def test_add_issue_should_send_email_notification
+ ActionMailer::Base.deliveries.clear
+ # This email contains: 'Project: onlinestore'
+ issue = submit_email('ticket_on_given_project.eml')
+ assert issue.is_a?(Issue)
+ assert_equal 1, ActionMailer::Base.deliveries.size
+ end
def test_add_issue_note
journal = submit_email('ticket_reply.eml')
@@ -152,6 +160,13 @@ class MailHandlerTest < Test::Unit::TestCase
assert_match /This is reply/, journal.notes
assert_equal IssueStatus.find_by_name("Resolved"), issue.status
end
+
+ def test_add_issue_note_should_send_email_notification
+ ActionMailer::Base.deliveries.clear
+ journal = submit_email('ticket_reply.eml')
+ assert journal.is_a?(Journal)
+ assert_equal 1, ActionMailer::Base.deliveries.size
+ end
def test_reply_to_a_message
m = submit_email('message_reply.eml')
diff --git a/test/unit/news_test.rb b/test/unit/news_test.rb
index 527715b00..3a908dcc8 100644
--- a/test/unit/news_test.rb
+++ b/test/unit/news_test.rb
@@ -20,9 +20,23 @@ require File.dirname(__FILE__) + '/../test_helper'
class NewsTest < Test::Unit::TestCase
fixtures :projects, :users, :roles, :members, :enabled_modules, :news
+ def valid_news
+ { :title => 'Test news', :description => 'Lorem ipsum etc', :author => User.find(:first) }
+ end
+
+
def setup
end
+ def test_create_should_send_email_notification
+ ActionMailer::Base.deliveries.clear
+ Setting.notified_events << 'news_added'
+ news = Project.find(:first).news.new(valid_news)
+
+ assert news.save
+ assert_equal 1, ActionMailer::Base.deliveries.size
+ end
+
def test_should_include_news_for_projects_with_news_enabled
project = projects(:projects_001)
assert project.enabled_modules.any?{ |em| em.name == 'news' }
@@ -37,7 +51,7 @@ class NewsTest < Test::Unit::TestCase
assert ! project.enabled_modules.any?{ |em| em.name == 'news' }
# Add a piece of news to the project
- news = project.news.create(:title => 'Test news', :description => 'This should not be returned by News.latest')
+ news = project.news.create(valid_news)
# News.latest should not return that new piece of news
assert News.latest.include?(news) == false
@@ -50,14 +64,14 @@ class NewsTest < Test::Unit::TestCase
def test_should_limit_the_amount_of_returned_news
# Make sure we have a bunch of news stories
- 10.times { projects(:projects_001).news.create(:title => 'Test news', :description => 'Lorem ipsum etc') }
+ 10.times { projects(:projects_001).news.create(valid_news) }
assert_equal 2, News.latest(users(:users_002), 2).size
assert_equal 6, News.latest(users(:users_002), 6).size
end
def test_should_return_5_news_stories_by_default
# Make sure we have a bunch of news stories
- 10.times { projects(:projects_001).news.create(:title => 'Test news', :description => 'Lorem ipsum etc') }
+ 10.times { projects(:projects_001).news.create(valid_news) }
assert_equal 5, News.latest(users(:users_004)).size
end
end