Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 36 insertions, 20 deletions

diff --git a/spec/requests/api/graphql/metrics/dashboard_query_spec.rb b/spec/requests/api/graphql/metrics/dashboard_query_spec.rb
index 8b0965a815b..d9d9ea9ad61 100644
--- a/spec/requests/api/graphql/metrics/dashboard_query_spec.rb
+++ b/spec/requests/api/graphql/metrics/dashboard_query_spec.rb
@@ -9,25 +9,19 @@ describe 'Getting Metrics Dashboard' do
   let(:project) { create(:project) }
   let!(:environment) { create(:environment, project: project) }
 
-  let(:fields) do
-    <<~QUERY
-      #{all_graphql_fields_for('MetricsDashboard'.classify)}
-    QUERY
-  end
-
   let(:query) do
-    %(
-      query {
-        project(fullPath:"#{project.full_path}") {
-          environments(name: "#{environment.name}") {
-            nodes {
-              metricsDashboard(path: "#{path}"){
-                #{fields}
-              }
-            }
-          }
-        }
-      }
+    graphql_query_for(
+      'project', { 'fullPath' => project.full_path },
+      query_graphql_field(
+        :environments, { 'name' => environment.name },
+        query_graphql_field(
+          :nodes, nil,
+          query_graphql_field(
+            :metricsDashboard, { 'path' => path },
+            all_graphql_fields_for('MetricsDashboard'.classify)
+          )
+        )
+      )
     )
   end
 
@@ -63,7 +57,29 @@ describe 'Getting Metrics Dashboard' do
       it 'returns metrics dashboard' do
         dashboard = graphql_data.dig('project', 'environments', 'nodes')[0]['metricsDashboard']
 
-        expect(dashboard).to eql("path" => path)
+        expect(dashboard).to eql("path" => path, "schemaValidationWarnings" => nil)
+      end
+
+      context 'invalid dashboard' do
+        let(:path) { '.gitlab/dashboards/metrics.yml' }
+        let(:project) { create(:project, :repository, :custom_repo, namespace: current_user.namespace, files: { path => "---\ndasboard: ''" }) }
+
+        it 'returns metrics dashboard' do
+          dashboard = graphql_data.dig('project', 'environments', 'nodes', 0, 'metricsDashboard')
+
+          expect(dashboard).to eql("path" => path, "schemaValidationWarnings" => ["dashboard: can't be blank", "panel_groups: can't be blank"])
+        end
+      end
+
+      context 'empty dashboard' do
+        let(:path) { '.gitlab/dashboards/metrics.yml' }
+        let(:project) { create(:project, :repository, :custom_repo, namespace: current_user.namespace, files: { path => "" }) }
+
+        it 'returns metrics dashboard' do
+          dashboard = graphql_data.dig('project', 'environments', 'nodes', 0, 'metricsDashboard')
+
+          expect(dashboard).to eql("path" => path, "schemaValidationWarnings" => ["dashboard: can't be blank", "panel_groups: can't be blank"])
+        end
       end
     end
 
@@ -72,7 +88,7 @@ describe 'Getting Metrics Dashboard' do
 
       it_behaves_like 'a working graphql query'
 
-      it 'return snil' do
+      it 'returns nil' do
         dashboard = graphql_data.dig('project', 'environments', 'nodes')[0]['metricsDashboard']
 
         expect(dashboard).to be_nil