1 files changed, 5 insertions, 36 deletions
diff --git a/spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb b/spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb
index 8d625cab1d8..c0e4d1b5355 100644
--- a/spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb
+++ b/spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 
 RSpec.describe Gitlab::Cache::Ci::ProjectPipelineStatus, :clean_gitlab_redis_cache do
   let_it_be(:project) { create(:project, :repository) }
+
   let(:pipeline_status) { described_class.new(project) }
   let(:cache_key) { pipeline_status.cache_key }
 
@@ -83,24 +84,8 @@ RSpec.describe Gitlab::Cache::Ci::ProjectPipelineStatus, :clean_gitlab_redis_cac
           expect(pipeline_status).not_to be_has_cache
         end
 
-        context 'ci_pipeline_status_omit_commit_sha_in_cache_key is enabled' do
-          before do
-            stub_feature_flags(ci_pipeline_status_omit_commit_sha_in_cache_key: project)
-          end
-
-          it 'makes a Gitaly call' do
-            expect { pipeline_status.load_status }.to change { Gitlab::GitalyClient.get_request_count }.by(1)
-          end
-        end
-
-        context 'ci_pipeline_status_omit_commit_sha_in_cache_key is disabled' do
-          before do
-            stub_feature_flags(ci_pipeline_status_omit_commit_sha_in_cache_key: false)
-          end
-
-          it 'makes a Gitaly calls' do
-            expect { pipeline_status.load_status }.to change { Gitlab::GitalyClient.get_request_count }.by(1)
-          end
+        it 'makes a Gitaly call' do
+          expect { pipeline_status.load_status }.to change { Gitlab::GitalyClient.get_request_count }.by(1)
         end
       end
 
@@ -111,24 +96,8 @@ RSpec.describe Gitlab::Cache::Ci::ProjectPipelineStatus, :clean_gitlab_redis_cac
           expect(pipeline_status).to be_has_cache
         end
 
-        context 'ci_pipeline_status_omit_commit_sha_in_cache_key is enabled' do
-          before do
-            stub_feature_flags(ci_pipeline_status_omit_commit_sha_in_cache_key: project)
-          end
-
-          it 'makes no Gitaly calls' do
-            expect { pipeline_status.load_status }.to change { Gitlab::GitalyClient.get_request_count }.by(0)
-          end
-        end
-
-        context 'ci_pipeline_status_omit_commit_sha_in_cache_key is disabled' do
-          before do
-            stub_feature_flags(ci_pipeline_status_omit_commit_sha_in_cache_key: false)
-          end
-
-          it 'makes a Gitaly calls' do
-            expect { pipeline_status.load_status }.to change { Gitlab::GitalyClient.get_request_count }.by(1)
-          end
+        it 'makes no Gitaly calls' do
+          expect { pipeline_status.load_status }.to change { Gitlab::GitalyClient.get_request_count }.by(0)
         end
       end
     end