Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 9 deletions

diff --git a/spec/support/rspec_order.rb b/spec/support/rspec_order.rb
index c128e18b38e..0305ae7241d 100644
--- a/spec/support/rspec_order.rb
+++ b/spec/support/rspec_order.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'yaml'
+
 module Support
   module RspecOrder
     TODO_YAML = File.join(__dir__, 'rspec_order_todo.yml')
diff --git a/spec/support/shared_examples/features/variable_list_shared_examples.rb b/spec/support/shared_examples/features/variable_list_shared_examples.rb
index f0b72cfaee3..1211c9d19e6 100644
--- a/spec/support/shared_examples/features/variable_list_shared_examples.rb
+++ b/spec/support/shared_examples/features/variable_list_shared_examples.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.shared_examples 'variable list' do |is_admin|
+RSpec.shared_examples 'variable list' do
   it 'shows a list of variables' do
     page.within('[data-testid="ci-variable-table"]') do
       expect(find('.js-ci-variable-row:nth-child(1) td[data-label="Key"]').text).to eq(variable.key)
@@ -256,14 +256,6 @@ RSpec.shared_examples 'variable list' do |is_admin|
           expect(find('[data-testid="ci-variable-protected-checkbox"]')).to be_checked
         end
       end
-
-      it 'shows a message regarding the changed default' do
-        if is_admin
-          expect(page).to have_content 'Environment variables on this GitLab instance are configured to be protected by default'
-        else
-          expect(page).to have_content 'Environment variables are configured by your administrator to be protected by default'
-        end
-      end
     end
 
     context 'application setting is false' do