Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add reactions to issue, commit comment and review payload #1405

Merged
merged 30 commits into from
Jul 8, 2016
Merged

Add reactions to issue, commit comment and review payload #1405

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
b06097b
add reactions to issue response payload
martinscholz83 Jun 21, 2016
71e5eab
add reactions to commit comment payload
martinscholz83 Jun 21, 2016
1f9aa88
add reactions to review comment payload
martinscholz83 Jun 21, 2016
6a2ad51
create tests for issue client
martinscholz83 Jun 21, 2016
0f8f345
tests for commitcomment client
martinscholz83 Jun 23, 2016
3cd92ef
tests for pull request review comment
martinscholz83 Jun 23, 2016
93b4d98
change observable tests
martinscholz83 Jun 23, 2016
30cbd8e
simplify strings
martinscholz83 Jun 23, 2016
3c88311
remove unnecessary clients
martinscholz83 Jun 23, 2016
05b451b
change integration tests to retrieve all reaction types
martinscholz83 Jun 24, 2016
3ad2800
Merge remote-tracking branch 'refs/remotes/octokit/master' into add-r…
martinscholz83 Jul 4, 2016
6552b2e
create integration test for issue comment client
martinscholz83 Jul 4, 2016
3c636cf
Merge remote-tracking branch 'refs/remotes/octokit/master' into add-r…
martinscholz83 Jul 6, 2016
e1c97fe
fix merge conflicts
martinscholz83 Jul 6, 2016
75ae58d
Merge remote-tracking branch 'refs/remotes/octokit/master' into add-r…
martinscholz83 Jul 7, 2016
730dcd9
fix merge conflicts
martinscholz83 Jul 7, 2016
e588c29
gets tests passing again
shiftkey Jul 7, 2016
43411b8
fix some reaction integration tests
martinscholz83 Jul 7, 2016
1185da2
Fixup unit tests wth preview accepts header
ryangribble Jul 7, 2016
0a7bfc6
Fixup unit tests wth preview accepts header
ryangribble Jul 7, 2016
6535255
Rework reaction payload tests for IssueComments to handle Get, GetAll…
ryangribble Jul 7, 2016
a6179b0
[WIP] reaction payload tests
martinscholz83 Jul 7, 2016
bd10c35
Rework reaction payload tests for IssueComments to handle Get, GetAll…
ryangribble Jul 7, 2016
50cd04c
Rework reaction payload tests for Issues client
ryangribble Jul 7, 2016
9528faa
Rework reaction payload tests for PullRequestReviews client
ryangribble Jul 7, 2016
6770990
Rework reaction payload tests for CommitComments client
ryangribble Jul 7, 2016
8850126
revert maddin's changes
ryangribble Jul 7, 2016
86bc30e
Revert "[WIP] reaction payload tests"
martinscholz83 Jul 7, 2016
1118db3
Merge branch 'reactions-tests' of https://github.com/TattsGroup/octok…
martinscholz83 Jul 7, 2016
d4dc131
Merge pull request #6 from maddin2016/TattsGroup-reactions-tests
martinscholz83 Jul 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions Octokit.Tests/Reactive/ObservableIssuesClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ public async Task ReturnsEveryPageOfIssues()
&& d["sort"] == "created"
&& d["filter"] == "assigned"), Arg.Any<string>())
.Returns(Task.Factory.StartNew<IApiResponse<List<Issue>>>(() => firstPageResponse));
gitHubClient.Connection.Get<List<Issue>>(secondPageUrl, Arg.Any<Dictionary<string,string>>(), null)
gitHubClient.Connection.Get<List<Issue>>(secondPageUrl, Arg.Any<Dictionary<string,string>>(), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can simplify Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview") to just "application/vnd.github.squirrel-girl-preview"

.Returns(Task.Factory.StartNew<IApiResponse<List<Issue>>>(() => secondPageResponse));
gitHubClient.Connection.Get<List<Issue>>(thirdPageUrl, Arg.Any<Dictionary<string, string>>(), null)
gitHubClient.Connection.Get<List<Issue>>(thirdPageUrl, Arg.Any<Dictionary<string, string>>(), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"))
.Returns(Task.Factory.StartNew<IApiResponse<List<Issue>>>(() => lastPageResponse));
var client = new ObservableIssuesClient(gitHubClient);

Expand Down Expand Up @@ -192,11 +192,11 @@ public async Task ReturnsEveryPageOfIssues()
&& d["state"] == "open"
&& d["sort"] == "created"
&& d["filter"] == "assigned"),
Arg.Any<string>())
Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"))
.Returns(Task.Factory.StartNew<IApiResponse<List<Issue>>>(() => firstPageResponse));
gitHubClient.Connection.Get<List<Issue>>(secondPageUrl, Arg.Any<Dictionary<string,string>>(), null)
gitHubClient.Connection.Get<List<Issue>>(secondPageUrl, Arg.Any<Dictionary<string,string>>(), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"))
.Returns(Task.Factory.StartNew<IApiResponse<List<Issue>>>(() => secondPageResponse));
gitHubClient.Connection.Get<List<Issue>>(thirdPageUrl, Arg.Any<Dictionary<string, string>>(), null)
gitHubClient.Connection.Get<List<Issue>>(thirdPageUrl, Arg.Any<Dictionary<string, string>>(), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"))
.Returns(Task.Factory.StartNew<IApiResponse<List<Issue>>>(() => lastPageResponse));
var client = new ObservableIssuesClient(gitHubClient);

Expand Down Expand Up @@ -278,11 +278,11 @@ public async Task ReturnsEveryPageOfIssues()
&& d["direction"] == "desc"
&& d["state"] == "open"
&& d["sort"] == "created"
&& d["filter"] == "assigned"), Arg.Any<string>())
&& d["filter"] == "assigned"), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"))
.Returns(Task.Factory.StartNew<IApiResponse<List<Issue>>>(() => firstPageResponse));
gitHubClient.Connection.Get<List<Issue>>(secondPageUrl, Arg.Any<Dictionary<string,string>>(), null)
gitHubClient.Connection.Get<List<Issue>>(secondPageUrl, Arg.Any<Dictionary<string,string>>(), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"))
.Returns(Task.Factory.StartNew<IApiResponse<List<Issue>>>(() => secondPageResponse));
gitHubClient.Connection.Get<List<Issue>>(thirdPageUrl, Arg.Any<Dictionary<string, string>>(), null)
gitHubClient.Connection.Get<List<Issue>>(thirdPageUrl, Arg.Any<Dictionary<string, string>>(), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"))
.Returns(Task.Factory.StartNew<IApiResponse<List<Issue>>>(() => lastPageResponse));

var client = new ObservableIssuesClient(gitHubClient);
Expand Down Expand Up @@ -351,11 +351,11 @@ public async Task ReturnsEveryPageOfIssues()
&& d["direction"] == "desc"
&& d["state"] == "open"
&& d["sort"] == "created"
&& d["filter"] == "assigned"), Arg.Any<string>())
&& d["filter"] == "assigned"), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"))
.Returns(Task.Factory.StartNew<IApiResponse<List<Issue>>>(() => firstPageResponse));
gitHubClient.Connection.Get<List<Issue>>(secondPageUrl, Arg.Any<Dictionary<string, string>>(), null)
gitHubClient.Connection.Get<List<Issue>>(secondPageUrl, Arg.Any<Dictionary<string, string>>(), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"))
.Returns(Task.Factory.StartNew<IApiResponse<List<Issue>>>(() => secondPageResponse));
gitHubClient.Connection.Get<List<Issue>>(thirdPageUrl, Arg.Any<Dictionary<string, string>>(), null)
gitHubClient.Connection.Get<List<Issue>>(thirdPageUrl, Arg.Any<Dictionary<string, string>>(), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"))
.Returns(Task.Factory.StartNew<IApiResponse<List<Issue>>>(() => lastPageResponse));
var client = new ObservableIssuesClient(gitHubClient);

Expand Down
36 changes: 18 additions & 18 deletions Octokit.Tests/Reactive/ObservablePullRequestReviewCommentsClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,21 +97,21 @@ public async Task RequestsCorrectUrlMulti()
);

var gitHubClient = Substitute.For<IGitHubClient>();
gitHubClient.Connection.Get<List<PullRequestReviewComment>>(firstPageUrl, Args.EmptyDictionary, null)
gitHubClient.Connection.Get<List<PullRequestReviewComment>>(firstPageUrl, Args.EmptyDictionary, Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"))
.Returns(Task.Factory.StartNew<IApiResponse<List<PullRequestReviewComment>>>(() => firstPageResponse));
gitHubClient.Connection.Get<List<PullRequestReviewComment>>(secondPageUrl, Args.EmptyDictionary, null)
gitHubClient.Connection.Get<List<PullRequestReviewComment>>(secondPageUrl, Args.EmptyDictionary, Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"))
.Returns(Task.Factory.StartNew<IApiResponse<List<PullRequestReviewComment>>>(() => secondPageResponse));
gitHubClient.Connection.Get<List<PullRequestReviewComment>>(thirdPageUrl, Args.EmptyDictionary, null)
gitHubClient.Connection.Get<List<PullRequestReviewComment>>(thirdPageUrl, Args.EmptyDictionary, Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"))
.Returns(Task.Factory.StartNew<IApiResponse<List<PullRequestReviewComment>>>(() => lastPageResponse));

var client = new ObservablePullRequestReviewCommentsClient(gitHubClient);

var results = await client.GetAll("fakeOwner", "fakeRepoName", 7).ToArray();

Assert.Equal(7, results.Length);
gitHubClient.Connection.Received(1).Get<List<PullRequestReviewComment>>(firstPageUrl, Args.EmptyDictionary, null);
gitHubClient.Connection.Received(1).Get<List<PullRequestReviewComment>>(secondPageUrl, Args.EmptyDictionary, null);
gitHubClient.Connection.Received(1).Get<List<PullRequestReviewComment>>(thirdPageUrl, Args.EmptyDictionary, null);
gitHubClient.Connection.Received(1).Get<List<PullRequestReviewComment>>(firstPageUrl, Args.EmptyDictionary, Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"));
gitHubClient.Connection.Received(1).Get<List<PullRequestReviewComment>>(secondPageUrl, Args.EmptyDictionary, Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"));
gitHubClient.Connection.Received(1).Get<List<PullRequestReviewComment>>(thirdPageUrl, Args.EmptyDictionary, Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"));
}

[Fact]
Expand Down Expand Up @@ -223,17 +223,17 @@ public async Task RequestsCorrectUrlMulti()
Arg.Is<Dictionary<string, string>>(d => d.Count == 3
&& d["direction"] == "desc"
&& d["since"] == "2013-11-15T11:43:01Z"
&& d["sort"] == "updated"), null)
&& d["sort"] == "updated"), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"))
.Returns(Task.Factory.StartNew<IApiResponse<List<PullRequestReviewComment>>>(() => firstPageResponse));
gitHubClient.Connection.Get<List<PullRequestReviewComment>>(secondPageUrl, Arg.Is<Dictionary<string, string>>(d => d.Count == 3
&& d["direction"] == "desc"
&& d["since"] == "2013-11-15T11:43:01Z"
&& d["sort"] == "updated"), null)
&& d["sort"] == "updated"), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"))
.Returns(Task.Factory.StartNew<IApiResponse<List<PullRequestReviewComment>>>(() => secondPageResponse));
gitHubClient.Connection.Get<List<PullRequestReviewComment>>(thirdPageUrl, Arg.Is<Dictionary<string, string>>(d => d.Count == 3
&& d["direction"] == "desc"
&& d["since"] == "2013-11-15T11:43:01Z"
&& d["sort"] == "updated"), null)
&& d["sort"] == "updated"), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"))
.Returns(Task.Factory.StartNew<IApiResponse<List<PullRequestReviewComment>>>(() => lastPageResponse));

var client = new ObservablePullRequestReviewCommentsClient(gitHubClient);
Expand All @@ -252,15 +252,15 @@ public async Task RequestsCorrectUrlMulti()
Arg.Is<Dictionary<string, string>>(d => d.Count == 3
&& d["direction"] == "desc"
&& d["since"] == "2013-11-15T11:43:01Z"
&& d["sort"] == "updated"), null);
&& d["sort"] == "updated"), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"));
gitHubClient.Connection.Received(1).Get<List<PullRequestReviewComment>>(secondPageUrl, Arg.Is<Dictionary<string, string>>(d => d.Count == 3
&& d["direction"] == "desc"
&& d["since"] == "2013-11-15T11:43:01Z"
&& d["sort"] == "updated"), null);
&& d["sort"] == "updated"), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"));
gitHubClient.Connection.Received(1).Get<List<PullRequestReviewComment>>(thirdPageUrl, Arg.Is<Dictionary<string, string>>(d => d.Count == 3
&& d["direction"] == "desc"
&& d["since"] == "2013-11-15T11:43:01Z"
&& d["sort"] == "updated"), null);
&& d["sort"] == "updated"), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"));
}

[Fact]
Expand Down Expand Up @@ -334,15 +334,15 @@ public async Task RequestsCorrectUrlWithoutSelectedSortingArgumentsMulti()
gitHubClient.Connection.Get<List<PullRequestReviewComment>>(firstPageUrl,
Arg.Is<Dictionary<string, string>>(d => d.Count == 2
&& d["direction"] == "asc"
&& d["sort"] == "created"), null)
&& d["sort"] == "created"), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"))
.Returns(Task.Factory.StartNew<IApiResponse<List<PullRequestReviewComment>>>(() => firstPageResponse));
gitHubClient.Connection.Get<List<PullRequestReviewComment>>(secondPageUrl, Arg.Is<Dictionary<string, string>>(d => d.Count == 2
&& d["direction"] == "asc"
&& d["sort"] == "created"), null)
&& d["sort"] == "created"), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"))
.Returns(Task.Factory.StartNew<IApiResponse<List<PullRequestReviewComment>>>(() => secondPageResponse));
gitHubClient.Connection.Get<List<PullRequestReviewComment>>(thirdPageUrl, Arg.Is<Dictionary<string, string>>(d => d.Count == 2
&& d["direction"] == "asc"
&& d["sort"] == "created"), null)
&& d["sort"] == "created"), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"))
.Returns(Task.Factory.StartNew<IApiResponse<List<PullRequestReviewComment>>>(() => lastPageResponse));

var client = new ObservablePullRequestReviewCommentsClient(gitHubClient);
Expand All @@ -353,13 +353,13 @@ public async Task RequestsCorrectUrlWithoutSelectedSortingArgumentsMulti()
gitHubClient.Connection.Received(1).Get<List<PullRequestReviewComment>>(firstPageUrl,
Arg.Is<Dictionary<string, string>>(d => d.Count == 2
&& d["direction"] == "asc"
&& d["sort"] == "created"), null);
&& d["sort"] == "created"), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"));
gitHubClient.Connection.Received(1).Get<List<PullRequestReviewComment>>(secondPageUrl, Arg.Is<Dictionary<string, string>>(d => d.Count == 2
&& d["direction"] == "asc"
&& d["sort"] == "created"), null);
&& d["sort"] == "created"), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"));
gitHubClient.Connection.Received(1).Get<List<PullRequestReviewComment>>(thirdPageUrl, Arg.Is<Dictionary<string, string>>(d => d.Count == 2
&& d["direction"] == "asc"
&& d["sort"] == "created"), null);
&& d["sort"] == "created"), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"));
}

[Fact]
Expand Down
16 changes: 8 additions & 8 deletions Octokit.Tests/Reactive/ObservableRepositoryCommentsClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public void RequestsCorrectUrl()

