Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 1 deletions

diff --git a/spec/controllers/concerns/metrics_dashboard_spec.rb b/spec/controllers/concerns/metrics_dashboard_spec.rb
index a71e34fd1ca..71c3833bd2d 100644
--- a/spec/controllers/concerns/metrics_dashboard_spec.rb
+++ b/spec/controllers/concerns/metrics_dashboard_spec.rb
@@ -31,11 +31,13 @@ describe MetricsDashboard do
     end
 
     context 'when params are provided' do
+      let(:params) { { environment: environment } }
+
       before do
         allow(controller).to receive(:project).and_return(project)
         allow(controller)
           .to receive(:metrics_dashboard_params)
-          .and_return(environment: environment)
+          .and_return(params)
       end
 
       it 'returns the specified dashboard' do
@@ -43,6 +45,15 @@ describe MetricsDashboard do
         expect(json_response).not_to have_key('all_dashboards')
       end
 
+      context 'when the params are in an alternate format' do
+        let(:params) { ActionController::Parameters.new({ environment: environment }).permit! }
+
+        it 'returns the specified dashboard' do
+          expect(json_response['dashboard']['dashboard']).to eq('Environment metrics')
+          expect(json_response).not_to have_key('all_dashboards')
+        end
+      end
+
       context 'when parameters are provided and the list of all dashboards is required' do
         before do
           allow(controller).to receive(:include_all_dashboards?).and_return(true)