jro_apps/redmine Commit - r8966:3aaf2b9ed007

Adds helpers for testing email body....

Jean-Philippe Lang -

r8966:3aaf2b9ed007

parent child

Context file:

r8966:3aaf2b9ed007

Collapse all files

test/functional/files_controller_test.rb +1 -1

                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
                 assert_equal "[eCookbook] New file", mail.subject
-                assert mail.body.include?('testfile.txt')
+                assert_mail_body_match 'testfile.txt', mail
               end
               def test_create_version_file

test/functional/issues_controller_test.rb +7 -7

                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
                 assert mail.subject.starts_with?("[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}]")
-                assert mail.body.include?("Subject changed from #{old_subject} to #{new_subject}")
+                assert_mail_body_match "Subject changed from #{old_subject} to #{new_subject}", mail
               end
               def test_put_update_with_project_change
                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
                 assert mail.subject.starts_with?("[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}]")
-                assert mail.body.include?("Project changed from eCookbook to OnlineStore")
+                assert_mail_body_match "Project changed from eCookbook to OnlineStore", mail
               end
               def test_put_update_with_tracker_change
                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
                 assert mail.subject.starts_with?("[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}]")
-                assert mail.body.include?("Tracker changed from Bug to Feature request")
+                assert_mail_body_match "Tracker changed from Bug to Feature request", mail
               end
               def test_put_update_with_custom_field_change
                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
-                assert mail.body.include?("Searchable field changed from 125 to New custom value")
+                assert_mail_body_match "Searchable field changed from 125 to New custom value", mail
               end
               def test_put_update_with_multi_custom_field_change
                 assert_equal 2, j.details.size
                 mail = ActionMailer::Base.deliveries.last
-                assert mail.body.include?("Status changed from New to Assigned")
+                assert_mail_body_match "Status changed from New to Assigned", mail
                 # subject should contain the new status
                 assert mail.subject.include?("(#{ IssueStatus.find(2).name })")
               end
                 assert_equal User.anonymous, j.user
                 mail = ActionMailer::Base.deliveries.last
-                assert mail.body.include?(notes)
+                assert_mail_body_match notes, mail
               end
               def test_put_update_with_note_and_spent_time
                 assert_equal 59, File.size(attachment.diskfile)
                 mail = ActionMailer::Base.deliveries.last
-                assert mail.body.include?('testfile.txt')
+                assert_mail_body_match 'testfile.txt', mail
               end
               def test_put_update_with_failure_should_save_attachments

test/functional/messages_controller_test.rb +1 -1

                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
                 assert_equal "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] Test created message", mail.subject
-                assert mail.body.include?('Message body')
+                assert_mail_body_match 'Message body', mail
                 # author
                 assert mail.bcc.include?('jsmith@somenet.foo')
                 # project member

test/functional/users_controller_test.rb +3 -3

                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
                 assert_equal [user.mail], mail.bcc
-                assert mail.body.include?('secret')
+                assert_mail_body_match 'secret', mail
               end
               def test_create_with_preferences
                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
                 assert_equal ['foo.bar@somenet.foo'], mail.bcc
-                assert mail.body.include?(ll('fr', :notice_account_activated))
+                assert_mail_body_match ll('fr', :notice_account_activated), mail
               end
               def test_update_with_password_change_should_send_a_notification
                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
                 assert_equal [u.mail], mail.bcc
-                assert mail.body.include?('newpass')
+                assert_mail_body_match 'newpass', mail
               end
               test "put :update with a password change to an AuthSource user switching to Internal authentication" do

test/test_helper.rb +20 0

@@ -158,6 +158,26 class ActiveSupport::TestCase
158	assert s.include?(expected), "\"#{expected}\" not found in \"#{s}\""	158	assert s.include?(expected), "\"#{expected}\" not found in \"#{s}\""
159	end	159	end
160		160
		161	def assert_not_include(expected, s)
		162	assert !s.include?(expected), "\"#{expected}\" found in \"#{s}\""
		163	end
		164
		165	def assert_mail_body_match(expected, mail)
		166	if expected.is_a?(String)
		167	assert_include expected, mail.body
		168	else
		169	assert_match expected, mail.body
		170	end
		171	end
		172
		173	def assert_mail_body_no_match(expected, mail)
		174	if expected.is_a?(String)
		175	assert_not_include expected, mail.body
		176	else
		177	assert_no_match expected, mail.body
		178	end
		179	end
		180
161	# Shoulda macros	181	# Shoulda macros
162	def self.should_render_404	182	def self.should_render_404
163	should_respond_with :not_found	183	should_respond_with :not_found

test/unit/mailer_test.rb +4 -4

                 assert_equal 1, ActionMailer::Base.deliveries.size
                 mail = last_email
                 assert mail.bcc.include?('dlopper@somenet.foo')
-                assert mail.body.include?('Bug #3: Error 281 when updating a recipe')
+                assert_mail_body_match 'Bug #3: Error 281 when updating a recipe', mail
                 assert_equal '1 issue(s) due in the next 42 days', mail.subject
               end
                   assert_equal 1, ActionMailer::Base.deliveries.size
                   mail = last_email
                   assert mail.bcc.include?('dlopper@somenet.foo')
-                  assert !mail.body.include?('Closed issue')
+                  assert_mail_body_no_match 'Closed issue', mail
                 end
               end
                 assert_equal 1, ActionMailer::Base.deliveries.size # No mail for dlopper
                 mail = last_email
                 assert mail.bcc.include?('dlopper@somenet.foo')
-                assert mail.body.include?('Bug #3: Error 281 when updating a recipe')
+                assert_mail_body_match 'Bug #3: Error 281 when updating a recipe', mail
               end
               def last_email
                 user.language = 'fr'
                 Mailer.deliver_account_activated(user)
                 mail = last_email
-                assert mail.body.include?('Votre compte')
+                assert_mail_body_match 'Votre compte', mail
                 assert_equal :it, current_language
               end

test/unit/repository_test.rb +2 -2

                 assert_not_nil mail
                 assert mail.subject.starts_with?(
                     "[#{fixed_issue.project.name} - #{fixed_issue.tracker.name} ##{fixed_issue.id}]")
-                assert mail.body.include?(
+                assert_mail_body_match(
-                    "Status changed from #{old_status} to #{fixed_issue.status}")
+                    "Status changed from #{old_status} to #{fixed_issue.status}", mail)
                 # ignoring commits referencing an issue of another project
                 assert_equal [], Issue.find(4).changesets

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages