From 0ea3fcec397b69815975647f5e2aa5fe944a8486 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 20 Jun 2022 11:10:13 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-1-stable-ee --- spec/features/group_variables_spec.rb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'spec/features/group_variables_spec.rb') diff --git a/spec/features/group_variables_spec.rb b/spec/features/group_variables_spec.rb index c7d37205b71..9af9baeb5bb 100644 --- a/spec/features/group_variables_spec.rb +++ b/spec/features/group_variables_spec.rb @@ -12,8 +12,18 @@ RSpec.describe 'Group variables', :js do group.add_owner(user) gitlab_sign_in(user) wait_for_requests - visit page_path end - it_behaves_like 'variable list' + context 'with disabled ff `ci_variable_settings_graphql' do + before do + stub_feature_flags(ci_variable_settings_graphql: false) + visit page_path + end + + it_behaves_like 'variable list' + end + + # TODO: Uncomment when the new graphQL app for variable settings + # is enabled. + # it_behaves_like 'variable list' end -- cgit v1.2.3