diff options
author | Go MAEDA <maeda@farend.jp> | 2022-10-28 07:50:11 +0000 |
---|---|---|
committer | Go MAEDA <maeda@farend.jp> | 2022-10-28 07:50:11 +0000 |
commit | ee1476f802d34ee31d1e1c990165165338867ff6 (patch) | |
tree | d7848fddb34b876dbe05864d0b04ec98d5db8893 /test | |
parent | 6a55e94cd2ac8ed2462aa8b80ab9a96a8d43e25b (diff) | |
download | redmine-ee1476f802d34ee31d1e1c990165165338867ff6.tar.gz redmine-ee1476f802d34ee31d1e1c990165165338867ff6.zip |
Fix RuboCop offense Rails/Pluck (#37248).
git-svn-id: https://svn.redmine.org/redmine/trunk@21928 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test')
-rw-r--r-- | test/integration/api_test/search_test.rb | 4 | ||||
-rw-r--r-- | test/system/issues_test.rb | 2 | ||||
-rw-r--r-- | test/unit/query_test.rb | 26 |
3 files changed, 16 insertions, 16 deletions
diff --git a/test/integration/api_test/search_test.rb b/test/integration/api_test/search_test.rb index 67cadad51..f05832079 100644 --- a/test/integration/api_test/search_test.rb +++ b/test/integration/api_test/search_test.rb @@ -82,14 +82,14 @@ class Redmine::ApiTest::SearchTest < Redmine::ApiTest::Base assert_equal 11, json['total_count'] assert_equal 0, json['offset'] assert_equal 4, json['limit'] - assert_equal issue[0..3], json['results'].map {|r| r['id']} + assert_equal issue[0..3], json['results'].pluck('id') get '/search.json', :params => {:q => 'search_with_limited_results', :offset => 8, :limit => 4} json = ActiveSupport::JSON.decode(response.body) assert_equal 11, json['total_count'] assert_equal 8, json['offset'] assert_equal 4, json['limit'] - assert_equal issue[8..10], json['results'].map {|r| r['id']} + assert_equal issue[8..10], json['results'].pluck('id') end test "GET /search.xml should not quick jump to the issue with given id" do diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb index 6d19b65df..6e34ce62c 100644 --- a/test/system/issues_test.rb +++ b/test/system/issues_test.rb @@ -580,7 +580,7 @@ class IssuesSystemTest < ApplicationSystemTestCase csv = CSV.read(downloaded_file("issues.csv")) subject_index = csv.shift.index('Subject') - subjects = csv.map {|row| row[subject_index]} + subjects = csv.pluck(subject_index) assert_equal subjects.sort, subjects end diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index 4d6650ee8..1591e985e 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -65,7 +65,7 @@ class QueryTest < ActiveSupport::TestCase "Priority" ] assert_equal expected_order, - (query.available_filters.values.map{|v| v[:name]} & expected_order) + (query.available_filters.values.pluck(:name) & expected_order) end def test_available_filters_with_custom_fields_should_be_ordered @@ -83,7 +83,7 @@ class QueryTest < ActiveSupport::TestCase "Assignee's order test" ] assert_equal expected_order, - (query.available_filters.values.map{|v| v[:name]} & expected_order) + (query.available_filters.values.pluck(:name) & expected_order) end def test_custom_fields_for_all_projects_should_be_available_in_global_queries @@ -103,7 +103,7 @@ class QueryTest < ActiveSupport::TestCase query = IssueQuery.new(:project => nil, :name => '_') project_filter = query.available_filters["project_id"] assert_not_nil project_filter - project_ids = project_filter[:values].map{|p| p[1]} + project_ids = project_filter[:values].pluck(1) assert project_ids.include?("1") # public project assert !project_ids.include?("2") # private project user cannot see end @@ -940,7 +940,7 @@ class QueryTest < ActiveSupport::TestCase query = IssueQuery.new(:name => '_', :project => Project.find(1)) filter = query.available_filters["cf_#{cf.id}"] assert_not_nil filter - assert_include 'me', filter[:values].map{|v| v[1]} + assert_include 'me', filter[:values].pluck(1) query.filters = {"cf_#{cf.id}" => {:operator => '=', :values => ['me']}} result = query.issues @@ -998,7 +998,7 @@ class QueryTest < ActiveSupport::TestCase query = IssueQuery.new(:name => '_') filter = query.available_filters['project_id'] assert_not_nil filter - assert_include 'mine', filter[:values].map{|v| v[1]} + assert_include 'mine', filter[:values].pluck(1) query.filters = {'project_id' => {:operator => '=', :values => ['mine']}} result = query.issues @@ -1010,7 +1010,7 @@ class QueryTest < ActiveSupport::TestCase query = ProjectQuery.new(:name => '_') filter = query.available_filters['id'] assert_not_nil filter - assert_include 'bookmarks', filter[:values].map{|v| v[1]} + assert_include 'bookmarks', filter[:values].pluck(1) query.filters = {'id' => {:operator => '=', :values => ['bookmarks']}} result = query.results_scope @@ -1023,7 +1023,7 @@ class QueryTest < ActiveSupport::TestCase query = ProjectQuery.new(:name => '_') filter = query.available_filters['id'] - assert_not_include 'bookmarks', filter[:values].map{|v| v[1]} + assert_not_include 'bookmarks', filter[:values].pluck(1) end def test_filter_project_parent_id_with_my_projects @@ -1031,7 +1031,7 @@ class QueryTest < ActiveSupport::TestCase query = ProjectQuery.new(:name => '_') filter = query.available_filters['parent_id'] assert_not_nil filter - assert_include 'mine', filter[:values].map{|v| v[1]} + assert_include 'mine', filter[:values].pluck(1) query.filters = {'parent_id' => {:operator => '=', :values => ['mine']}} result = query.results_scope @@ -1045,7 +1045,7 @@ class QueryTest < ActiveSupport::TestCase query = ProjectQuery.new(:name => '_') filter = query.available_filters['parent_id'] assert_not_nil filter - assert_include 'bookmarks', filter[:values].map{|v| v[1]} + assert_include 'bookmarks', filter[:values].pluck(1) query.filters = {'parent_id' => {:operator => '=', :values => ['bookmarks']}} result = query.results_scope @@ -2387,7 +2387,7 @@ class QueryTest < ActiveSupport::TestCase test "#available_filters should include users of visible projects in cross-project view" do users = IssueQuery.new.available_filters["assigned_to_id"] assert_not_nil users - assert users[:values].map{|u| u[1]}.include?("3") + assert users[:values].pluck(1).include?("3") end test "#available_filters should include users of subprojects" do @@ -2397,14 +2397,14 @@ class QueryTest < ActiveSupport::TestCase Member.create!(:principal => user1, :project => project.children.visible.first, :role_ids => [1]) users = IssueQuery.new(:project => project).available_filters["assigned_to_id"] assert_not_nil users - assert users[:values].map{|u| u[1]}.include?(user1.id.to_s) - assert !users[:values].map{|u| u[1]}.include?(user2.id.to_s) + assert users[:values].pluck(1).include?(user1.id.to_s) + assert !users[:values].pluck(1).include?(user2.id.to_s) end test "#available_filters should include visible projects in cross-project view" do projects = IssueQuery.new.available_filters["project_id"] assert_not_nil projects - assert projects[:values].map{|u| u[1]}.include?("1") + assert projects[:values].pluck(1).include?("1") end test "#available_filters should include 'member_of_group' filter" do |