Merge branch '22951-fix-todos-api-endpoint-error-for-commits' into 'master'

Fix todos API endpoint application error

Closes #22951

See merge request !9351

1 files changed, 9 insertions, 5 deletions

diff --git a/spec/factories/todos.rb b/spec/factories/todos.rb
index a5265f1b189..c1ac3bb84ad 100644
--- a/spec/factories/todos.rb
+++ b/spec/factories/todos.rb
@@ -18,11 +18,6 @@ FactoryGirl.define do
       action { Todo::DIRECTLY_ADDRESSED }
     end
 
-    trait :on_commit do
-      commit_id RepoHelpers.sample_commit.id
-      target_type "Commit"
-    end
-
     trait :build_failed do
       action { Todo::BUILD_FAILED }
       target factory: :merge_request
@@ -48,4 +43,13 @@ FactoryGirl.define do
       state :done
     end
   end
+
+  factory :on_commit_todo, class: Todo do
+    project factory: :empty_project
+    author
+    user
+    action { Todo::ASSIGNED }
+    commit_id RepoHelpers.sample_commit.id
+    target_type "Commit"
+  end
 end