Merge branch 'develop' of git.znuny.com:zammad/zammad into develop

This commit is contained in:
André Bauer 2017-01-10 02:33:34 +01:00
commit f4946ac142

View file

@ -375,6 +375,7 @@ class MonitoringControllerTest < ActionDispatch::IntegrationTest
assert_equal('Channel: Email::Notification out ;scheduler not running', result['message']) assert_equal('Channel: Email::Notification out ;scheduler not running', result['message'])
dir = "#{Rails.root}/tmp/unprocessable_mail" dir = "#{Rails.root}/tmp/unprocessable_mail"
FileUtils.mkdir_p(dir)
FileUtils.touch("#{dir}/test.eml") FileUtils.touch("#{dir}/test.eml")
# health_check # health_check