]> source.dussan.org Git - redmine.git/commitdiff
code cleanup: rubocop: fix Layout/ClosingHeredocIndentation in test/integration/api_t...
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Wed, 25 Sep 2019 17:55:26 +0000 (17:55 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Wed, 25 Sep 2019 17:55:26 +0000 (17:55 +0000)
git-svn-id: http://svn.redmine.org/redmine/trunk@18538 e93f8b46-1217-0410-a6f0-8f06a7374b81

.rubocop_todo.yml
test/integration/api_test/issues_test.rb

index 2da61b664fe4d1cc0aa2d045da4c6ef6b3bc7885..23eaf8edff746370d018c9ce954decf3bd5d5789 100644 (file)
@@ -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'
index 516221801665a875576f6ad645b312d6eaaf4b25..a9f9a4159719056f4e2ecb3fb3df742f119d83f7 100644 (file)
@@ -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
-<?xml version="1.0" encoding="UTF-8" ?>
-<issue>
-  <project_id>1</project_id>
-  <tracker_id>1</tracker_id>
-  <subject>Issue with multiple attachments</subject>
-  <uploads type="array">
-    <upload>
-      <token>#{token1}</token>
-      <filename>test1.txt</filename>
-    </upload>
-    <upload>
-      <token>#{token2}</token>
-      <filename>test1.txt</filename>
-    </upload>
-  </uploads>
-</issue>
-XML
-
+    payload = <<~XML
+      <?xml version="1.0" encoding="UTF-8" ?>
+      <issue>
+        <project_id>1</project_id>
+        <tracker_id>1</tracker_id>
+        <subject>Issue with multiple attachments</subject>
+        <uploads type="array">
+          <upload>
+            <token>#{token1}</token>
+            <filename>test1.txt</filename>
+          </upload>
+          <upload>
+            <token>#{token2}</token>
+            <filename>test1.txt</filename>
+          </upload>
+        </uploads>
+      </issue>
+    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,