Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

1 files changed, 2 insertions, 13 deletions

diff --git a/spec/services/todo_service_spec.rb b/spec/services/todo_service_spec.rb
index 1cb44366457..45a8268043f 100644
--- a/spec/services/todo_service_spec.rb
+++ b/spec/services/todo_service_spec.rb
@@ -207,7 +207,7 @@ RSpec.describe TodoService do
         end
 
         it_behaves_like 'an incident management tracked event', :incident_management_incident_todo do
-          let(:current_user) { john_doe}
+          let(:current_user) { john_doe }
         end
       end
     end
@@ -1139,7 +1139,7 @@ RSpec.describe TodoService do
     it 'updates related todos for the user with the new_state' do
       method_call
 
-      expect(collection.all? { |todo| todo.reload.state?(new_state)}).to be_truthy
+      expect(collection.all? { |todo| todo.reload.state?(new_state) }).to be_truthy
     end
 
     if new_resolved_by
@@ -1250,17 +1250,6 @@ RSpec.describe TodoService do
     end
   end
 
-  describe '#create_attention_requested_todo' do
-    let(:target) { create(:merge_request, author: author, source_project: project) }
-    let(:user) { create(:user) }
-
-    it 'creates a todo for user' do
-      service.create_attention_requested_todo(target, author, user)
-
-      should_create_todo(user: user, target: target, action: Todo::ATTENTION_REQUESTED)
-    end
-  end
-
   def should_create_todo(attributes = {})
     attributes.reverse_merge!(
       project: project,