Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 14 deletions

diff --git a/spec/lib/gitlab/ci/yaml_processor_spec.rb b/spec/lib/gitlab/ci/yaml_processor_spec.rb
index cc327f5b5f1..b710ee092ec 100644
--- a/spec/lib/gitlab/ci/yaml_processor_spec.rb
+++ b/spec/lib/gitlab/ci/yaml_processor_spec.rb
@@ -1033,8 +1033,7 @@ module Gitlab
         end
       end
 
-      # Change this to a `describe` block when removing the FF ci_variables_refactoring_to_variable
-      shared_examples 'Variables' do
+      describe 'Variables' do
         subject(:execute) { described_class.new(config).execute }
 
         let(:build) { execute.builds.first }
@@ -1163,18 +1162,6 @@ module Gitlab
         end
       end
 
-      context 'when ci_variables_refactoring_to_variable is enabled' do
-        it_behaves_like 'Variables'
-      end
-
-      context 'when ci_variables_refactoring_to_variable is disabled' do
-        before do
-          stub_feature_flags(ci_variables_refactoring_to_variable: false)
-        end
-
-        it_behaves_like 'Variables'
-      end
-
       context 'when using `extends`' do
         let(:config_processor) { Gitlab::Ci::YamlProcessor.new(config).execute }