Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 27 insertions, 0 deletions

diff --git a/spec/features/issues/user_edits_issue_spec.rb b/spec/features/issues/user_edits_issue_spec.rb
index de746415205..11b905735de 100644
--- a/spec/features/issues/user_edits_issue_spec.rb
+++ b/spec/features/issues/user_edits_issue_spec.rb
@@ -138,6 +138,33 @@ RSpec.describe "Issues > User edits issue", :js do
             expect(page).not_to have_text('verisimilitude')
           end
         end
+
+        it 'can remove label without removing label added via quick action', :aggregate_failures do
+          # Add `syzygy` label with a quick action
+          note = find('#note-body')
+          page.within '.timeline-content-form' do
+            note.native.send_keys('/label ~syzygy')
+          end
+          click_button 'Comment'
+
+          wait_for_requests
+
+          page.within '.block.labels' do
+            # Remove `verisimilitude` label
+            within '.gl-label' do
+              click_button
+            end
+
+            wait_for_requests
+
+            expect(page).to have_text('syzygy')
+            expect(page).not_to have_text('verisimilitude')
+          end
+
+          expect(page).to have_text('removed verisimilitude label')
+          expect(page).not_to have_text('removed syzygy verisimilitude labels')
+          expect(issue.reload.labels.map(&:title)).to contain_exactly('syzygy')
+        end
       end
 
       describe 'update assignee' do