Show failure message when commands did not actually apply58457-follow-up-for-commands-applied-message

3 files changed, 13 insertions, 3 deletions

diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index 1b46f6d8a72..1e93a847b0a 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -52,11 +52,21 @@ module Notes
         # We must add the error after we call #save because errors are reset
         # when #save is called
         if only_commands
-          note.errors.add(:commands_only, 'Commands applied')
+          note.errors.add(:commands_only, applied_commands_message(update_params))
         end
       end
 
       note
     end
+
+    private
+
+    def applied_commands_message(updates)
+      if updates.present?
+        'Commands applied'
+      else
+        'Commands did not apply'
+      end
+    end
   end
 end
diff --git a/spec/support/shared_examples/quick_actions/issuable/relabel_quick_action_shared_examples.rb b/spec/support/shared_examples/quick_actions/issuable/relabel_quick_action_shared_examples.rb
index 643ae77516a..877c1e080cd 100644
--- a/spec/support/shared_examples/quick_actions/issuable/relabel_quick_action_shared_examples.rb
+++ b/spec/support/shared_examples/quick_actions/issuable/relabel_quick_action_shared_examples.rb
@@ -54,7 +54,7 @@ shared_examples 'relabel quick action' do |issuable_type|
 
       wait_for_requests
       expect(page).not_to have_content '/relabel'
-      expect(page).to have_content 'Commands applied'
+      expect(page).to have_content 'Commands did not apply'
       expect(issuable.reload.labels).to match_array([label_bug])
     end
 
diff --git a/spec/support/shared_examples/quick_actions/issue/move_quick_action_shared_examples.rb b/spec/support/shared_examples/quick_actions/issue/move_quick_action_shared_examples.rb
index a0b0d888769..2bb6f3eee13 100644
--- a/spec/support/shared_examples/quick_actions/issue/move_quick_action_shared_examples.rb
+++ b/spec/support/shared_examples/quick_actions/issue/move_quick_action_shared_examples.rb
@@ -40,7 +40,7 @@ shared_examples 'move quick action' do
 
         wait_for_requests
 
-        expect(page).to have_content 'Commands applied'
+        expect(page).to have_content 'Commands did not apply'
         expect(issue.reload).to be_open
       end
     end