From 1d3a76580f3eb732da45b99220cc8d64d277c535 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Wed, 11 Jan 2023 13:29:11 +0000 Subject: [PATCH] Fix RuboCop offense Performance/FixedSize (#38146). git-svn-id: https://svn.redmine.org/redmine/trunk@22030 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .rubocop_todo.yml | 5 ----- test/integration/api_test/issues_test.rb | 5 +++-- test/integration/attachments_test.rb | 15 +++++++++------ 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 158ac8721..afb26d8a8 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -486,11 +486,6 @@ Naming/VariableNumber: - 'test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb' - 'test/unit/project_test.rb' -Performance/FixedSize: - Exclude: - - 'test/integration/api_test/issues_test.rb' - - 'test/integration/attachments_test.rb' - # This cop supports unsafe autocorrection (--autocorrect-all). Performance/RedundantEqualityComparisonBlock: Exclude: diff --git a/test/integration/api_test/issues_test.rb b/test/integration/api_test/issues_test.rb index 132b6f815..425343c23 100644 --- a/test/integration/api_test/issues_test.rb +++ b/test/integration/api_test/issues_test.rb @@ -969,7 +969,8 @@ class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base end def test_create_issue_with_uploaded_file - token = xml_upload('test_create_with_upload', credentials('jsmith')) + file_content = 'test_create_with_upload' + token = xml_upload(file_content, credentials('jsmith')) attachment = Attachment.find_by_token(token) # create the issue with the upload's token @@ -991,7 +992,7 @@ class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base attachment.reload assert_equal 'test.txt', attachment.filename assert_equal 'text/plain', attachment.content_type - assert_equal 'test_create_with_upload'.size, attachment.filesize + assert_equal file_content.size, attachment.filesize assert_equal 2, attachment.author_id # get the issue with its attachments diff --git a/test/integration/attachments_test.rb b/test/integration/attachments_test.rb index 9060a0fb3..90b676621 100644 --- a/test/integration/attachments_test.rb +++ b/test/integration/attachments_test.rb @@ -58,7 +58,8 @@ class AttachmentsTest < Redmine::IntegrationTest def test_upload_as_js_and_attach_to_an_issue log_user('jsmith', 'jsmith') - token = ajax_upload('myupload.txt', 'File content') + file_content = 'File content' + token = ajax_upload('myupload.txt', file_content) assert_difference 'Issue.count' do post( @@ -84,7 +85,7 @@ class AttachmentsTest < Redmine::IntegrationTest attachment = issue.attachments.first assert_equal 'myupload.txt', attachment.filename assert_equal 'My uploaded file', attachment.description - assert_equal 'File content'.length, attachment.filesize + assert_equal file_content.length, attachment.filesize end def test_upload_as_js_and_preview_as_inline_attachment @@ -121,7 +122,8 @@ class AttachmentsTest < Redmine::IntegrationTest def test_upload_and_resubmit_after_validation_failure log_user('jsmith', 'jsmith') - token = ajax_upload('myupload.txt', 'File content') + file_content = 'File content' + token = ajax_upload('myupload.txt', file_content) assert_no_difference 'Issue.count' do post( @@ -167,13 +169,14 @@ class AttachmentsTest < Redmine::IntegrationTest attachment = issue.attachments.first assert_equal 'myupload.txt', attachment.filename assert_equal 'My uploaded file', attachment.description - assert_equal 'File content'.length, attachment.filesize + assert_equal file_content.length, attachment.filesize end def test_upload_filename_with_plus log_user('jsmith', 'jsmith') filename = 'a+b.txt' - token = ajax_upload(filename, 'File content') + file_content = 'File content' + token = ajax_upload(filename, file_content) assert_difference 'Issue.count' do post( '/projects/ecookbook/issues', @@ -191,7 +194,7 @@ class AttachmentsTest < Redmine::IntegrationTest attachment = issue.attachments.first assert_equal filename, attachment.filename assert_equal '', attachment.description - assert_equal 'File content'.length, attachment.filesize + assert_equal file_content.length, attachment.filesize end def test_upload_as_js_and_destroy -- 2.39.5