Fixed more rubocop issues.

https://bugzilla.redhat.com/show_bug.cgi?id=1238179
gtanzillo · Jul 14, 2015 · 432d7c2 · 432d7c2
1 parent f1c1136
commit 432d7c2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 23 deletions.
diff --git a/lib/extensions/ar_merge_conditions.rb b/lib/extensions/ar_merge_conditions.rb
@@ -59,7 +59,7 @@ def self._included_associations(includes, arr)
       when Symbol, String
         arr << includes.to_sym
       when Array
-      includes.each do |assoc|
+        includes.each do |assoc|
           _included_associations assoc, arr
         end
       when Hash

diff --git a/spec/lib/extensions/ar_merge_conditions_spec.rb b/spec/lib/extensions/ar_merge_conditions_spec.rb
@@ -13,25 +13,25 @@
 
       # Typical includes for rendering daily metrics charts
       @include = {
-        :max_derived_cpu_available => {},
-        :max_derived_cpu_reserved => {},
-        :min_cpu_usagemhz_rate_average => {},
-        :max_cpu_usagemhz_rate_average => {},
-        :min_cpu_usage_rate_average => {},
-        :max_cpu_usage_rate_average => {},
+        :max_derived_cpu_available       => {},
+        :max_derived_cpu_reserved        => {},
+        :min_cpu_usagemhz_rate_average   => {},
+        :max_cpu_usagemhz_rate_average   => {},
+        :min_cpu_usage_rate_average      => {},
+        :max_cpu_usage_rate_average      => {},
         :v_pct_cpu_ready_delta_summation => {},
-        :v_pct_cpu_wait_delta_summation => {},
-        :v_pct_cpu_used_delta_summation => {},
-        :max_derived_memory_available => {},
-        :max_derived_memory_reserved => {},
-        :min_derived_memory_used => {},
-        :max_derived_memory_used => {},
-        :min_disk_usage_rate_average => {},
-        :max_disk_usage_rate_average => {},
-        :min_net_usage_rate_average => {},
-        :max_net_usage_rate_average => {},
-        :v_derived_storage_used => {},
-        :resource => {}
+        :v_pct_cpu_wait_delta_summation  => {},
+        :v_pct_cpu_used_delta_summation  => {},
+        :max_derived_memory_available    => {},
+        :max_derived_memory_reserved     => {},
+        :min_derived_memory_used         => {},
+        :max_derived_memory_used         => {},
+        :min_disk_usage_rate_average     => {},
+        :max_disk_usage_rate_average     => {},
+        :min_net_usage_rate_average      => {},
+        :max_net_usage_rate_average      => {},
+        :v_derived_storage_used          => {},
+        :resource                        => {}
 
       }
     end
@@ -45,4 +45,3 @@
     end
   end
 end
-
diff --git a/spec/models/metric_rollup_spec.rb b/spec/models/metric_rollup_spec.rb
@@ -6,9 +6,9 @@
       pending "until ActiveRecord is fixed"
       # TODO: A fix in ActiveRecord will make this test pass
       expect do
-        MetricRollup.where(:id => 1000000544893)
-            .includes(:resource => {}, :time_profile => {})
-            .references(:time_profile => {}).last
+        MetricRollup.where(:id => 1)
+          .includes(:resource => {}, :time_profile => {})
+          .references(:time_profile => {}).last
       end.not_to raise_error
 
       # TODO: Also, there is a bug that exists in only the manageiq repo and not rails