summaryrefslogtreecommitdiff
path: root/spec/views/projects/edit.html.haml_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/views/projects/edit.html.haml_spec.rb')
-rw-r--r--spec/views/projects/edit.html.haml_spec.rb34
1 files changed, 28 insertions, 6 deletions
diff --git a/spec/views/projects/edit.html.haml_spec.rb b/spec/views/projects/edit.html.haml_spec.rb
index 11f542767f4..a85ddf7a005 100644
--- a/spec/views/projects/edit.html.haml_spec.rb
+++ b/spec/views/projects/edit.html.haml_spec.rb
@@ -45,10 +45,10 @@ RSpec.describe 'projects/edit' do
end
context 'merge commit template' do
- it 'displays a placeholder if none is set' do
+ it 'displays default template if none is set' do
render
- expect(rendered).to have_field('project[merge_commit_template]', placeholder: <<~MSG.rstrip)
+ expect(rendered).to have_field('project[merge_commit_template_or_default]', with: <<~MSG.rstrip)
Merge branch '%{source_branch}' into '%{target_branch}'
%{title}
@@ -64,15 +64,15 @@ RSpec.describe 'projects/edit' do
render
- expect(rendered).to have_field('project[merge_commit_template]', with: '%{title}')
+ expect(rendered).to have_field('project[merge_commit_template_or_default]', with: '%{title}')
end
end
context 'squash template' do
- it 'displays a placeholder if none is set' do
+ it 'displays default template if none is set' do
render
- expect(rendered).to have_field('project[squash_commit_template]', placeholder: '%{title}')
+ expect(rendered).to have_field('project[squash_commit_template_or_default]', with: '%{title}')
end
it 'displays the user entered value' do
@@ -80,7 +80,7 @@ RSpec.describe 'projects/edit' do
render
- expect(rendered).to have_field('project[squash_commit_template]', with: '%{first_multiline_commit}')
+ expect(rendered).to have_field('project[squash_commit_template_or_default]', with: '%{first_multiline_commit}')
end
end
@@ -139,4 +139,26 @@ RSpec.describe 'projects/edit' do
end
end
end
+
+ describe 'prompt user about registration features' do
+ context 'when service ping is enabled' do
+ before do
+ stub_application_setting(usage_ping_enabled: true)
+ end
+
+ it_behaves_like 'does not render registration features prompt', :project_disabled_repository_size_limit
+ end
+
+ context 'with no license and service ping disabled' do
+ before do
+ stub_application_setting(usage_ping_enabled: false)
+
+ if Gitlab.ee?
+ allow(License).to receive(:current).and_return(nil)
+ end
+ end
+
+ it_behaves_like 'renders registration features prompt', :project_disabled_repository_size_limit
+ end
+ end
end