Skip to content

Commit 0c3c490

Browse files
bitwisemanbitwiseman
authored
Merge pull request #707 from rdvdijk/add-rocket-eyes-reactions
Add support for rocket and eyes reactions.
2 parents 99da6fb + fa26013 commit 0c3c490

31 files changed

Lines changed: 964 additions & 90 deletions

File tree

‎src/main/java/org/kohsuke/github/ReactionContent.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@
1010
* @see GHReaction
1111
*/
1212
public enum ReactionContent {
13-
PLUS_ONE("+1"), MINUS_ONE("-1"), LAUGH("laugh"), CONFUSED("confused"), HEART("heart"), HOORAY("hooray");
13+
PLUS_ONE("+1"),
14+
MINUS_ONE("-1"),
15+
LAUGH("laugh"),
16+
CONFUSED("confused"),
17+
HEART("heart"),
18+
HOORAY("hooray"),
19+
ROCKET("rocket"),
20+
EYES("eyes");
1421

1522
private final String content;
1623

‎src/test/java/org/kohsuke/github/AppTest.java‎

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -885,15 +885,60 @@ public void checkToString() throws Exception {
885885
public void reactions() throws Exception {
886886
GHIssue i = gitHub.getRepository("github-api/github-api").getIssue(311);
887887

888+
List<GHReaction> l;
888889
// retrieval
889-
GHReaction r = i.listReactions().iterator().next();
890-
assertThat(r.getUser().getLogin(), is("kohsuke"));
891-
assertThat(r.getContent(), is(ReactionContent.HEART));
890+
l = i.listReactions().asList();
891+
assertThat(l.size(), equalTo(1));
892+
893+
assertThat(l.get(0).getUser().getLogin(), is("kohsuke"));
894+
assertThat(l.get(0).getContent(), is(ReactionContent.HEART));
892895

893896
// CRUD
894-
GHReaction a = i.createReaction(ReactionContent.HOORAY);
897+
GHReaction a;
898+
a = i.createReaction(ReactionContent.HOORAY);
895899
assertThat(a.getUser().getLogin(), is(gitHub.getMyself().getLogin()));
900+
assertThat(a.getContent(), is(ReactionContent.HOORAY));
896901
a.delete();
902+
903+
l = i.listReactions().asList();
904+
assertThat(l.size(), equalTo(1));
905+
906+
a = i.createReaction(ReactionContent.PLUS_ONE);
907+
assertThat(a.getUser().getLogin(), is(gitHub.getMyself().getLogin()));
908+
assertThat(a.getContent(), is(ReactionContent.PLUS_ONE));
909+
910+
a = i.createReaction(ReactionContent.CONFUSED);
911+
assertThat(a.getUser().getLogin(), is(gitHub.getMyself().getLogin()));
912+
assertThat(a.getContent(), is(ReactionContent.CONFUSED));
913+
914+
a = i.createReaction(ReactionContent.EYES);
915+
assertThat(a.getUser().getLogin(), is(gitHub.getMyself().getLogin()));
916+
assertThat(a.getContent(), is(ReactionContent.EYES));
917+
918+
a = i.createReaction(ReactionContent.ROCKET);
919+
assertThat(a.getUser().getLogin(), is(gitHub.getMyself().getLogin()));
920+
assertThat(a.getContent(), is(ReactionContent.ROCKET));
921+
922+
l = i.listReactions().asList();
923+
assertThat(l.size(), equalTo(5));
924+
assertThat(l.get(0).getUser().getLogin(), is("kohsuke"));
925+
assertThat(l.get(0).getContent(), is(ReactionContent.HEART));
926+
assertThat(l.get(1).getUser().getLogin(), is(gitHub.getMyself().getLogin()));
927+
assertThat(l.get(1).getContent(), is(ReactionContent.PLUS_ONE));
928+
assertThat(l.get(2).getUser().getLogin(), is(gitHub.getMyself().getLogin()));
929+
assertThat(l.get(2).getContent(), is(ReactionContent.CONFUSED));
930+
assertThat(l.get(3).getUser().getLogin(), is(gitHub.getMyself().getLogin()));
931+
assertThat(l.get(3).getContent(), is(ReactionContent.EYES));
932+
assertThat(l.get(4).getUser().getLogin(), is(gitHub.getMyself().getLogin()));
933+
assertThat(l.get(4).getContent(), is(ReactionContent.ROCKET));
934+
935+
l.get(1).delete();
936+
l.get(2).delete();
937+
l.get(3).delete();
938+
l.get(4).delete();
939+
940+
l = i.listReactions().asList();
941+
assertThat(l.size(), equalTo(1));
897942
}
898943

899944
@Test

src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api-802b5ffb-1b82-43ae-bd10-62f1cf8adfa3.json renamed to src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api-66f6b3ba-129b-441c-9f2f-c9e18c941eea.json

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -65,46 +65,48 @@
6565
"releases_url": "https://api.github.com/repos/github-api/github-api/releases{/id}",
6666
"deployments_url": "https://api.github.com/repos/github-api/github-api/deployments",
6767
"created_at": "2010-04-19T04:13:03Z",
68-
"updated_at": "2019-10-25T01:32:16Z",
69-
"pushed_at": "2019-10-25T16:41:09Z",
68+
"updated_at": "2020-02-23T02:42:15Z",
69+
"pushed_at": "2020-02-23T02:48:53Z",
7070
"git_url": "git://github.com/github-api/github-api.git",
7171
"ssh_url": "git@github.com:github-api/github-api.git",
7272
"clone_url": "https://github.com/github-api/github-api.git",
7373
"svn_url": "https://github.com/github-api/github-api",
74-
"homepage": "http://github-api.kohsuke.org/",
75-
"size": 13494,
76-
"stargazers_count": 565,
77-
"watchers_count": 565,
74+
"homepage": "https://github-api.kohsuke.org/",
75+
"size": 19552,
76+
"stargazers_count": 613,
77+
"watchers_count": 613,
7878
"language": "Java",
7979
"has_issues": true,
8080
"has_projects": true,
8181
"has_downloads": true,
8282
"has_wiki": true,
8383
"has_pages": true,
84-
"forks_count": 433,
84+
"forks_count": 456,
8585
"mirror_url": null,
8686
"archived": false,
8787
"disabled": false,
88-
"open_issues_count": 64,
88+
"open_issues_count": 57,
8989
"license": {
9090
"key": "mit",
9191
"name": "MIT License",
9292
"spdx_id": "MIT",
9393
"url": "https://api.github.com/licenses/mit",
9494
"node_id": "MDc6TGljZW5zZTEz"
9595
},
96-
"forks": 433,
97-
"open_issues": 64,
98-
"watchers": 565,
96+
"forks": 456,
97+
"open_issues": 57,
98+
"watchers": 613,
9999
"default_branch": "master",
100100
"permissions": {
101101
"admin": true,
102102
"push": true,
103103
"pull": true
104104
},
105+
"temp_clone_token": "",
105106
"allow_squash_merge": true,
106107
"allow_merge_commit": true,
107108
"allow_rebase_merge": true,
109+
"delete_branch_on_merge": false,
108110
"organization": {
109111
"login": "github-api",
110112
"id": 54909825,
@@ -125,6 +127,6 @@
125127
"type": "Organization",
126128
"site_admin": false
127129
},
128-
"network_count": 433,
129-
"subscribers_count": 48
130+
"network_count": 456,
131+
"subscribers_count": 47
130132
}

src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311-27fe2304-4e19-4da7-8db3-0adf9281f71b.json renamed to src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311-1e8e21ad-edaf-4647-b812-4046b8f71a3a.json

File renamed without changes.

‎src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-1a36428c-ce04-4580-b160-ffc42b4629ff.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"id": 63220306,
3+
"node_id": "MDg6UmVhY3Rpb242MzIyMDMwNg==",
4+
"user": {
5+
"login": "bitwiseman",
6+
"id": 1958953,
7+
"node_id": "MDQ6VXNlcjE5NTg5NTM=",
8+
"avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
9+
"gravatar_id": "",
10+
"url": "https://api.github.com/users/bitwiseman",
11+
"html_url": "https://github.com/bitwiseman",
12+
"followers_url": "https://api.github.com/users/bitwiseman/followers",
13+
"following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
14+
"gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
15+
"starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
16+
"subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
17+
"organizations_url": "https://api.github.com/users/bitwiseman/orgs",
18+
"repos_url": "https://api.github.com/users/bitwiseman/repos",
19+
"events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
20+
"received_events_url": "https://api.github.com/users/bitwiseman/received_events",
21+
"type": "User",
22+
"site_admin": false
23+
},
24+
"content": "eyes",
25+
"created_at": "2020-02-23T03:15:56Z"
26+
}

