2 files changed, 31 insertions, 0 deletions

diff --git a/spec/requests/api/graphql/metrics/dashboard/annotations_spec.rb b/spec/requests/api/graphql/metrics/dashboard/annotations_spec.rb
index 4dd47142c40..143bc1672f8 100644
--- a/spec/requests/api/graphql/metrics/dashboard/annotations_spec.rb
+++ b/spec/requests/api/graphql/metrics/dashboard/annotations_spec.rb
@@ -22,6 +22,7 @@ RSpec.describe 'Getting Metrics Dashboard Annotations', feature_category: :metri
     create(:metrics_dashboard_annotation, environment: environment, starting_at: to.advance(minutes: 5), dashboard_path: path)
   end
 
+  let(:remove_monitor_metrics) { false }
   let(:args) { "from: \"#{from}\", to: \"#{to}\"" }
   let(:fields) do
     <<~QUERY
@@ -50,6 +51,7 @@ RSpec.describe 'Getting Metrics Dashboard Annotations', feature_category: :metri
   end
 
   before do
+    stub_feature_flags(remove_monitor_metrics: remove_monitor_metrics)
     project.add_developer(current_user)
     post_graphql(query, current_user: current_user)
   end
@@ -85,4 +87,18 @@ RSpec.describe 'Getting Metrics Dashboard Annotations', feature_category: :metri
       it_behaves_like 'a working graphql query'
     end
   end
+
+  context 'when metrics dashboard feature is unavailable' do
+    let(:remove_monitor_metrics) { true }
+
+    it_behaves_like 'a working graphql query'
+
+    it 'returns nil' do
+      annotations = graphql_data.dig(
+        'project', 'environments', 'nodes', 0, 'metricsDashboard', 'annotations'
+      )
+
+      expect(annotations).to be_nil
+    end
+  end
 end
diff --git a/spec/requests/api/graphql/metrics/dashboard_query_spec.rb b/spec/requests/api/graphql/metrics/dashboard_query_spec.rb
index 8db0844c6d7..b7d9b59f5fe 100644
--- a/spec/requests/api/graphql/metrics/dashboard_query_spec.rb
+++ b/spec/requests/api/graphql/metrics/dashboard_query_spec.rb
@@ -45,7 +45,10 @@ RSpec.describe 'Getting Metrics Dashboard', feature_category: :metrics do
   end
 
   context 'for user with developer access' do
+    let(:remove_monitor_metrics) { false }
+
     before do
+      stub_feature_flags(remove_monitor_metrics: remove_monitor_metrics)
       project.add_developer(current_user)
       post_graphql(query, current_user: current_user)
     end
@@ -82,6 +85,18 @@ RSpec.describe 'Getting Metrics Dashboard', feature_category: :metrics do
           expect(dashboard).to eql("path" => path, "schemaValidationWarnings" => ["dashboard: can't be blank", "panel_groups: should be an array of panel_groups objects"])
         end
       end
+
+      context 'metrics dashboard feature is unavailable' do
+        let(:remove_monitor_metrics) { true }
+
+        it_behaves_like 'a working graphql query'
+
+        it 'returns nil' do
+          dashboard = graphql_data.dig('project', 'environments', 'nodes', 0, 'metricsDashboard')
+
+          expect(dashboard).to be_nil
+        end
+      end
     end
 
     context 'requested dashboard can not be found' do