summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-09-05 07:22:32 +0000
committerGo MAEDA <maeda@farend.jp>2019-09-05 07:22:32 +0000
commitf461488c411966c406c9220cd6bdba5c509312c1 (patch)
tree7b42f1b73807a392c73b554a78a7b6bf76ab2eea
parent2782d4b9f9a55818336ccb5fde85cb0cef9c5fc2 (diff)
downloadredmine-f461488c411966c406c9220cd6bdba5c509312c1.tar.gz
redmine-f461488c411966c406c9220cd6bdba5c509312c1.zip
Fix that test_mail_from_format_should_be_validated randomly fails (#31154).
Patch by Yuichi HARADA. git-svn-id: http://svn.redmine.org/redmine/trunk@18434 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--test/unit/setting_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/unit/setting_test.rb b/test/unit/setting_test.rb
index 253f3c037..145961539 100644
--- a/test/unit/setting_test.rb
+++ b/test/unit/setting_test.rb
@@ -20,6 +20,7 @@
require File.expand_path('../../test_helper', __FILE__)
class SettingTest < ActiveSupport::TestCase
+ fixtures :users
def setup
User.current = nil
@@ -134,7 +135,7 @@ YAML
end
def test_mail_from_format_should_be_validated
- with_settings :default_language => 'en' do
+ with_locale 'en' do
['[Redmine app] <redmine@example.net>', 'redmine'].each do |invalid_mail_from|
errors = Setting.set_all_from_params({:mail_from => invalid_mail_from})
assert_includes errors, [:mail_from, 'is invalid']