Commit 86cf22aa authored by Vitali Tatarintev's avatar Vitali Tatarintev

Merge branch 'pl-rubocop-style-hashtransformation-spec-directory' into 'master'

Fix cop offenses for Style/HashTransformation in spec directory

See merge request gitlab-org/gitlab!56586
parents 9e42626a e5ef57af
---
title: Fix cop offenses for Style/HashTransformation in spec directory
merge_request: 56586
author: Karthik Sivadas @karthik.sivadas
type: other
...@@ -14,7 +14,7 @@ RSpec.describe Atlassian::JiraConnect::Serializers::PullRequestEntity do ...@@ -14,7 +14,7 @@ RSpec.describe Atlassian::JiraConnect::Serializers::PullRequestEntity do
end end
context 'with user_notes_count option' do context 'with user_notes_count option' do
let(:user_notes_count) { merge_requests.map { |merge_request| [merge_request.id, 1] }.to_h } let(:user_notes_count) { merge_requests.to_h { |merge_request| [merge_request.id, 1] } }
subject { described_class.represent(merge_requests, user_notes_count: user_notes_count).as_json } subject { described_class.represent(merge_requests, user_notes_count: user_notes_count).as_json }
......
...@@ -6,13 +6,13 @@ RSpec.describe Gitlab::Ci::Status::Composite do ...@@ -6,13 +6,13 @@ RSpec.describe Gitlab::Ci::Status::Composite do
let_it_be(:pipeline) { create(:ci_pipeline) } let_it_be(:pipeline) { create(:ci_pipeline) }
before_all do before_all do
@statuses = Ci::HasStatus::STATUSES_ENUM.map do |status, idx| @statuses = Ci::HasStatus::STATUSES_ENUM.to_h do |status, idx|
[status, create(:ci_build, pipeline: pipeline, status: status, importing: true)] [status, create(:ci_build, pipeline: pipeline, status: status, importing: true)]
end.to_h end
@statuses_with_allow_failure = Ci::HasStatus::STATUSES_ENUM.map do |status, idx| @statuses_with_allow_failure = Ci::HasStatus::STATUSES_ENUM.to_h do |status, idx|
[status, create(:ci_build, pipeline: pipeline, status: status, allow_failure: true, importing: true)] [status, create(:ci_build, pipeline: pipeline, status: status, allow_failure: true, importing: true)]
end.to_h end
end end
describe '#status' do describe '#status' do
......
...@@ -21,7 +21,7 @@ RSpec.describe Gitlab::Conflict::File do ...@@ -21,7 +21,7 @@ RSpec.describe Gitlab::Conflict::File do
let(:section_keys) { conflict_file.sections.map { |section| section[:id] }.compact } let(:section_keys) { conflict_file.sections.map { |section| section[:id] }.compact }
context 'when resolving everything to the same side' do context 'when resolving everything to the same side' do
let(:resolution_hash) { section_keys.map { |key| [key, 'head'] }.to_h } let(:resolution_hash) { section_keys.to_h { |key| [key, 'head'] } }
let(:resolved_lines) { conflict_file.resolve_lines(resolution_hash) } let(:resolved_lines) { conflict_file.resolve_lines(resolution_hash) }
let(:expected_lines) { conflict_file.lines.reject { |line| line.type == 'old' } } let(:expected_lines) { conflict_file.lines.reject { |line| line.type == 'old' } }
...@@ -54,8 +54,8 @@ RSpec.describe Gitlab::Conflict::File do ...@@ -54,8 +54,8 @@ RSpec.describe Gitlab::Conflict::File do
end end
it 'raises ResolutionError when passed a hash without resolutions for all sections' do it 'raises ResolutionError when passed a hash without resolutions for all sections' do
empty_hash = section_keys.map { |key| [key, nil] }.to_h empty_hash = section_keys.to_h { |key| [key, nil] }
invalid_hash = section_keys.map { |key| [key, 'invalid'] }.to_h invalid_hash = section_keys.to_h { |key| [key, 'invalid'] }
expect { conflict_file.resolve_lines({}) } expect { conflict_file.resolve_lines({}) }
.to raise_error(Gitlab::Git::Conflict::Resolver::ResolutionError) .to raise_error(Gitlab::Git::Conflict::Resolver::ResolutionError)
......
...@@ -684,7 +684,7 @@ RSpec.describe Gitlab::ImportExport::Project::TreeRestorer do ...@@ -684,7 +684,7 @@ RSpec.describe Gitlab::ImportExport::Project::TreeRestorer do
it 'overrides project feature access levels' do it 'overrides project feature access levels' do
access_level_keys = ProjectFeature.available_features.map { |feature| ProjectFeature.access_level_attribute(feature) } access_level_keys = ProjectFeature.available_features.map { |feature| ProjectFeature.access_level_attribute(feature) }
disabled_access_levels = Hash[access_level_keys.collect { |item| [item, 'disabled'] }] disabled_access_levels = access_level_keys.to_h { |item| [item, 'disabled'] }
project.create_import_data(data: { override_params: disabled_access_levels }) project.create_import_data(data: { override_params: disabled_access_levels })
......
...@@ -164,7 +164,7 @@ RSpec.describe Featurable do ...@@ -164,7 +164,7 @@ RSpec.describe Featurable do
end end
def update_all_project_features(project, features, value) def update_all_project_features(project, features, value)
project_feature_attributes = features.map { |f| ["#{f}_access_level", value] }.to_h project_feature_attributes = features.to_h { |f| ["#{f}_access_level", value] }
project.project_feature.update!(project_feature_attributes) project.project_feature.update!(project_feature_attributes)
end end
end end
...@@ -299,11 +299,11 @@ RSpec.describe Event do ...@@ -299,11 +299,11 @@ RSpec.describe Event do
end end
def visible_to_none_except(*roles) def visible_to_none_except(*roles)
visible_to_none.merge(roles.map { |role| [role, true] }.to_h) visible_to_none.merge(roles.to_h { |role| [role, true] })
end end
def visible_to_all_except(*roles) def visible_to_all_except(*roles)
visible_to_all.merge(roles.map { |role| [role, false] }.to_h) visible_to_all.merge(roles.to_h { |role| [role, false] })
end end
shared_examples 'visibility examples' do shared_examples 'visibility examples' do
...@@ -723,7 +723,7 @@ RSpec.describe Event do ...@@ -723,7 +723,7 @@ RSpec.describe Event do
note_on_design: true, note_on_design: true,
note_on_commit: true note_on_commit: true
} }
valid_target_factories.map do |kind, needs_project| valid_target_factories.to_h do |kind, needs_project|
extra_data = if kind == :merge_request extra_data = if kind == :merge_request
{ source_project: project } { source_project: project }
elsif needs_project elsif needs_project
...@@ -735,7 +735,7 @@ RSpec.describe Event do ...@@ -735,7 +735,7 @@ RSpec.describe Event do
target = kind == :project ? nil : build(kind, **extra_data) target = kind == :project ? nil : build(kind, **extra_data)
[kind, build(:event, :created, author: project.owner, project: project, target: target)] [kind, build(:event, :created, author: project.owner, project: project, target: target)]
end.to_h end
end end
it 'passes a sanity check', :aggregate_failures do it 'passes a sanity check', :aggregate_failures do
......
...@@ -54,7 +54,7 @@ RSpec.describe Packages::Dependency, type: :model do ...@@ -54,7 +54,7 @@ RSpec.describe Packages::Dependency, type: :model do
context 'with too big parameter' do context 'with too big parameter' do
let(:size) { (Packages::Dependency::MAX_CHUNKED_QUERIES_COUNT * chunk_size) + 1 } let(:size) { (Packages::Dependency::MAX_CHUNKED_QUERIES_COUNT * chunk_size) + 1 }
let(:names_and_version_patterns) { Hash[(1..size).map { |v| [v, v] }] } let(:names_and_version_patterns) { (1..size).to_h { |v| [v, v] } }
it { expect { subject }.to raise_error(ArgumentError, 'Too many names_and_version_patterns') } it { expect { subject }.to raise_error(ArgumentError, 'Too many names_and_version_patterns') }
end end
......
...@@ -34,7 +34,7 @@ RSpec.describe 'getting Alert Management Alert Assignees' do ...@@ -34,7 +34,7 @@ RSpec.describe 'getting Alert Management Alert Assignees' do
end end
let(:alerts) { graphql_data.dig('project', 'alertManagementAlerts', 'nodes') } let(:alerts) { graphql_data.dig('project', 'alertManagementAlerts', 'nodes') }
let(:assignees) { alerts.map { |alert| [alert['iid'], alert['assignees']['nodes']] }.to_h } let(:assignees) { alerts.to_h { |alert| [alert['iid'], alert['assignees']['nodes']] } }
let(:first_assignees) { assignees[first_alert.iid.to_s] } let(:first_assignees) { assignees[first_alert.iid.to_s] }
let(:second_assignees) { assignees[second_alert.iid.to_s] } let(:second_assignees) { assignees[second_alert.iid.to_s] }
......
...@@ -38,7 +38,7 @@ RSpec.describe 'getting Alert Management Alert Notes' do ...@@ -38,7 +38,7 @@ RSpec.describe 'getting Alert Management Alert Notes' do
end end
let(:alerts_result) { graphql_data.dig('project', 'alertManagementAlerts', 'nodes') } let(:alerts_result) { graphql_data.dig('project', 'alertManagementAlerts', 'nodes') }
let(:notes_result) { alerts_result.map { |alert| [alert['iid'], alert['notes']['nodes']] }.to_h } let(:notes_result) { alerts_result.to_h { |alert| [alert['iid'], alert['notes']['nodes']] } }
let(:first_notes_result) { notes_result[first_alert.iid.to_s] } let(:first_notes_result) { notes_result[first_alert.iid.to_s] }
let(:second_notes_result) { notes_result[second_alert.iid.to_s] } let(:second_notes_result) { notes_result[second_alert.iid.to_s] }
......
...@@ -34,7 +34,7 @@ RSpec.describe 'getting Alert Management Alert Assignees' do ...@@ -34,7 +34,7 @@ RSpec.describe 'getting Alert Management Alert Assignees' do
end end
let(:gql_alerts) { graphql_data.dig('project', 'alertManagementAlerts', 'nodes') } let(:gql_alerts) { graphql_data.dig('project', 'alertManagementAlerts', 'nodes') }
let(:gql_todos) { gql_alerts.map { |gql_alert| [gql_alert['iid'], gql_alert['todos']['nodes']] }.to_h } let(:gql_todos) { gql_alerts.to_h { |gql_alert| [gql_alert['iid'], gql_alert['todos']['nodes']] } }
let(:gql_alert_todo) { gql_todos[alert.iid.to_s].first } let(:gql_alert_todo) { gql_todos[alert.iid.to_s].first }
let(:gql_other_alert_todo) { gql_todos[other_alert.iid.to_s].first } let(:gql_other_alert_todo) { gql_todos[other_alert.iid.to_s].first }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
require 'spec_helper' require 'spec_helper'
RSpec.shared_examples 'languages and percentages JSON response' do RSpec.shared_examples 'languages and percentages JSON response' do
let(:expected_languages) { project.repository.languages.map { |language| language.values_at(:label, :value)}.to_h } let(:expected_languages) { project.repository.languages.to_h { |language| language.values_at(:label, :value) } }
before do before do
allow(project.repository).to receive(:languages).and_return( allow(project.repository).to receive(:languages).and_return(
......
...@@ -277,11 +277,11 @@ module GraphqlHelpers ...@@ -277,11 +277,11 @@ module GraphqlHelpers
# prepare_input_for_mutation({ 'my_key' => 1 }) # prepare_input_for_mutation({ 'my_key' => 1 })
# => { 'myKey' => 1} # => { 'myKey' => 1}
def prepare_input_for_mutation(input) def prepare_input_for_mutation(input)
input.map do |name, value| input.to_h do |name, value|
value = prepare_input_for_mutation(value) if value.is_a?(Hash) value = prepare_input_for_mutation(value) if value.is_a?(Hash)
[GraphqlHelpers.fieldnamerize(name), value] [GraphqlHelpers.fieldnamerize(name), value]
end.to_h end
end end
def input_variable_name_for_mutation(mutation_name) def input_variable_name_for_mutation(mutation_name)
......
...@@ -97,13 +97,13 @@ module ImportExport ...@@ -97,13 +97,13 @@ module ImportExport
def normalize_elements(elem) def normalize_elements(elem)
case elem case elem
when Hash when Hash
elem.map do |key, value| elem.to_h do |key, value|
if ignore_key?(key, value) if ignore_key?(key, value)
[key, :ignored] [key, :ignored]
else else
[key, normalize_elements(value)] [key, normalize_elements(value)]
end end
end.to_h end
when Array when Array
elem.map { |a| normalize_elements(a) } elem.map { |a| normalize_elements(a) }
else else
......
...@@ -23,7 +23,7 @@ RSpec.shared_context 'container repository delete tags service shared context' d ...@@ -23,7 +23,7 @@ RSpec.shared_context 'container repository delete tags service shared context' d
end end
def stub_delete_reference_requests(tags) def stub_delete_reference_requests(tags)
tags = Hash[Array.wrap(tags).map { |tag| [tag, 200] }] unless tags.is_a?(Hash) tags = Array.wrap(tags).to_h { |tag| [tag, 200] } unless tags.is_a?(Hash)
tags.each do |tag, status| tags.each do |tag, status|
stub_request(:delete, "http://registry.gitlab/v2/#{repository.path}/tags/reference/#{tag}") stub_request(:delete, "http://registry.gitlab/v2/#{repository.path}/tags/reference/#{tag}")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment