1 files changed, 9 insertions, 27 deletions
diff --git a/spec/models/concerns/ci/has_status_spec.rb b/spec/models/concerns/ci/has_status_spec.rb
index fe46b63781d..b16420bc658 100644
--- a/spec/models/concerns/ci/has_status_spec.rb
+++ b/spec/models/concerns/ci/has_status_spec.rb
@@ -3,10 +3,10 @@
 require 'spec_helper'
 
 RSpec.describe Ci::HasStatus do
-  describe '.slow_composite_status' do
+  describe '.composite_status' do
     using RSpec::Parameterized::TableSyntax
 
-    subject { CommitStatus.slow_composite_status(project: nil) }
+    subject { CommitStatus.composite_status }
 
     shared_examples 'build status summary' do
       context 'all successful' do
@@ -184,26 +184,16 @@ RSpec.describe Ci::HasStatus do
       end
     end
 
-    where(:ci_composite_status) do
-      [false, true]
-    end
-
-    with_them do
-      before do
-        stub_feature_flags(ci_composite_status: ci_composite_status)
-      end
+    context 'ci build statuses' do
+      let(:type) { :ci_build }
 
-      context 'ci build statuses' do
-        let(:type) { :ci_build }
-
-        it_behaves_like 'build status summary'
-      end
+      it_behaves_like 'build status summary'
+    end
 
-      context 'generic commit statuses' do
-        let(:type) { :generic_commit_status }
+    context 'generic commit statuses' do
+      let(:type) { :generic_commit_status }
 
-        it_behaves_like 'build status summary'
-      end
+      it_behaves_like 'build status summary'
     end
   end
 
@@ -400,12 +390,4 @@ RSpec.describe Ci::HasStatus do
       end
     end
   end
-
-  describe '.legacy_status_sql' do
-    subject { Ci::Build.legacy_status_sql }
-
-    it 'returns SQL' do
-      puts subject
-    end
-  end
 end