client.GetAllForRepository("fake", "repo");
githubClient.Connection.Received(1).Get<List<CommitComment>>(Arg.Is<Uri>(uri => uri.ToString() == "repos/fake/repo/comments"),
Args.EmptyDictionary, null);
Args.EmptyDictionary, Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"));
}

[Fact]
Expand All @@ -75,7 +75,7 @@ public void RequestsCorrectUrlWithRepositoryId()

client.GetAllForRepository(1);
githubClient.Connection.Received(1).Get<List<CommitComment>>(Arg.Is<Uri>(uri => uri.ToString() == "repositories/1/comments"),
Args.EmptyDictionary, null);
Args.EmptyDictionary, Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"));
}

[Fact]
Expand All @@ -93,7 +93,7 @@ public void RequestsCorrectUrlWithApiOptions()

client.GetAllForRepository("fake", "repo", options);
githubClient.Connection.Received(1).Get<List<CommitComment>>(Arg.Is<Uri>(uri => uri.ToString() == "repos/fake/repo/comments"),
Arg.Is<Dictionary<string, string>>(dictionary => dictionary.Count == 2), null);
Arg.Is<Dictionary<string, string>>(dictionary => dictionary.Count == 2), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"));
}

[Fact]
Expand All @@ -111,7 +111,7 @@ public void RequestsCorrectUrlWithRepositoryIdWithApiOptions()

