From 545a050ba318f09890b6baf6934face7e958ea88 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Wed, 2 Oct 2019 00:53:11 +0000 Subject: [PATCH] Code cleanup: RuboCop: Fix Performance/Count and Performance/Detect. This change corrects newly detected offenses after updating rubocop-performance to 1.5.0 in r18579. git-svn-id: http://svn.redmine.org/redmine/trunk@18580 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .rubocop_todo.yml | 12 ------------ test/functional/workflows_controller_test.rb | 2 +- test/integration/api_test/issues_test.rb | 2 +- test/unit/issue_test.rb | 2 +- test/unit/project_copy_test.rb | 2 +- 5 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 1e81345cd..69f85ebcc 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -690,18 +690,6 @@ Naming/VariableNumber: - 'test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb' - 'test/unit/project_test.rb' -# Cop supports --auto-correct. -Performance/Count: - Exclude: - - 'test/functional/workflows_controller_test.rb' - - 'test/integration/api_test/issues_test.rb' - - 'test/unit/issue_test.rb' - -# Cop supports --auto-correct. -Performance/Detect: - Exclude: - - 'test/unit/project_copy_test.rb' - Performance/FixedSize: Exclude: - 'test/integration/api_test/issues_test.rb' diff --git a/test/functional/workflows_controller_test.rb b/test/functional/workflows_controller_test.rb index 708afa6f9..42c5ae4a3 100644 --- a/test/functional/workflows_controller_test.rb +++ b/test/functional/workflows_controller_test.rb @@ -95,7 +95,7 @@ class WorkflowsControllerTest < Redmine::ControllerTest assert_response :success assert_select 'select[name=?][multiple=multiple]', 'role_id[]' do - assert_select 'option[selected=selected]', Role.all.select(&:consider_workflow?).count + assert_select 'option[selected=selected]', Role.all.count(&:consider_workflow?) end assert_select 'select[name=?]', 'tracker_id[]' do assert_select 'option[selected=selected][value=all]' diff --git a/test/integration/api_test/issues_test.rb b/test/integration/api_test/issues_test.rb index dbfb05deb..d7b9d4d55 100644 --- a/test/integration/api_test/issues_test.rb +++ b/test/integration/api_test/issues_test.rb @@ -338,7 +338,7 @@ class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base json = ActiveSupport::JSON.decode(response.body) assert_equal 2, json['issue']['children'].size - assert_equal 1, json['issue']['children'].select {|child| child.key?('children')}.size + assert_equal 1, json['issue']['children'].count {|child| child.key?('children')} end test "GET /issues/:id.json with no spent time should return floats" do diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb index baedfec0f..0c3315459 100644 --- a/test/unit/issue_test.rb +++ b/test/unit/issue_test.rb @@ -2499,7 +2499,7 @@ class IssueTest < ActiveSupport::TestCase assert_equal 2, assignable_user_ids.length assignable_user_ids.each do |user_id| - assert_equal 1, assignable_user_ids.select {|i| i == user_id}.length, + assert_equal 1, assignable_user_ids.count {|i| i == user_id}, "User #{user_id} appears more or less than once" end end diff --git a/test/unit/project_copy_test.rb b/test/unit/project_copy_test.rb index fb07d6b65..af56c15a9 100644 --- a/test/unit/project_copy_test.rb +++ b/test/unit/project_copy_test.rb @@ -200,7 +200,7 @@ class ProjectCopyTest < ActiveSupport::TestCase # Second issue with a cross project relation assert_equal 2, copied_second_issue.relations.size, "Relation not copied" - copied_relation = copied_second_issue.relations.select {|r| r.relation_type == 'duplicates'}.first + copied_relation = copied_second_issue.relations.find {|r| r.relation_type == 'duplicates'} assert_equal "duplicates", copied_relation.relation_type assert_equal 1, copied_relation.issue_from_id, "Cross project relation not kept" assert_not_equal source_relation_cross_project.id, copied_relation.id -- 2.39.5