2 files changed, 76 insertions, 3 deletions

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
diff --git a/spec/features/tags/maintainer_deletes_protected_tag_spec.rb b/spec/features/tags/maintainer_deletes_protected_tag_spec.rb
new file mode 100644
index 00000000000..0bf9645c2fb
--- /dev/null
+++ b/spec/features/tags/maintainer_deletes_protected_tag_spec.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Maintainer deletes protected tag', :js do
+  let(:user) { create(:user) }
+  let(:group) { create(:group) }
+  let(:project) { create(:project, :repository, namespace: group) }
+  let(:tag_name) { 'v1.1.1' }
+
+  before do
+    project.add_maintainer(user)
+    sign_in(user)
+    create(:protected_tag, project: project, name: tag_name)
+    visit project_tags_path(project)
+  end
+
+  context 'from the tags list page' do
+    it 'deletes the tag' do
+      expect(page).to have_content "#{tag_name} protected"
+
+      page.find('.content .flex-row', text: tag_name).find('.js-delete-tag-button').click
+      assert_modal_content(tag_name)
+      confirm_delete_tag(tag_name)
+
+      expect(page).not_to have_content tag_name
+    end
+  end
+
+  context 'from a specific tag page' do
+    before do
+      click_on tag_name
+    end
+
+    it 'deletes the tag' do
+      expect(page).to have_current_path(project_tag_path(project, tag_name), ignore_query: true)
+
+      page.find('.js-delete-tag-button').click
+      assert_modal_content(tag_name)
+      confirm_delete_tag(tag_name)
+
+      expect(page).to have_current_path(project_tags_path(project), ignore_query: true)
+      expect(page).not_to have_content tag_name
+    end
+  end
+
+  def assert_modal_content(tag_name)
+    within '.modal' do
+      expect(page).to have_content("Please type the following to confirm: #{tag_name}")
+      expect(page).to have_field('delete_tag_input')
+      expect(page).to have_button('Yes, delete protected tag', disabled: true)
+    end
+  end
+
+  def confirm_delete_tag(tag_name)
+    within '.modal' do
+      fill_in('delete_tag_input', with: tag_name)
+      click_button('Yes, delete protected tag')
+      wait_for_requests
+    end
+  end
+end