summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--test/functional/documents_controller_test.rb6
-rw-r--r--test/functional/files_controller_test.rb12
-rw-r--r--test/functional/messages_controller_test.rb5
-rw-r--r--test/functional/news_controller_test.rb7
-rw-r--r--test/functional/repositories_git_controller_test.rb29
-rw-r--r--test/functional/settings_controller_test.rb1
-rw-r--r--test/functional/sys_controller_test.rb4
-rw-r--r--test/unit/comment_test.rb7
-rw-r--r--test/unit/document_test.rb9
-rw-r--r--test/unit/journal_observer_test.rb45
-rw-r--r--test/unit/mail_handler_test.rb4
-rw-r--r--test/unit/news_test.rb5
-rw-r--r--test/unit/repository_test.rb5
-rw-r--r--test/unit/setting_test.rb4
-rw-r--r--test/unit/wiki_content_test.rb12
15 files changed, 94 insertions, 61 deletions
diff --git a/test/functional/documents_controller_test.rb b/test/functional/documents_controller_test.rb
index 1444a74e2..206584540 100644
--- a/test/functional/documents_controller_test.rb
+++ b/test/functional/documents_controller_test.rb
@@ -97,16 +97,16 @@ LOREM
def test_create_with_one_attachment
ActionMailer::Base.deliveries.clear
- Setting.notified_events << 'document_added'
@request.session[:user_id] = 2
set_tmp_attachments_directory
- post :create, :project_id => 'ecookbook',
+ with_settings :notified_events => %w(document_added) do
+ post :create, :project_id => 'ecookbook',
:document => { :title => 'DocumentsControllerTest#test_post_new',
:description => 'This is a new document',
:category_id => 2},
:attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
-
+ end
assert_redirected_to '/projects/ecookbook/documents'
document = Document.find_by_title('DocumentsControllerTest#test_post_new')
diff --git a/test/functional/files_controller_test.rb b/test/functional/files_controller_test.rb
index d05557990..5e3c9d68b 100644
--- a/test/functional/files_controller_test.rb
+++ b/test/functional/files_controller_test.rb
@@ -58,13 +58,14 @@ class FilesControllerTest < ActionController::TestCase
def test_create_file
set_tmp_attachments_directory
@request.session[:user_id] = 2
- Setting.notified_events = ['file_added']
ActionMailer::Base.deliveries.clear
- assert_difference 'Attachment.count' do
- post :create, :project_id => 1, :version_id => '',
- :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
- assert_response :redirect
+ with_settings :notified_events => %w(file_added) do
+ assert_difference 'Attachment.count' do
+ post :create, :project_id => 1, :version_id => '',
+ :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
+ assert_response :redirect
+ end
end
assert_redirected_to '/projects/ecookbook/files'
a = Attachment.find(:first, :order => 'created_on DESC')
@@ -80,7 +81,6 @@ class FilesControllerTest < ActionController::TestCase
def test_create_version_file
set_tmp_attachments_directory
@request.session[:user_id] = 2
- Setting.notified_events = ['file_added']
assert_difference 'Attachment.count' do
post :create, :project_id => 1, :version_id => '2',
diff --git a/test/functional/messages_controller_test.rb b/test/functional/messages_controller_test.rb
index d5370e261..210ad23bb 100644
--- a/test/functional/messages_controller_test.rb
+++ b/test/functional/messages_controller_test.rb
@@ -91,11 +91,12 @@ class MessagesControllerTest < ActionController::TestCase
def test_post_new
@request.session[:user_id] = 2
ActionMailer::Base.deliveries.clear
- Setting.notified_events = ['message_posted']
- post :new, :board_id => 1,
+ with_settings :notified_events => %w(message_posted) do
+ post :new, :board_id => 1,
:message => { :subject => 'Test created message',
:content => 'Message body'}
+ end
message = Message.find_by_subject('Test created message')
assert_not_nil message
assert_redirected_to "/boards/1/topics/#{message.to_param}"
diff --git a/test/functional/news_controller_test.rb b/test/functional/news_controller_test.rb
index a8ca41a92..f70c36bdb 100644
--- a/test/functional/news_controller_test.rb
+++ b/test/functional/news_controller_test.rb
@@ -82,12 +82,13 @@ class NewsControllerTest < ActionController::TestCase
def test_post_create
ActionMailer::Base.deliveries.clear
- Setting.notified_events << 'news_added'
-
@request.session[:user_id] = 2
- post :create, :project_id => 1, :news => { :title => 'NewsControllerTest',
+
+ with_settings :notified_events => %w(news_added) do
+ post :create, :project_id => 1, :news => { :title => 'NewsControllerTest',
:description => 'This is the description',
:summary => '' }
+ end
assert_redirected_to '/projects/ecookbook/news'
news = News.find_by_title('NewsControllerTest')
diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index 00243a3d4..169fec7b3 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -316,21 +316,22 @@ class RepositoriesGitControllerTest < ActionController::TestCase
@repository.fetch_changesets
@project.reload
assert_equal NUM_REV, @repository.changesets.count
- Setting.diff_max_lines_displayed = 5
- # Truncated diff of changeset 2f9c0091
- with_cache do
- get :diff, :id => PRJ_ID, :type => 'inline',
- :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
- assert_response :success
- assert @response.body.include?("... This diff was truncated")
-
- Setting.default_language = 'fr'
- get :diff, :id => PRJ_ID, :type => 'inline',
- :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
- assert_response :success
- assert ! @response.body.include?("... This diff was truncated")
- assert @response.body.include?("... Ce diff")
+ with_settings :diff_max_lines_displayed => 5 do
+ # Truncated diff of changeset 2f9c0091
+ with_cache do
+ get :diff, :id => PRJ_ID, :type => 'inline',
+ :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
+ assert_response :success
+ assert @response.body.include?("... This diff was truncated")
+
+ Setting.default_language = 'fr'
+ get :diff, :id => PRJ_ID, :type => 'inline',
+ :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
+ assert_response :success
+ assert ! @response.body.include?("... This diff was truncated")
+ assert @response.body.include?("... Ce diff")
+ end
end
end
diff --git a/test/functional/settings_controller_test.rb b/test/functional/settings_controller_test.rb
index 98d50efef..810883ea9 100644
--- a/test/functional/settings_controller_test.rb
+++ b/test/functional/settings_controller_test.rb
@@ -57,6 +57,7 @@ class SettingsControllerTest < ActionController::TestCase
assert !Setting.bcc_recipients?
assert_equal %w(issue_added issue_updated news_added), Setting.notified_events
assert_equal 'Test footer', Setting.emails_footer
+ Setting.clear_cache
end
def test_get_plugin_settings
diff --git a/test/functional/sys_controller_test.rb b/test/functional/sys_controller_test.rb
index 558a6d936..21d59b005 100644
--- a/test/functional/sys_controller_test.rb
+++ b/test/functional/sys_controller_test.rb
@@ -33,6 +33,10 @@ class SysControllerTest < ActionController::TestCase
Setting.enabled_scm = %w(Subversion Git)
end
+ def teardown
+ Setting.clear_cache
+ end
+
def test_projects_with_repository_enabled
get :projects
assert_response :success
diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb
index dd9fe23fe..0042efba1 100644
--- a/test/unit/comment_test.rb
+++ b/test/unit/comment_test.rb
@@ -33,11 +33,12 @@ class CommentTest < ActiveSupport::TestCase
end
def test_create_should_send_notification
- Setting.notified_events << 'news_comment_added'
Watcher.create!(:watchable => @news, :user => @jsmith)
- assert_difference 'ActionMailer::Base.deliveries.size' do
- Comment.create!(:commented => @news, :author => @jsmith, :comments => "my comment")
+ with_settings :notified_events => %w(news_comment_added) do
+ assert_difference 'ActionMailer::Base.deliveries.size' do
+ Comment.create!(:commented => @news, :author => @jsmith, :comments => "my comment")
+ end
end
end
diff --git a/test/unit/document_test.rb b/test/unit/document_test.rb
index aa3026fa8..332092d94 100644
--- a/test/unit/document_test.rb
+++ b/test/unit/document_test.rb
@@ -30,10 +30,11 @@ class DocumentTest < ActiveSupport::TestCase
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
+
+ with_settings :notified_events => %w(document_added) do
+ doc = Document.new(:project => Project.find(1), :title => 'New document', :category => Enumeration.find_by_name('User documentation'))
+ assert doc.save
+ end
assert_equal 1, ActionMailer::Base.deliveries.size
end
diff --git a/test/unit/journal_observer_test.rb b/test/unit/journal_observer_test.rb
index 689164496..69425a74e 100644
--- a/test/unit/journal_observer_test.rb
+++ b/test/unit/journal_observer_test.rb
@@ -27,102 +27,111 @@ class JournalObserverTest < ActiveSupport::TestCase
# context: issue_updated notified_events
def test_create_should_send_email_notification_with_issue_updated
- Setting.notified_events = ['issue_updated']
issue = Issue.find(:first)
user = User.find(:first)
journal = issue.init_journal(user, issue)
- assert journal.save
+ with_settings :notified_events => %w(issue_updated) do
+ assert journal.save
+ end
assert_equal 1, ActionMailer::Base.deliveries.size
end
def test_create_should_not_send_email_notification_with_notify_set_to_false
- Setting.notified_events = ['issue_updated']
issue = Issue.find(:first)
user = User.find(:first)
journal = issue.init_journal(user, issue)
journal.notify = false
- assert journal.save
+ with_settings :notified_events => %w(issue_updated) do
+ assert journal.save
+ end
assert_equal 0, ActionMailer::Base.deliveries.size
end
def test_create_should_not_send_email_notification_without_issue_updated
- Setting.notified_events = []
issue = Issue.find(:first)
user = User.find(:first)
journal = issue.init_journal(user, issue)
- assert journal.save
+ with_settings :notified_events => [] do
+ assert journal.save
+ end
assert_equal 0, ActionMailer::Base.deliveries.size
end
# context: issue_note_added notified_events
def test_create_should_send_email_notification_with_issue_note_added
- Setting.notified_events = ['issue_note_added']
issue = Issue.find(:first)
user = User.find(:first)
journal = issue.init_journal(user, issue)
journal.notes = 'This update has a note'
- assert journal.save
+ with_settings :notified_events => %w(issue_note_added) do
+ assert journal.save
+ end
assert_equal 1, ActionMailer::Base.deliveries.size
end
def test_create_should_not_send_email_notification_without_issue_note_added
- Setting.notified_events = []
issue = Issue.find(:first)
user = User.find(:first)
journal = issue.init_journal(user, issue)
journal.notes = 'This update has a note'
- assert journal.save
+ with_settings :notified_events => [] do
+ assert journal.save
+ end
assert_equal 0, ActionMailer::Base.deliveries.size
end
# context: issue_status_updated notified_events
def test_create_should_send_email_notification_with_issue_status_updated
- Setting.notified_events = ['issue_status_updated']
issue = Issue.find(:first)
user = User.find(:first)
issue.init_journal(user, issue)
issue.status = IssueStatus.last
- assert issue.save
+ with_settings :notified_events => %w(issue_status_updated) do
+ assert issue.save
+ end
assert_equal 1, ActionMailer::Base.deliveries.size
end
def test_create_should_not_send_email_notification_without_issue_status_updated
- Setting.notified_events = []
issue = Issue.find(:first)
user = User.find(:first)
issue.init_journal(user, issue)
issue.status = IssueStatus.last
- assert issue.save
+ with_settings :notified_events => [] do
+ assert issue.save
+ end
assert_equal 0, ActionMailer::Base.deliveries.size
end
# context: issue_priority_updated notified_events
def test_create_should_send_email_notification_with_issue_priority_updated
- Setting.notified_events = ['issue_priority_updated']
issue = Issue.find(:first)
user = User.find(:first)
issue.init_journal(user, issue)
issue.priority = IssuePriority.last
- assert issue.save
+ with_settings :notified_events => %w(issue_priority_updated) do
+ assert issue.save
+ end
assert_equal 1, ActionMailer::Base.deliveries.size
end
def test_create_should_not_send_email_notification_without_issue_priority_updated
- Setting.notified_events = []
issue = Issue.find(:first)
user = User.find(:first)
issue.init_journal(user, issue)
issue.priority = IssuePriority.last
- assert issue.save
+ with_settings :notified_events => [] do
+ assert issue.save
+ end
assert_equal 0, ActionMailer::Base.deliveries.size
end
end
diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb
index c0593e42b..5f62af905 100644
--- a/test/unit/mail_handler_test.rb
+++ b/test/unit/mail_handler_test.rb
@@ -35,6 +35,10 @@ class MailHandlerTest < ActiveSupport::TestCase
Setting.notified_events = Redmine::Notifiable.all.collect(&:name)
end
+ def teardown
+ Setting.clear_cache
+ end
+
def test_add_issue
ActionMailer::Base.deliveries.clear
# This email contains: 'Project: onlinestore'
diff --git a/test/unit/news_test.rb b/test/unit/news_test.rb
index e8c223264..de413e026 100644
--- a/test/unit/news_test.rb
+++ b/test/unit/news_test.rb
@@ -29,10 +29,11 @@ class NewsTest < ActiveSupport::TestCase
def test_create_should_send_email_notification
ActionMailer::Base.deliveries.clear
- Setting.notified_events << 'news_added'
news = Project.find(1).news.new(valid_news)
- assert news.save
+ with_settings :notified_events => %w(news_added) do
+ assert news.save
+ end
assert_equal 1, ActionMailer::Base.deliveries.size
end
diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb
index c90c825d8..daf8d0107 100644
--- a/test/unit/repository_test.rb
+++ b/test/unit/repository_test.rb
@@ -148,7 +148,6 @@ class RepositoryTest < ActiveSupport::TestCase
def test_scan_changesets_for_issue_ids
Setting.default_language = 'en'
- Setting.notified_events = ['issue_added','issue_updated']
# choosing a status to apply to fix issues
Setting.commit_fix_status_id = IssueStatus.find(
@@ -165,7 +164,9 @@ class RepositoryTest < ActiveSupport::TestCase
assert !fixed_issue.status.is_closed?
old_status = fixed_issue.status
- Repository.scan_changesets_for_issue_ids
+ with_settings :notified_events => %w(issue_added issue_updated) do
+ Repository.scan_changesets_for_issue_ids
+ end
assert_equal [101, 102], Issue.find(3).changeset_ids
# fixed issues
diff --git a/test/unit/setting_test.rb b/test/unit/setting_test.rb
index 1187ac9ec..e86fad6f7 100644
--- a/test/unit/setting_test.rb
+++ b/test/unit/setting_test.rb
@@ -19,6 +19,10 @@ require File.expand_path('../../test_helper', __FILE__)
class SettingTest < ActiveSupport::TestCase
+ def teardown
+ Setting.clear_cache
+ end
+
def test_read_default
assert_equal "Redmine", Setting.app_title
assert Setting.self_registration?
diff --git a/test/unit/wiki_content_test.rb b/test/unit/wiki_content_test.rb
index 6114bdbb6..63564d73b 100644
--- a/test/unit/wiki_content_test.rb
+++ b/test/unit/wiki_content_test.rb
@@ -44,11 +44,13 @@ class WikiContentTest < ActiveSupport::TestCase
end
def test_create_should_send_email_notification
- Setting.notified_events = ['wiki_content_added']
ActionMailer::Base.deliveries.clear
page = WikiPage.new(:wiki => @wiki, :title => "A new page")
page.content = WikiContent.new(:text => "Content text", :author => User.find(1), :comments => "My comment")
- assert page.save
+
+ with_settings :notified_events => %w(wiki_content_added) do
+ assert page.save
+ end
assert_equal 1, ActionMailer::Base.deliveries.size
end
@@ -64,11 +66,13 @@ class WikiContentTest < ActiveSupport::TestCase
end
def test_update_should_send_email_notification
- Setting.notified_events = ['wiki_content_updated']
ActionMailer::Base.deliveries.clear
content = @page.content
content.text = "My new content"
- assert content.save
+
+ with_settings :notified_events => %w(wiki_content_updated) do
+ assert content.save
+ end
assert_equal 1, ActionMailer::Base.deliveries.size
end
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-08 18:47:13 +0000