Browse Source

code cleanup: rubocop: fix Layout/ClosingHeredocIndentation and Layout/IndentHeredoc in test/unit/setting_test.rb

git-svn-id: http://svn.redmine.org/redmine/trunk@18614 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.1.0
Toshi MARUYAMA 4 years ago
parent
commit
6972d7e982
2 changed files with 9 additions and 13 deletions
  1. 0
    2
      .rubocop_todo.yml
  2. 9
    11
      test/unit/setting_test.rb

+ 0
- 2
.rubocop_todo.yml View File

@@ -93,7 +93,6 @@ Layout/ClosingHeredocIndentation:
- 'test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb'
- 'test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb'
- 'test/unit/lib/redmine/wiki_formatting_test.rb'
- 'test/unit/setting_test.rb'

# Cop supports --auto-correct.
Layout/ClosingParenthesisIndentation:
@@ -282,7 +281,6 @@ Layout/IndentHeredoc:
- 'test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb'
- 'test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb'
- 'test/unit/lib/redmine/wiki_formatting_test.rb'
- 'test/unit/setting_test.rb'

# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle.

+ 9
- 11
test/unit/setting_test.rb View File

@@ -114,20 +114,18 @@ class SettingTest < ActiveSupport::TestCase
end

def test_setting_serialied_as_binary_should_be_loaded_as_utf8_encoded_strings
yaml = <<-YAML
---
- keywords: !binary |
Zml4ZXMsY2xvc2VzLNC40YHQv9GA0LDQstC70LXQvdC+LNCz0L7RgtC+0LLQ
vizRgdC00LXQu9Cw0L3QvixmaXhlZA==

done_ratio: "100"
status_id: "5"
YAML

yaml = <<~YAML
---
- keywords: !binary |
Zml4ZXMsY2xvc2VzLNC40YHQv9GA0LDQstC70LXQvdC+LNCz0L7RgtC+0LLQ
vizRgdC00LXQu9Cw0L3QvixmaXhlZA==

done_ratio: "100"
status_id: "5"
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
ensure
Setting.where(:name => 'commit_update_keywords').delete_all

Loading…
Cancel
Save