Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
85c87be3
Commit
85c87be3
authored
Feb 21, 2017
by
George Andrinopoulos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add spec for todo with target_type Commit
parent
9007a293
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
7 deletions
+17
-7
changelogs/unreleased/22951-fix-todos-api-endpoint-error-for-commits.yml
...leased/22951-fix-todos-api-endpoint-error-for-commits.yml
+4
-0
lib/api/entities.rb
lib/api/entities.rb
+2
-5
spec/factories/todos.rb
spec/factories/todos.rb
+9
-0
spec/requests/api/todos_spec.rb
spec/requests/api/todos_spec.rb
+2
-2
No files found.
changelogs/unreleased/22951-fix-todos-api-endpoint-error-for-commits.yml
0 → 100644
View file @
85c87be3
---
title
:
Add spec for todo with target_type Commit
merge_request
:
9351
author
:
George Andrinopoulos
lib/api/entities.rb
View file @
85c87be3
...
@@ -397,11 +397,8 @@ module API
...
@@ -397,11 +397,8 @@ module API
expose
:target_type
expose
:target_type
expose
:target
do
|
todo
,
options
|
expose
:target
do
|
todo
,
options
|
if
todo
.
target_type
==
'Commit'
target
=
todo
.
target_type
==
'Commit'
?
'RepoCommit'
:
todo
.
target_type
Entities
.
const_get
(
'RepoCommit'
).
represent
(
todo
.
target
,
options
)
Entities
.
const_get
(
target
).
represent
(
todo
.
target
,
options
)
else
Entities
.
const_get
(
todo
.
target_type
).
represent
(
todo
.
target
,
options
)
end
end
end
expose
:target_url
do
|
todo
,
options
|
expose
:target_url
do
|
todo
,
options
|
...
...
spec/factories/todos.rb
View file @
85c87be3
...
@@ -44,4 +44,13 @@ FactoryGirl.define do
...
@@ -44,4 +44,13 @@ FactoryGirl.define do
state
:done
state
:done
end
end
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
end
spec/requests/api/todos_spec.rb
View file @
85c87be3
...
@@ -3,7 +3,7 @@ require 'spec_helper'
...
@@ -3,7 +3,7 @@ require 'spec_helper'
describe
API
::
Todos
,
api:
true
do
describe
API
::
Todos
,
api:
true
do
include
ApiHelpers
include
ApiHelpers
let
(
:project_1
)
{
create
(
:empty_project
)
}
let
(
:project_1
)
{
create
(
:empty_project
,
:test_repo
)
}
let
(
:project_2
)
{
create
(
:empty_project
)
}
let
(
:project_2
)
{
create
(
:empty_project
)
}
let
(
:author_1
)
{
create
(
:user
)
}
let
(
:author_1
)
{
create
(
:user
)
}
let
(
:author_2
)
{
create
(
:user
)
}
let
(
:author_2
)
{
create
(
:user
)
}
...
@@ -11,7 +11,7 @@ describe API::Todos, api: true do
...
@@ -11,7 +11,7 @@ describe API::Todos, api: true do
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project_1
)
}
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_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_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
)
}
let!
(
:done
)
{
create
(
:todo
,
:done
,
project:
project_1
,
author:
author_1
,
user:
john_doe
)
}
before
do
before
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment