diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 2da61b664..23eaf8edf 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -89,7 +89,6 @@ Layout/ClosingHeredocIndentation: Exclude: - 'app/models/setting.rb' - 'test/helpers/application_helper_test.rb' - - 'test/integration/api_test/issues_test.rb' - 'test/integration/lib/redmine/hook_test.rb' - 'test/unit/lib/redmine/unified_diff_test.rb' - 'test/unit/lib/redmine/wiki_formatting/macros_test.rb' diff --git a/test/integration/api_test/issues_test.rb b/test/integration/api_test/issues_test.rb index 516221801..a9f9a4159 100644 --- a/test/integration/api_test/issues_test.rb +++ b/test/integration/api_test/issues_test.rb @@ -905,26 +905,24 @@ JSON def test_create_issue_with_multiple_uploaded_files_as_xml token1 = xml_upload('File content 1', credentials('jsmith')) token2 = xml_upload('File content 2', credentials('jsmith')) - - payload = <<-XML - - - 1 - 1 - Issue with multiple attachments - - - #{token1} - test1.txt - - - #{token2} - test1.txt - - - -XML - + payload = <<~XML + + + 1 + 1 + Issue with multiple attachments + + + #{token1} + test1.txt + + + #{token2} + test1.txt + + + + XML assert_difference 'Issue.count' do post '/issues.xml', :params => payload, @@ -938,21 +936,19 @@ XML def test_create_issue_with_multiple_uploaded_files_as_json token1 = json_upload('File content 1', credentials('jsmith')) token2 = json_upload('File content 2', credentials('jsmith')) - - payload = <<-JSON -{ - "issue": { - "project_id": "1", - "tracker_id": "1", - "subject": "Issue with multiple attachments", - "uploads": [ - {"token": "#{token1}", "filename": "test1.txt"}, - {"token": "#{token2}", "filename": "test2.txt"} - ] - } -} -JSON - + payload = <<~JSON + { + "issue": { + "project_id": "1", + "tracker_id": "1", + "subject": "Issue with multiple attachments", + "uploads": [ + {"token": "#{token1}", "filename": "test1.txt"}, + {"token": "#{token2}", "filename": "test2.txt"} + ] + } + } + JSON assert_difference 'Issue.count' do post '/issues.json', :params => payload,