From 5d642fb7aa666063d5e1761833463bc95241889a Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 8 Apr 2016 15:07:12 +0200
Subject: [PATCH] fix rubocop warnings
---
.../import_export/import_export_reader.rb | 14 +++++++-------
.../import_export/import_export_reader_spec.rb | 18 +++++++++---------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/app/services/projects/import_export/import_export_reader.rb b/app/services/projects/import_export/import_export_reader.rb
index 981f19c0acb..e0617ce851c 100644
--- a/app/services/projects/import_export/import_export_reader.rb
+++ b/app/services/projects/import_export/import_export_reader.rb
@@ -38,7 +38,8 @@ module Projects
def process_include(hash, included_classes_hash = {})
hash.values.flatten.each do |value|
- current_key, value = process_current_class(hash, included_classes_hash, value)
+ current_key = hash.keys.first
+ value = process_current_class(hash, included_classes_hash, value)
if included_classes_hash[current_key]
add_class(current_key, included_classes_hash, value)
else
@@ -50,14 +51,13 @@ module Projects
def process_current_class(hash, included_classes_hash, value)
value = value.is_a?(Hash) ? process_include(hash, included_classes_hash) : value
- current_key = hash.keys.first
- only_except_hash = check_only_and_except(current_key)
- included_classes_hash[current_key] ||= only_except_hash unless only_except_hash.empty?
- return current_key, value
+ only_except_hash = check_only_and_except(hash.keys.first)
+ included_classes_hash[hash.keys.first] ||= only_except_hash unless only_except_hash.empty?
+ value
end
def add_new_class(current_key, included_classes_hash, value)
- new_hash = { :include => value }
+ new_hash = { include: value }
new_hash.merge!(check_only_and_except(value))
included_classes_hash[current_key] = new_hash
end
@@ -88,4 +88,4 @@ module Projects
end
end
end
-end
\ No newline at end of file
+end
diff --git a/spec/services/projects/import_export/import_export_reader_spec.rb b/spec/services/projects/import_export/import_export_reader_spec.rb
index 73e043e52ce..f825292ce7e 100644
--- a/spec/services/projects/import_export/import_export_reader_spec.rb
+++ b/spec/services/projects/import_export/import_export_reader_spec.rb
@@ -5,14 +5,14 @@ describe Projects::ImportExport::ImportExportReader do
let(:test_config) { 'spec/support/import_export/import_export.yml' }
let(:project_tree_hash) do
{
- :only => [:name, :path],
- :include => [:issues, :labels,
- { :merge_requests => {
- :only => [:id],
- :except => [:iid],
- :include => [:merge_request_diff, :merge_request_test]
- } },
- { :commit_statuses => { :include => :commit } }]
+ only: [:name, :path],
+ include: [:issues, :labels,
+ { merge_requests: {
+ only: [:id],
+ except: [:iid],
+ include: [:merge_request_diff, :merge_request_test]
+ } },
+ { commit_statuses: { include: :commit } }]
}
end
@@ -21,4 +21,4 @@ describe Projects::ImportExport::ImportExportReader do
expect(described_class.project_tree).to eq(project_tree_hash)
end
-end
\ No newline at end of file
+end
--
GitLab