diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /spec/features/projects/settings/service_desk_setting_spec.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
download | gitlab-ce-a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4.tar.gz |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'spec/features/projects/settings/service_desk_setting_spec.rb')
-rw-r--r-- | spec/features/projects/settings/service_desk_setting_spec.rb | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/spec/features/projects/settings/service_desk_setting_spec.rb b/spec/features/projects/settings/service_desk_setting_spec.rb index 50451075db5..91355d8f625 100644 --- a/spec/features/projects/settings/service_desk_setting_spec.rb +++ b/spec/features/projects/settings/service_desk_setting_spec.rb @@ -89,25 +89,10 @@ RSpec.describe 'Service Desk Setting', :js, :clean_gitlab_redis_cache do before do stub_licensed_features(custom_file_templates_for_namespace: false, custom_file_templates: false) group.update_columns(file_template_project_id: group_template_repo.id) + visit edit_project_path(project) end - context 'when inherited_issuable_templates enabled' do - before do - stub_feature_flags(inherited_issuable_templates: true) - visit edit_project_path(project) - end - - it_behaves_like 'issue description templates from current project only' - end - - context 'when inherited_issuable_templates disabled' do - before do - stub_feature_flags(inherited_issuable_templates: false) - visit edit_project_path(project) - end - - it_behaves_like 'issue description templates from current project only' - end + it_behaves_like 'issue description templates from current project only' end end end |