1 files changed, 18 insertions, 12 deletions
diff --git a/test/functional/mail_handler_controller_test.rb b/test/functional/mail_handler_controller_test.rb
index 2d440452d..3b7167900 100644
--- a/test/functional/mail_handler_controller_test.rb
+++ b/test/functional/mail_handler_controller_test.rb
@@ -54,19 +54,25 @@ class MailHandlerControllerTest < Redmine::ControllerTest
 
   def test_should_create_issue_with_options
     # Enable API and set a key
-    Setting.mail_handler_api_enabled = 1
-    Setting.mail_handler_api_key = 'secret'
-    assert_difference 'Issue.count' do
-      post(
-        :index,
-        :params => {
-          :key => 'secret',
-          :email => IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml')),
-          :issue => {
-            :is_private => '1'
+    with_settings(
+      :mail_handler_api_enabled => 1,
+      :mail_handler_api_key => 'secret'
+    ) do
+      assert_difference 'Issue.count' do
+        post(
+          :index,
+          :params => {
+            :key => 'secret',
+            :email =>
+              IO.read(
+                File.join(FIXTURES_PATH, 'ticket_on_given_project.eml')
+              ),
+            :issue => {
+              :is_private => '1'
+            }
           }
-        }
-      )
+        )
+      end
     end
     assert_response 201
     issue = Issue.order(:id => :desc).first