Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 0 insertions, 20 deletions

diff --git a/spec/lib/gitlab/ci/config/entry/need_spec.rb b/spec/lib/gitlab/ci/config/entry/need_spec.rb
index a0a5dd52ad4..ab2e8d4db78 100644
--- a/spec/lib/gitlab/ci/config/entry/need_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/need_spec.rb
@@ -25,16 +25,6 @@ RSpec.describe ::Gitlab::Ci::Config::Entry::Need do
         it 'returns job needs configuration' do
           expect(need.value).to eq(name: 'job_name', artifacts: true, optional: false)
         end
-
-        context 'when the FF ci_needs_optional is disabled' do
-          before do
-            stub_feature_flags(ci_needs_optional: false)
-          end
-
-          it 'returns job needs configuration without `optional`' do
-            expect(need.value).to eq(name: 'job_name', artifacts: true)
-          end
-        end
       end
 
       it_behaves_like 'job type'
@@ -134,16 +124,6 @@ RSpec.describe ::Gitlab::Ci::Config::Entry::Need do
         it 'returns job needs configuration' do
           expect(need.value).to eq(name: 'job_name', artifacts: true, optional: true)
         end
-
-        context 'when the FF ci_needs_optional is disabled' do
-          before do
-            stub_feature_flags(ci_needs_optional: false)
-          end
-
-          it 'returns job needs configuration without `optional`' do
-            expect(need.value).to eq(name: 'job_name', artifacts: true)
-          end
-        end
       end
     end