Code style changes59974-multiple-dashboards-be

- Use project instead of @project
- Fix rspec example group naming
- Use lower case cache keys

4 files changed, 6 insertions, 6 deletions

diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index 328ed32dfd4..d8812c023ca 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -159,9 +159,9 @@ class Projects::EnvironmentsController < Projects::ApplicationController
   end
 
   def metrics_dashboard
-    return render_403 unless Feature.enabled?(:environment_metrics_use_prometheus_endpoint, @project)
+    return render_403 unless Feature.enabled?(:environment_metrics_use_prometheus_endpoint, project)
 
-    if Feature.enabled?(:environment_metrics_show_multiple_dashboards, @project)
+    if Feature.enabled?(:environment_metrics_show_multiple_dashboards, project)
       result = dashboard_finder.find(project, current_user, environment, params[:dashboard])
 
       result[:all_dashboards] = project.repository.metrics_dashboard_paths
diff --git a/lib/gitlab/metrics/dashboard/project_dashboard_service.rb b/lib/gitlab/metrics/dashboard/project_dashboard_service.rb
index 7c7453fe2e3..fdffd067c93 100644
--- a/lib/gitlab/metrics/dashboard/project_dashboard_service.rb
+++ b/lib/gitlab/metrics/dashboard/project_dashboard_service.rb
@@ -25,7 +25,7 @@ module Gitlab
           end
 
           def cache_key(id, dashboard_path)
-            "PROJECT_#{id}_METRICS_DASHBOARD_#{dashboard_path}"
+            "project_#{id}_metrics_dashboard_#{dashboard_path}"
           end
         end
 
diff --git a/lib/gitlab/metrics/dashboard/system_dashboard_service.rb b/lib/gitlab/metrics/dashboard/system_dashboard_service.rb
index d381b2d495d..67509ed4230 100644
--- a/lib/gitlab/metrics/dashboard/system_dashboard_service.rb
+++ b/lib/gitlab/metrics/dashboard/system_dashboard_service.rb
@@ -35,7 +35,7 @@ module Gitlab
         end
 
         def cache_key
-          "METRICS_DASHBOARD_#{dashboard_path}"
+          "metrics_dashboard_#{dashboard_path}"
         end
 
         def insert_project_metrics?
diff --git a/spec/lib/gitlab/metrics/dashboard/finder_spec.rb b/spec/lib/gitlab/metrics/dashboard/finder_spec.rb
index cb9da4a9676..e88eb140b35 100644
--- a/spec/lib/gitlab/metrics/dashboard/finder_spec.rb
+++ b/spec/lib/gitlab/metrics/dashboard/finder_spec.rb
@@ -9,7 +9,7 @@ describe Gitlab::Metrics::Dashboard::Finder, :use_clean_rails_memory_store_cachi
   set(:environment) { build(:environment, project: project) }
   let(:system_dashboard_path) { Gitlab::Metrics::Dashboard::SystemDashboardService::SYSTEM_DASHBOARD_PATH}
 
-  describe '::find' do
+  describe '.find' do
     let(:dashboard_path) { '.gitlab/dashboards/test.yml' }
     let(:service_call) { described_class.find(project, nil, environment, dashboard_path) }
 
@@ -40,7 +40,7 @@ describe Gitlab::Metrics::Dashboard::Finder, :use_clean_rails_memory_store_cachi
     end
   end
 
-  describe '::find_all_paths' do
+  describe '.find_all_paths' do
     let(:all_dashboard_paths) { described_class.find_all_paths(project) }
     let(:system_dashboard) { { path: system_dashboard_path, default: true } }