src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-4abb0b9d-6883-4156-9111-86ec994328df.json renamed to src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-39f59d4e-7875-4b75-a093-97a0b4e7239b.json

File renamed without changes.

‎src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-41bca581-4ce9-4d1a-94ee-407bb996afc8.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"id": 63220307,
3+
"node_id": "MDg6UmVhY3Rpb242MzIyMDMwNw==",
4+
"user": {
5+
"login": "bitwiseman",
6+
"id": 1958953,
7+
"node_id": "MDQ6VXNlcjE5NTg5NTM=",
8+
"avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
9+
"gravatar_id": "",
10+
"url": "https://api.github.com/users/bitwiseman",
11+
"html_url": "https://github.com/bitwiseman",
12+
"followers_url": "https://api.github.com/users/bitwiseman/followers",
13+
"following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
14+
"gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
15+
"starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
16+
"subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
17+
"organizations_url": "https://api.github.com/users/bitwiseman/orgs",
18+
"repos_url": "https://api.github.com/users/bitwiseman/repos",
19+
"events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
20+
"received_events_url": "https://api.github.com/users/bitwiseman/received_events",
21+
"type": "User",
22+
"site_admin": false
23+
},
24+
"content": "rocket",
25+
"created_at": "2020-02-23T03:15:57Z"
26+
}

