summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-11-21 17:29:07 +0100
committerJames Lopez <james@jameslopez.es>2016-11-21 17:29:07 +0100
commita3331eee91fdd2170865c37641a88af2b47f9839 (patch)
treed4af1b154886676fbcb86d17d826495d8a6694ad
parent7a63021ab3793ea64ead0d18cbd6ba1e62aa11bc (diff)
downloadgitlab-ce-fix/cycle-analytics-no-data.tar.gz
Updated code based on feedbackfix/cycle-analytics-no-data
-rw-r--r--app/controllers/projects/cycle_analytics_controller.rb6
-rw-r--r--spec/controllers/projects/cycle_analytics_controller_spec.rb4
2 files changed, 3 insertions, 7 deletions
diff --git a/app/controllers/projects/cycle_analytics_controller.rb b/app/controllers/projects/cycle_analytics_controller.rb
index f1417ab29ef..4caec91efe7 100644
--- a/app/controllers/projects/cycle_analytics_controller.rb
+++ b/app/controllers/projects/cycle_analytics_controller.rb
@@ -10,7 +10,7 @@ class Projects::CycleAnalyticsController < Projects::ApplicationController
stats_values, cycle_analytics_json = generate_cycle_analytics_data
- @cycle_analytics_not_set_up = stats_with_no_data?(stats_values)
+ @cycle_analytics_no_data = stats_values.blank?
respond_to do |format|
format.html
@@ -68,8 +68,4 @@ class Projects::CycleAnalyticsController < Projects::ApplicationController
[stats_values, cycle_analytics_hash]
end
-
- def stats_with_no_data?(stats_values)
- stats_values.blank? || stats_values.inject(:+).zero?
- end
end
diff --git a/spec/controllers/projects/cycle_analytics_controller_spec.rb b/spec/controllers/projects/cycle_analytics_controller_spec.rb
index 9131014a05d..a971adf0539 100644
--- a/spec/controllers/projects/cycle_analytics_controller_spec.rb
+++ b/spec/controllers/projects/cycle_analytics_controller_spec.rb
@@ -17,7 +17,7 @@ describe Projects::CycleAnalyticsController do
project_id: project.to_param)
expect(response).to be_success
- expect(assigns(:cycle_analytics_not_set_up)).to eq(true)
+ expect(assigns(:cycle_analytics_no_data)).to eq(true)
end
end
@@ -36,7 +36,7 @@ describe Projects::CycleAnalyticsController do
project_id: project.to_param)
expect(response).to be_success
- expect(assigns(:cycle_analytics_not_set_up)).to eq(false)
+ expect(assigns(:cycle_analytics_no_data)).to eq(false)
end
end
end