client.GetAllForRepository(1, options);
githubClient.Connection.Received(1).Get<List<CommitComment>>(Arg.Is<Uri>(uri => uri.ToString() == "repositories/1/comments"),
Arg.Is<Dictionary<string, string>>(dictionary => dictionary.Count == 2), null);
Arg.Is<Dictionary<string, string>>(dictionary => dictionary.Count == 2), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"));
}

[Fact]
Expand Down Expand Up @@ -145,7 +145,7 @@ public void RequestsCorrectUrl()

client.GetAllForCommit("fake", "repo", "sha");
githubClient.Connection.Received().Get<List<CommitComment>>(Arg.Is(new Uri("repos/fake/repo/commits/sha/comments", UriKind.Relative)),
Args.EmptyDictionary, null);
Args.EmptyDictionary, Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"));
}

[Fact]
Expand All @@ -156,7 +156,7 @@ public void RequestsCorrectUrlWithRepositoryId()

client.GetAllForCommit(1, "sha");
githubClient.Connection.Received().Get<List<CommitComment>>(Arg.Is(new Uri("repositories/1/commits/sha/comments", UriKind.Relative)),
Args.EmptyDictionary, null);
Args.EmptyDictionary, Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"));
}

[Fact]
Expand All @@ -174,7 +174,7 @@ public void RequestsCorrectUrlWithApiOptions()

client.GetAllForCommit("fake", "repo", "sha", options);
githubClient.Connection.Received().Get<List<CommitComment>>(Arg.Is(new Uri("repos/fake/repo/commits/sha/comments", UriKind.Relative)),
Arg.Is<IDictionary<string, string>>(d => d.Count == 2), null);
Arg.Is<IDictionary<string, string>>(d => d.Count == 2), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"));
}

[Fact]
Expand All @@ -192,7 +192,7 @@ public void RequestsCorrectUrlWithRepositoryIdWithApiOptions()

client.GetAllForCommit(1, "sha", options);
githubClient.Connection.Received().Get<List<CommitComment>>(Arg.Is(new Uri("repositories/1/commits/sha/comments", UriKind.Relative)),
Arg.Is<IDictionary<string, string>>(d => d.Count == 2), null);
Arg.Is<IDictionary<string, string>>(d => d.Count == 2), Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"));
}

[Fact]
Expand Down