diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-03-16 04:55:45 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-03-16 04:55:45 +0000 |
| commit | e580d565eb5526e0f432f88767d9d67b5b49c726 (patch) | |
| tree | f488ee99faf0561f0c631a5a02bcb2ae88f6b17b | |
| parent | eabda2f745396741061474a09727b7bc4a8eb045 (diff) | |
| download | redmine-e580d565eb5526e0f432f88767d9d67b5b49c726.tar.gz redmine-e580d565eb5526e0f432f88767d9d67b5b49c726.zip | |
2.6-stable: fix unit test on Ruby 1.8.7 (#19305)
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14119 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | test/unit/setting_test.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/unit/setting_test.rb b/test/unit/setting_test.rb index 6c3c27df9..b6e76c8e0 100644 --- a/test/unit/setting_test.rb +++ b/test/unit/setting_test.rb @@ -118,8 +118,9 @@ YAML Setting.commit_update_keywords = {} assert_equal 1, Setting.where(:name => 'commit_update_keywords').update_all(:value => yaml) Setting.clear_cache - - assert_equal 'UTF-8', Setting.commit_update_keywords.first['keywords'].encoding.name + if "".respond_to?(:force_encoding) + assert_equal 'UTF-8', Setting.commit_update_keywords.first['keywords'].encoding.name + end ensure Setting.where(:name => 'commit_update_keywords').delete_all Setting.clear_cache |