‎src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-9904f18c-def2-4249-b64c-956a2d12f2bd.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"id": 63220305,
3+
"node_id": "MDg6UmVhY3Rpb242MzIyMDMwNQ==",
4+
"user": {
5+
"login": "bitwiseman",
6+
"id": 1958953,
7+
"node_id": "MDQ6VXNlcjE5NTg5NTM=",
8+
"avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
9+
"gravatar_id": "",
10+
"url": "https://api.github.com/users/bitwiseman",
11+
"html_url": "https://github.com/bitwiseman",
12+
"followers_url": "https://api.github.com/users/bitwiseman/followers",
13+
"following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
14+
"gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
15+
"starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
16+
"subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
17+
"organizations_url": "https://api.github.com/users/bitwiseman/orgs",
18+
"repos_url": "https://api.github.com/users/bitwiseman/repos",
19+
"events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
20+
"received_events_url": "https://api.github.com/users/bitwiseman/received_events",
21+
"type": "User",
22+
"site_admin": false
23+
},
24+
"content": "confused",
25+
"created_at": "2020-02-23T03:15:56Z"
26+
}

‎src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-a94639e7-cb76-4ea2-a6a2-8d9a5642f3ec.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
[
2+
{
3+
"id": 5037900,
4+
"node_id": "MDg6UmVhY3Rpb241MDM3OTAw",
5+
"user": {
6+
"login": "kohsuke",
7+
"id": 50003,
8+
"node_id": "MDQ6VXNlcjUwMDAz",
9+
"avatar_url": "https://avatars1.githubusercontent.com/u/50003?v=4",
10+
"gravatar_id": "",
11+
"url": "https://api.github.com/users/kohsuke",
12+
"html_url": "https://github.com/kohsuke",
13+
"followers_url": "https://api.github.com/users/kohsuke/followers",
14+
"following_url": "https://api.github.com/users/kohsuke/following{/other_user}",
15+
"gists_url": "https://api.github.com/users/kohsuke/gists{/gist_id}",
16+
"starred_url": "https://api.github.com/users/kohsuke/starred{/owner}{/repo}",
17+
"subscriptions_url": "https://api.github.com/users/kohsuke/subscriptions",
18+
"organizations_url": "https://api.github.com/users/kohsuke/orgs",
19+
"repos_url": "https://api.github.com/users/kohsuke/repos",
20+
"events_url": "https://api.github.com/users/kohsuke/events{/privacy}",
21+
"received_events_url": "https://api.github.com/users/kohsuke/received_events",
22+
"type": "User",
23+
"site_admin": false
24+
},
25+
"content": "heart",
26+
"created_at": "2016-11-17T02:40:15Z"
27+
}
28+
]

‎src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-d9de8255-dcbc-409d-b311-b7824a3ddeb6.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"id": 63220303,
3+
"node_id": "MDg6UmVhY3Rpb242MzIyMDMwMw==",
4+
"user": {
5+
"login": "bitwiseman",
6+
"id": 1958953,
7+
"node_id": "MDQ6VXNlcjE5NTg5NTM=",
8+
"avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
9+
"gravatar_id": "",
10+
"url": "https://api.github.com/users/bitwiseman",
11+
"html_url": "https://github.com/bitwiseman",
12+
"followers_url": "https://api.github.com/users/bitwiseman/followers",
13+
"following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
14+
"gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
15+
"starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
16+
"subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
17+
"organizations_url": "https://api.github.com/users/bitwiseman/orgs",
18+
"repos_url": "https://api.github.com/users/bitwiseman/repos",
19+
"events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
20+
"received_events_url": "https://api.github.com/users/bitwiseman/received_events",
21+
"type": "User",
22+
"site_admin": false
23+
},
24+
"content": "+1",
25+
"created_at": "2020-02-23T03:15:55Z"
26+
}

0 commit comments

Comments
 (0)