diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /spec/views/admin | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'spec/views/admin')
-rw-r--r-- | spec/views/admin/application_settings/repository.html.haml_spec.rb | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/spec/views/admin/application_settings/repository.html.haml_spec.rb b/spec/views/admin/application_settings/repository.html.haml_spec.rb index b110bc277ac..47cadd29e33 100644 --- a/spec/views/admin/application_settings/repository.html.haml_spec.rb +++ b/spec/views/admin/application_settings/repository.html.haml_spec.rb @@ -12,35 +12,17 @@ RSpec.describe 'admin/application_settings/repository.html.haml' do end describe 'default initial branch name' do - context 'when the feature flag is disabled' do - before do - stub_feature_flags(global_default_branch_name: false) - end + it 'has the setting section' do + render - it 'does not show the setting section' do - render - - expect(rendered).not_to have_css("#js-default-branch-name") - end + expect(rendered).to have_css("#js-default-branch-name") end - context 'when the feature flag is enabled' do - before do - stub_feature_flags(global_default_branch_name: true) - end - - it 'has the setting section' do - render - - expect(rendered).to have_css("#js-default-branch-name") - end - - it 'renders the correct setting section content' do - render + it 'renders the correct setting section content' do + render - expect(rendered).to have_content("Default initial branch name") - expect(rendered).to have_content("Set the default name of the initial branch when creating new repositories through the user interface.") - end + expect(rendered).to have_content("Default initial branch name") + expect(rendered).to have_content("Set the default name of the initial branch when creating new repositories through the user interface.") end end end |