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/tags/developer_deletes_tag_spec.rb | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'spec/features/tags/developer_deletes_tag_spec.rb') diff --git a/spec/features/tags/developer_deletes_tag_spec.rb b/spec/features/tags/developer_deletes_tag_spec.rb index 6b669695f7b..efd4b42c136 100644 --- a/spec/features/tags/developer_deletes_tag_spec.rb +++ b/spec/features/tags/developer_deletes_tag_spec.rb @@ -10,6 +10,7 @@ RSpec.describe 'Developer deletes tag', :js do before do project.add_developer(user) sign_in(user) + create(:protected_tag, project: project, name: 'v1.1.1') visit project_tags_path(project) end @@ -22,6 +23,16 @@ RSpec.describe 'Developer deletes tag', :js do expect(page).not_to have_content 'v1.1.0' end + + context 'protected tags' do + it 'can not delete protected tags' do + expect(page).to have_content 'v1.1.1' + + container = page.find('.content .flex-row', text: 'v1.1.1') + expect(container).to have_button('Only a project maintainer or owner can delete a protected tag', + disabled: true) + end + end end context 'from a specific tag page' do @@ -33,7 +44,7 @@ RSpec.describe 'Developer deletes tag', :js do container = page.find('.nav-controls') delete_tag container - expect(page).to have_current_path("#{project_tags_path(project)}/", ignore_query: true) + expect(page).to have_current_path(project_tags_path(project), ignore_query: true) expect(page).not_to have_content 'v1.0.0' end end @@ -55,9 +66,9 @@ RSpec.describe 'Developer deletes tag', :js do end def delete_tag(container) - container.find('.js-remove-tag').click + container.find('.js-delete-tag-button').click - page.within('.modal') { click_button('Delete tag') } + page.within('.modal') { click_button('Yes, delete tag') } wait_for_requests end end -- cgit v1.2.3