Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 15 insertions, 7 deletions

diff --git a/spec/support/shared_examples/quick_actions/issuable/issuable_quick_actions_shared_examples.rb b/spec/support/shared_examples/quick_actions/issuable/issuable_quick_actions_shared_examples.rb
index b03da4471bc..50a8b81b518 100644
--- a/spec/support/shared_examples/quick_actions/issuable/issuable_quick_actions_shared_examples.rb
+++ b/spec/support/shared_examples/quick_actions/issuable/issuable_quick_actions_shared_examples.rb
@@ -18,6 +18,16 @@ RSpec.shared_examples 'issuable quick actions' do
     end
   end
 
+  let(:unlabel_expectation) do
+    ->(noteable, can_use_quick_action) {
+      if can_use_quick_action
+        expect(noteable.labels).to be_empty
+      else
+        expect(noteable.labels).not_to be_empty
+      end
+    }
+  end
+
   # Quick actions shared by issues and merge requests
   let(:issuable_quick_actions) do
     [
@@ -136,13 +146,11 @@ RSpec.shared_examples 'issuable quick actions' do
       ),
       QuickAction.new(
         action_text: "/unlabel",
-        expectation: ->(noteable, can_use_quick_action) {
-          if can_use_quick_action
-            expect(noteable.labels).to be_empty
-          else
-            expect(noteable.labels).not_to be_empty
-          end
-        }
+        expectation: unlabel_expectation
+      ),
+      QuickAction.new(
+        action_text: "/remove_label",
+        expectation: unlabel_expectation
       ),
       QuickAction.new(
         action_text: "/award :100:",