Skip to content
GitLab
Commit fabfb5c0 authored by Jeremie Bresson's avatar Jeremie Bresson
Browse files

Merge branch '6.x' into update-mockito 

Apply replacement:
* "Mockito.<Object>any()" => "Mockito.any(Object[].class)"
parents 582bd665 98c4b996
Hide whitespace changes
Inline Side-by-side
src/test/resources/org/gitlab4j/api/events.json
View file @ fabfb5c0
[ [
{ {
"id": 8,
"title": "no title", "title": "no title",
"project_id": 15, "project_id": 15,
"action_name": "closed", "action_name": "closed",
"target_id": 830, "target_id": 830,
"target_iid": 160,
"target_type": "Issue", "target_type": "Issue",
"author_id": 1, "author_id": 1,
"target_title": "Public project search field", "target_title": "Public project search field",
"created_at": "2017-02-09T10:43:19.667Z",
"author": { "author": {
"name": "Dmitriy Zaporozhets", "name": "Dmitriy Zaporozhets",
"username": "root", "username": "root",
...@@ -18,6 +21,7 @@ ...@@ -18,6 +21,7 @@
"author_username": "root" "author_username": "root"
}, },
{ {
"id": 9,
"title": "no title 2", "title": "no title 2",
"project_id": 15, "project_id": 15,
"action_name": "pushed", "action_name": "pushed",
...@@ -42,6 +46,7 @@ ...@@ -42,6 +46,7 @@
} }
}, },
{ {
"id": 21,
"project_id": 15, "project_id": 15,
"action_name": "closed", "action_name": "closed",
"target_id": 840, "target_id": 840,
...@@ -59,10 +64,12 @@ ...@@ -59,10 +64,12 @@
"author_username": "root" "author_username": "root"
}, },
{ {
"id": 10,
"title": "no title again", "title": "no title again",
"project_id": 15, "project_id": 15,
"action_name": "commented on", "action_name": "commented on",
"target_id": 1312, "target_id": 1312,
"target_iid": 1312,
"target_type": "Note", "target_type": "Note",
"author_id": 1, "author_id": 1,
"created_at": "2015-12-04T10:33:58.089Z", "created_at": "2015-12-04T10:33:58.089Z",
...@@ -80,7 +87,8 @@ ...@@ -80,7 +87,8 @@
"created_at": "2015-12-04T10:33:56.698Z", "created_at": "2015-12-04T10:33:56.698Z",
"system": false, "system": false,
"noteable_id": 377, "noteable_id": 377,
"noteable_type": "Issue" "noteable_type": "Issue",
"noteable_iid": 377
}, },
"author": { "author": {
"name": "Dmitriy Zaporozhets", "name": "Dmitriy Zaporozhets",
......
src/test/resources/org/gitlab4j/api/issue-link.json
View file @ fabfb5c0
...@@ -46,5 +46,6 @@ ...@@ -46,5 +46,6 @@
"user_notes_count": 0, "user_notes_count": 0,
"web_url": "http://example.com/example/example/issues/14", "web_url": "http://example.com/example/example/issues/14",
"confidential": false "confidential": false
} },
"link_type": "is_blocked_by"
} }
\ No newline at end of file
src/test/resources/org/gitlab4j/api/linked-issues.json
View file @ fabfb5c0
...@@ -22,6 +22,9 @@ ...@@ -22,6 +22,9 @@
"subscribed" : true, "subscribed" : true,
"user_notes_count": 0, "user_notes_count": 0,
"web_url": "http://example.com/example/example/issues/14", "web_url": "http://example.com/example/example/issues/14",
"confidential": false "confidential": false,
"link_type": "relates_to",
"link_created_at": "2016-01-07T12:44:33.959Z",
"link_updated_at": "2016-01-07T12:44:33.959Z"
} }
] ]
\ No newline at end of file
src/test/resources/org/gitlab4j/api/merge-request-event.json
View file @ fabfb5c0
...@@ -131,56 +131,80 @@ ...@@ -131,56 +131,80 @@
], ],
"changes": { "changes": {
"author_id": { "author_id": {
"current":2 "current": 2
}, },
"updated_at": { "updated_at": {
"previous": "2013-09-15T16:50:55Z", "previous": "2013-09-15T16:50:55Z",
"current": "2013-12-03T17:23:34Z" "current": "2013-12-03T17:23:34Z"
}, },
"updated_by_id": { "updated_by_id": {
"previous": 2, "previous": 2,
"current": 6 "current": 6
}, },
"id":{ "id": {
"previous":123, "previous": 123,
"current":456 "current": 456
}, },
"iid":{ "iid": {
"previous":12, "previous": 12,
"current":34 "current": 34
}, },
"merge_status": { "merge_status": {
"current": "unchecked" "current": "unchecked"
}, },
"milestone_id": { "milestone_id": {
"previous":0, "previous": 0,
"current":1 "current": 1
}, },
"labels": { "labels": {
"previous": [{ "previous": [
"id": 206, {
"title": "API", "id": 206,
"color": "#ffffff", "title": "API",
"project_id": 14, "color": "#ffffff",
"created_at": "2013-12-03T17:15:43Z", "project_id": 14,
"updated_at": "2013-12-03T17:15:43Z", "created_at": "2013-12-03T17:15:43Z",
"template": false, "updated_at": "2013-12-03T17:15:43Z",
"description": "API related issues", "template": false,
"type": "ProjectLabel", "description": "API related issues",
"group_id": 41 "type": "ProjectLabel",
}], "group_id": 41
"current": [{ }
"id": 205, ],
"title": "Platform", "current": [
"color": "#123123", {
"project_id": 14, "id": 205,
"created_at": "2013-12-03T17:15:43Z", "title": "Platform",
"updated_at": "2013-12-03T17:15:43Z", "color": "#123123",
"template": false, "project_id": 14,
"description": "Platform related issues", "created_at": "2013-12-03T17:15:43Z",
"type": "ProjectLabel", "updated_at": "2013-12-03T17:15:43Z",
"group_id": 41 "template": false,
}] "description": "Platform related issues",
"type": "ProjectLabel",
"group_id": 41
}
]
},
"reviewers": {
"previous": [
{
"id": 2,
"name": "John Doe",
"username": "jdoe",
"avatar_url": "https://www.gravatar.com/avatar/0?s=80&d=identicon",
"email": "jdoe@example.com"
}
],
"current": [
{
"id": 3,
"name": "Paul Smith",
"username": "psmith",
"avatar_url": "https://www.gravatar.com/avatar/0?s=80&d=identicon",
"email": "psmith@example.com"
}
]
} }
}, },
"assignees": [ "assignees": [
......
src/test/resources/org/gitlab4j/api/merge-request.json
View file @ fabfb5c0
...@@ -74,5 +74,34 @@ ...@@ -74,5 +74,34 @@
"blocking_discussions_resolved": true, "blocking_discussions_resolved": true,
"diverged_commits_count": 2, "diverged_commits_count": 2,
"latest_build_started_at": "2018-09-07T07:27:38.472Z", "latest_build_started_at": "2018-09-07T07:27:38.472Z",
"latest_build_finished_at": "2018-09-07T08:07:06.012Z" "latest_build_finished_at": "2018-09-07T08:07:06.012Z",
"head_pipeline": {
"id": 1,
"project_id": 3,
"sha": "2be7ddb704c7b6b83732fdd5b9f09d5a397b5f8f",
"ref": "test1",
"status": "pending",
"created_at": "2018-09-07T07:27:38.472Z",
"updated_at": "2018-09-07T07:27:38.472Z",
"web_url": "https://www.google.com/",
"before_sha": "0000000000000000000000000000000000000000",
"tag": false,
"user": {
"id":1,
"username": "admin",
"state": "active",
"email":"admin@local.host",
"name":"Administrator"
},
"detailed_status": {
"icon": "status_pending",
"text": "pending",
"label": "pending",
"group": "pending",
"tooltip": "pending",
"has_details": true,
"details_path": "/my-group/my-project/-/pipelines/1",
"favicon": "https://www.google.com/"
}
}
} }
src/test/resources/org/gitlab4j/api/pipeline.json
View file @ fabfb5c0
{ {
"id": 46, "id": 46,
"iid": 11,
"project_id": 1,
"status": "success", "status": "success",
"web_url": "http://3cb4fb3163d4/gitlab4j/test-project/pipelines/66", "ref": "main",
"ref": "master",
"sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a", "sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
"before_sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a", "before_sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
"tag": false, "tag": false,
"yaml_errors": "Included file `.gitlab-ci.yml` does not have valid YAML syntax!",
"user": { "user": {
"name": "Administrator", "name": "Administrator",
"username": "root", "username": "root",
...@@ -17,7 +19,7 @@ ...@@ -17,7 +19,7 @@
"created_at": "2016-08-11T11:28:34.085Z", "created_at": "2016-08-11T11:28:34.085Z",
"updated_at": "2016-08-11T11:32:35.169Z", "updated_at": "2016-08-11T11:32:35.169Z",
"finished_at": "2016-08-11T11:32:35.145Z", "finished_at": "2016-08-11T11:32:35.145Z",
"coverage": "30.0", "duration": 123,
"queued_duration": 0.010, "queued_duration": 0.010,
"detailed_status": { "detailed_status": {
"icon": "status_pending", "icon": "status_pending",
...@@ -28,5 +30,7 @@ ...@@ -28,5 +30,7 @@
"has_details": true, "has_details": true,
"details_path": "/gitlab4j/test-project/pipelines/66", "details_path": "/gitlab4j/test-project/pipelines/66",
"favicon": "/assets/ci_favicons/favicon_status_pending-5bdf338420e5221ca24353b6bff1c9367189588750632e9a871b7af09ff6a2ae.png" "favicon": "/assets/ci_favicons/favicon_status_pending-5bdf338420e5221ca24353b6bff1c9367189588750632e9a871b7af09ff6a2ae.png"
} },
"coverage": "30.0",
"web_url": "https://example.com/foo/bar/pipelines/46"
} }
src/test/resources/org/gitlab4j/api/wiki-blobs.json
View file @ fabfb5c0
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"basename": "home", "basename": "home",
"data": "hello\n\nand bye\n\nend", "data": "hello\n\nand bye\n\nend",
"filename": "home.md", "filename": "home.md",
"id": 123, "id": "a0b24fa71d6d8cef7393e877c608496f91ded0f6",
"ref": "master", "ref": "master",
"startline": 5, "startline": 5,
"project_id": 6 "project_id": 6
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment