Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 19 deletions

diff --git a/spec/models/analytics/instance_statistics/measurement_spec.rb b/spec/models/analytics/instance_statistics/measurement_spec.rb
index 379272cfcb9..fb9352f5411 100644
--- a/spec/models/analytics/instance_statistics/measurement_spec.rb
+++ b/spec/models/analytics/instance_statistics/measurement_spec.rb
@@ -48,26 +48,10 @@ RSpec.describe Analytics::InstanceStatistics::Measurement, type: :model do
   end
 
   describe '#measurement_identifier_values' do
-    subject { described_class.measurement_identifier_values.count }
-
-    context 'when the `store_ci_pipeline_counts_by_status` feature flag is off' do
-      let(:expected_count) { Analytics::InstanceStatistics::Measurement.identifiers.size - Analytics::InstanceStatistics::Measurement::EXPERIMENTAL_IDENTIFIERS.size }
-
-      before do
-        stub_feature_flags(store_ci_pipeline_counts_by_status: false)
-      end
-
-      it { is_expected.to eq(expected_count) }
-    end
-
-    context 'when the `store_ci_pipeline_counts_by_status` feature flag is on' do
-      let(:expected_count) { Analytics::InstanceStatistics::Measurement.identifiers.size }
+    let(:expected_count) { Analytics::InstanceStatistics::Measurement.identifiers.size }
 
-      before do
-        stub_feature_flags(store_ci_pipeline_counts_by_status: true)
-      end
+    subject { described_class.measurement_identifier_values.count }
 
-      it { is_expected.to eq(expected_count) }
-    end
+    it { is_expected.to eq(expected_count) }
   end
 end