1 files changed, 25 insertions, 47 deletions
diff --git a/spec/requests/api/graphql/metrics/dashboard/annotations_spec.rb b/spec/requests/api/graphql/metrics/dashboard/annotations_spec.rb
index f5a5f0a9ec2..cb35411b7a5 100644
--- a/spec/requests/api/graphql/metrics/dashboard/annotations_spec.rb
+++ b/spec/requests/api/graphql/metrics/dashboard/annotations_spec.rb
@@ -21,6 +21,7 @@ describe 'Getting Metrics Dashboard Annotations' do
     create(:metrics_dashboard_annotation, environment: environment, starting_at: to.advance(minutes: 5), dashboard_path: path)
   end
 
+  let(:args) { "from: \"#{from}\", to: \"#{to}\"" }
   let(:fields) do
     <<~QUERY
       #{all_graphql_fields_for('MetricsDashboardAnnotation'.classify)}
@@ -47,63 +48,40 @@ describe 'Getting Metrics Dashboard Annotations' do
         )
   end
 
-  context 'feature flag metrics_dashboard_annotations' do
-    let(:args) { "from: \"#{from}\", to: \"#{to}\"" }
+  before do
+    project.add_developer(current_user)
+    post_graphql(query, current_user: current_user)
+  end
 
-    before do
-      project.add_developer(current_user)
-    end
+  it_behaves_like 'a working graphql query'
 
-    context 'is off' do
-      before do
-        stub_feature_flags(metrics_dashboard_annotations: false)
-        post_graphql(query, current_user: current_user)
-      end
+  it 'returns annotations' do
+    annotations = graphql_data.dig('project', 'environments', 'nodes')[0].dig('metricsDashboard', 'annotations', 'nodes')
 
-      it 'returns empty nodes array' do
-        annotations = graphql_data.dig('project', 'environments', 'nodes')[0].dig('metricsDashboard', 'annotations', 'nodes')
+    expect(annotations).to match_array [{
+                                          "description" => annotation.description,
+                                          "id" => annotation.to_global_id.to_s,
+                                          "panelId" => annotation.panel_xid,
+                                          "startingAt" => annotation.starting_at.iso8601,
+                                          "endingAt" => nil
+                                        }]
+  end
 
-        expect(annotations).to be_empty
-      end
-    end
+  context 'arguments' do
+    context 'from is missing' do
+      let(:args) { "to: \"#{from}\"" }
 
-    context 'is on' do
-      before do
-        stub_feature_flags(metrics_dashboard_annotations: true)
+      it 'returns error' do
         post_graphql(query, current_user: current_user)
-      end
 
-      it_behaves_like 'a working graphql query'
-
-      it 'returns annotations' do
-        annotations = graphql_data.dig('project', 'environments', 'nodes')[0].dig('metricsDashboard', 'annotations', 'nodes')
-
-        expect(annotations).to match_array [{
-                                              "description" => annotation.description,
-                                              "id" => annotation.to_global_id.to_s,
-                                              "panelId" => annotation.panel_xid,
-                                              "startingAt" => annotation.starting_at.to_s,
-                                              "endingAt" => nil
-                                            }]
+        expect(graphql_errors[0]).to include("message" => "Field 'annotations' is missing required arguments: from")
       end
+    end
 
-      context 'arguments' do
-        context 'from is missing' do
-          let(:args) { "to: \"#{from}\"" }
-
-          it 'returns error' do
-            post_graphql(query, current_user: current_user)
-
-            expect(graphql_errors[0]).to include("message" => "Field 'annotations' is missing required arguments: from")
-          end
-        end
-
-        context 'to is missing' do
-          let(:args) { "from: \"#{from}\"" }
+    context 'to is missing' do
+      let(:args) { "from: \"#{from}\"" }
 
-          it_behaves_like 'a working graphql query'
-        end
-      end
+      it_behaves_like 'a working graphql query'
     end
   end
 end