mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-03 12:05:59 +01:00
Merge pull request #1849 from McFoggy/issue-1844
add 'state' attribute to ApiPullRequest object
This commit is contained in:
@@ -8,6 +8,7 @@ import java.util.Date
|
||||
*/
|
||||
case class ApiPullRequest(
|
||||
number: Int,
|
||||
state: String,
|
||||
updated_at: Date,
|
||||
created_at: Date,
|
||||
head: ApiPullRequest.Commit,
|
||||
@@ -44,6 +45,7 @@ object ApiPullRequest{
|
||||
): ApiPullRequest =
|
||||
ApiPullRequest(
|
||||
number = issue.issueId,
|
||||
state = if (issue.closed) "closed" else "open",
|
||||
updated_at = issue.updatedDate,
|
||||
created_at = issue.registeredDate,
|
||||
head = Commit(
|
||||
|
||||
@@ -265,6 +265,7 @@ class JsonFormatSpec extends FunSuite {
|
||||
|
||||
val apiPullRequest = ApiPullRequest(
|
||||
number = 1347,
|
||||
state = "open",
|
||||
updated_at = date1,
|
||||
created_at = date1,
|
||||
head = ApiPullRequest.Commit(
|
||||
@@ -287,6 +288,7 @@ class JsonFormatSpec extends FunSuite {
|
||||
|
||||
val apiPullRequestJson = s"""{
|
||||
"number": 1347,
|
||||
"state" : "open",
|
||||
"updated_at": "2011-04-14T16:00:49Z",
|
||||
"created_at": "2011-04-14T16:00:49Z",
|
||||
// "closed_at": "2011-04-14T16:00:49Z",
|
||||
|
||||
Reference in New Issue
Block a user