From 57c1f7cae09fe60a4be8d99b64833779476f402d Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Thu, 4 Jan 2018 17:11:39 +0100
Subject: [PATCH] Fix rubocop warnings

---
 .../project_services/prometheus_service.rb      |  9 ++++++---
 .../prometheus/queries/deployment_query_spec.rb |  2 +-
 .../clusters/applications/prometheus_spec.rb    | 17 ++++++++++-------
 .../project_services/prometheus_service_spec.rb |  4 ++--
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/models/project_services/prometheus_service.rb b/app/models/project_services/prometheus_service.rb
index 8bb1eb28900..3bf44c1ab2b 100644
--- a/app/models/project_services/prometheus_service.rb
+++ b/app/models/project_services/prometheus_service.rb
@@ -23,7 +23,7 @@ class PrometheusService < MonitoringService
 
   def initialize_properties
     if properties.nil?
-      self.properties = { }
+      self.properties = {}
     end
   end
 
@@ -45,7 +45,8 @@ class PrometheusService < MonitoringService
 
   def fields
     [
-      { type: 'fieldset',
+      {
+        type: 'fieldset',
         legend: 'Manual Configuration',
         fields: [
           {
@@ -100,6 +101,7 @@ class PrometheusService < MonitoringService
   # Cache metrics for specific environment
   def calculate_reactive_cache(query_class_name, environment_id, *args)
     return unless active? && project && !project.pending_delete?
+
     client = client(environment_id)
 
     data = Kernel.const_get(query_class_name).new(client).query(environment_id, *args)
@@ -118,9 +120,10 @@ class PrometheusService < MonitoringService
     else
       cluster = cluster_with_prometheus(environment_id)
       raise Gitlab::PrometheusError, "couldn't find cluster with Prometheus installed" unless cluster
-      rest_client = client_from_cluster(cluster)
 
+      rest_client = client_from_cluster(cluster)
       raise Gitlab::PrometheusError, "couldn't create proxy Prometheus client" unless rest_client
+
       Gitlab::PrometheusClient.new(rest_client)
     end
   end
diff --git a/spec/lib/gitlab/prometheus/queries/deployment_query_spec.rb b/spec/lib/gitlab/prometheus/queries/deployment_query_spec.rb
index d166327b6d3..84dc31d9732 100644
--- a/spec/lib/gitlab/prometheus/queries/deployment_query_spec.rb
+++ b/spec/lib/gitlab/prometheus/queries/deployment_query_spec.rb
@@ -32,6 +32,6 @@ describe Gitlab::Prometheus::Queries::DeploymentQuery do
                                            time: stop_time)
 
     expect(subject.query(environment.id, deployment.id)).to eq(memory_values: nil, memory_before: nil, memory_after: nil,
-                                               cpu_values: nil, cpu_before: nil, cpu_after: nil)
+                                                               cpu_values: nil, cpu_before: nil, cpu_after: nil)
   end
 end
diff --git a/spec/models/clusters/applications/prometheus_spec.rb b/spec/models/clusters/applications/prometheus_spec.rb
index 1fdfb262618..1102249493c 100644
--- a/spec/models/clusters/applications/prometheus_spec.rb
+++ b/spec/models/clusters/applications/prometheus_spec.rb
@@ -51,13 +51,16 @@ describe Clusters::Applications::Prometheus do
 
     context 'cluster has kubeclient' do
       let(:kubernetes_url) { 'http://example.com' }
-      let(:k8s_discover_response) { {
-        resources: [
-          {
-            name: 'service',
-            kind: 'Service'
-          }]
-      } }
+      let(:k8s_discover_response) do
+        {
+          resources: [
+            {
+              name: 'service',
+              kind: 'Service'
+            }
+          ]
+        }
+      end
 
       let(:kube_client) { Kubeclient::Client.new(kubernetes_url) }
 
diff --git a/spec/models/project_services/prometheus_service_spec.rb b/spec/models/project_services/prometheus_service_spec.rb
index aff03e28cc4..789846250ad 100644
--- a/spec/models/project_services/prometheus_service_spec.rb
+++ b/spec/models/project_services/prometheus_service_spec.rb
@@ -205,7 +205,7 @@ describe PrometheusService, :use_clean_rails_memory_store_caching do
       context 'with cluster for all environments without prometheus installed' do
         context 'without environment supplied' do
           it 'raises PrometheusError because cluster was not found' do
-            expect{service.client}.to raise_error(Gitlab::PrometheusError, /couldn't find cluster with Prometheus installed/)
+            expect { service.client }.to raise_error(Gitlab::PrometheusError, /couldn't find cluster with Prometheus installed/)
           end
         end
 
@@ -224,7 +224,7 @@ describe PrometheusService, :use_clean_rails_memory_store_caching do
           let!(:environment) { create(:environment, project: project, name: 'prod') }
 
           it 'raises PrometheusError because cluster was not found' do
-            expect{service.client}.to raise_error(Gitlab::PrometheusError, /couldn't find cluster with Prometheus installed/)
+            expect { service.client }.to raise_error(Gitlab::PrometheusError, /couldn't find cluster with Prometheus installed/)
           end
         end
       end