diff options
| author | George Andrinopoulos <geoandri@gmail.com> | 2017-02-21 15:44:21 +0200 |
|---|---|---|
| committer | George Andrinopoulos <geoandri@gmail.com> | 2017-02-21 15:45:10 +0200 |
| commit | 85c87be361e804977e7924ea9e464d0752cd2f24 (patch) | |
| tree | 8ec30c40977953b791f82a865372de02afcf847c | |
| parent | 9007a293a4af1872aa3ce2f0d613510f7839928f (diff) | |
| download | gitlab-ce-85c87be361e804977e7924ea9e464d0752cd2f24.tar.gz | |
Add spec for todo with target_type Commit
| -rw-r--r-- | changelogs/unreleased/22951-fix-todos-api-endpoint-error-for-commits.yml | 4 | ||||
| -rw-r--r-- | lib/api/entities.rb | 7 | ||||
| -rw-r--r-- | spec/factories/todos.rb | 9 | ||||
| -rw-r--r-- | spec/requests/api/todos_spec.rb | 4 |
4 files changed, 17 insertions, 7 deletions
diff --git a/changelogs/unreleased/22951-fix-todos-api-endpoint-error-for-commits.yml b/changelogs/unreleased/22951-fix-todos-api-endpoint-error-for-commits.yml new file mode 100644 index 00000000000..a53e7d77c16 --- /dev/null +++ b/changelogs/unreleased/22951-fix-todos-api-endpoint-error-for-commits.yml @@ -0,0 +1,4 @@ +--- +title: Add spec for todo with target_type Commit +merge_request: 9351 +author: George Andrinopoulos diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 4484ea92d48..536d3ee49d4 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -397,11 +397,8 @@ module API expose :target_type expose :target do |todo, options| - if todo.target_type == 'Commit' - Entities.const_get('RepoCommit').represent(todo.target, options) - else - Entities.const_get(todo.target_type).represent(todo.target, options) - end + target = todo.target_type == 'Commit' ? 'RepoCommit' : todo.target_type + Entities.const_get(target).represent(todo.target, options) end expose :target_url do |todo, options| diff --git a/spec/factories/todos.rb b/spec/factories/todos.rb index b4e4cd97780..a2cedda0eec 100644 --- a/spec/factories/todos.rb +++ b/spec/factories/todos.rb @@ -44,4 +44,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 diff --git a/spec/requests/api/todos_spec.rb b/spec/requests/api/todos_spec.rb index 56dc017ce54..baf6e4d98d3 100644 --- a/spec/requests/api/todos_spec.rb +++ b/spec/requests/api/todos_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe API::Todos, api: true do include ApiHelpers - let(:project_1) { create(:empty_project) } + let(:project_1) { create(:empty_project, :test_repo) } let(:project_2) { create(:empty_project) } let(:author_1) { create(:user) } let(:author_2) { create(:user) } @@ -11,7 +11,7 @@ describe API::Todos, api: true do let(:merge_request) { create(:merge_request, source_project: project_1) } let!(:pending_1) { create(:todo, :mentioned, project: project_1, author: author_1, user: john_doe) } let!(:pending_2) { create(:todo, project: project_2, author: author_2, user: john_doe) } - let!(:pending_3) { create(:todo, project: project_1, author: author_2, user: john_doe) } + let!(:pending_3) { create(:on_commit_todo, project: project_1, author: author_2, user: john_doe) } let!(:done) { create(:todo, :done, project: project_1, author: author_1, user: john_doe) } before do |