Fixup unit tests wth preview accepts header

Also applied preview header to a couple of repositoryId based calls that were added by another PR
TattsGroup · Jul 7, 2016 · 1185da2 · 1185da2
1 parent 43411b8
commit 1185da2
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 22 deletions.
diff --git a/Octokit.Tests/Clients/IssueCommentsClientTests.cs b/Octokit.Tests/Clients/IssueCommentsClientTests.cs
@@ -22,8 +22,8 @@ public async Task RequestsCorrectUrl()
 
                 connection.Received().Get<IssueComment>(
                     Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/issues/comments/42"), 
-                    Arg.Any<Dictionary<string, string>>(), 
-                    Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"));
+                    Arg.Any<Dictionary<string, string>>(),
+                    "application/vnd.github.squirrel-girl-preview");
             }
 
             [Fact]
@@ -34,7 +34,9 @@ public async Task RequestsCorrectUrlWithRepositoryId()
 
                 await client.Get(1, 42);
 
-                connection.Received().Get<IssueComment>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/issues/comments/42"));
+                connection.Received().Get<IssueComment>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/issues/comments/42"),
+                    Arg.Any<Dictionary<string, string>>(),
+                    "application/vnd.github.squirrel-girl-preview");
             }
 
             [Fact]
@@ -63,7 +65,7 @@ public async Task RequestsCorrectUrl()
                 connection.Received().GetAll<IssueComment>(
                     Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/issues/comments"),
                     Arg.Any<Dictionary<string, string>>(),
-                    Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"),
+                    "application/vnd.github.squirrel-girl-preview",
                     Args.ApiOptions);
             }
 
@@ -75,7 +77,10 @@ public async Task RequestsCorrectUrlWithRepositoryId()
 
                 await client.GetAllForRepository(1);
 
-                connection.Received().GetAll<IssueComment>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/issues/comments"), Args.ApiOptions);
+                connection.Received().GetAll<IssueComment>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/issues/comments"),
+                    Arg.Any<Dictionary<string, string>>(),
+                    "application/vnd.github.squirrel-girl-preview",
+                    Args.ApiOptions);
             }
 
             [Fact]
@@ -96,7 +101,7 @@ public async Task RequestsCorrectUrlWithApiOptions()
                 connection.Received().GetAll<IssueComment>(
                     Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/issues/comments"),
                     Arg.Any<Dictionary<string, string>>(),
-                    Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"),
+                    "application/vnd.github.squirrel-girl-preview",
                     options);
             }
 
@@ -115,7 +120,10 @@ public async Task RequestsCorrectUrlWithRepositoryIdWithApiOptions()
 
                 await client.GetAllForRepository(1, options);
 
-                connection.Received().GetAll<IssueComment>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/issues/comments"), options);
+                connection.Received().GetAll<IssueComment>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/issues/comments"),
+                    Arg.Any<Dictionary<string, string>>(),
+                    "application/vnd.github.squirrel-girl-preview",
+                    options);
             }
 
             [Fact]
@@ -152,7 +160,7 @@ public async Task RequestsCorrectUrl()
                 connection.Received().GetAll<IssueComment>(
                     Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/issues/3/comments"),
                     Arg.Any<Dictionary<string, string>>(),
-                    Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"),
+                    "application/vnd.github.squirrel-girl-preview",
                     Args.ApiOptions);
             }
 
@@ -164,7 +172,10 @@ public async Task RequestsCorrectUrlWithRepositoryId()
 
                 await client.GetAllForIssue(1, 3);
 
-                connection.Received().GetAll<IssueComment>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/issues/3/comments"), Args.ApiOptions);
+                connection.Received().GetAll<IssueComment>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/issues/3/comments"),
+                    Arg.Any<Dictionary<string, string>>(),
+                    "application/vnd.github.squirrel-girl-preview",
+                    Args.ApiOptions);
             }
 
             [Fact]
@@ -185,7 +196,7 @@ public async Task RequestsCorrectUrlWithApiOptions()
                 connection.Received().GetAll<IssueComment>(
                     Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/issues/3/comments"), 
                     Arg.Any<Dictionary<string, string>>(),
-                    Arg.Is<string>(s => s == "application/vnd.github.squirrel-girl-preview"), 
+                    "application/vnd.github.squirrel-girl-preview",
                     options);
             }
 
@@ -204,7 +215,10 @@ public async Task RequestsCorrectUrlWithRepositoryIdWithApiOptions()
 
                 await client.GetAllForIssue(1, 3, options);
 
-                connection.Received().GetAll<IssueComment>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/issues/3/comments"), options);
+                connection.Received().GetAll<IssueComment>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/issues/3/comments"),
+                    Arg.Any<Dictionary<string, string>>(),
+                    "application/vnd.github.squirrel-girl-preview",
+                    options);
             }
 
             [Fact]

diff --git a/Octokit.Tests/Clients/IssuesClientTests.cs b/Octokit.Tests/Clients/IssuesClientTests.cs
@@ -33,7 +33,9 @@ public async Task RequestsCorrectUrlWithRepositoryId()
 
                 await client.Get(1, 42);
 
-                connection.Received().Get<Issue>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/issues/42"));
+                connection.Received().Get<Issue>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/issues/42"),
+                    Arg.Any<Dictionary<string, string>>(),
+                    "application/vnd.github.squirrel-girl-preview");
             }
 
             [Fact]
@@ -234,6 +236,7 @@ public async Task RequestsCorrectUrl()
 
                 connection.Received().GetAll<Issue>(Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/issues"),
                     Arg.Any<Dictionary<string, string>>(),
+                    "application/vnd.github.squirrel-girl-preview",
                     Args.ApiOptions);
             }
 
@@ -266,7 +269,10 @@ public async Task RequestsCorrectUrlWithApiOptions()
 
                 await client.GetAllForRepository("fake", "repo", options);
 
-                connection.Received().GetAll<Issue>(Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/issues"), Arg.Any<Dictionary<string, string>>(), options);
+                connection.Received().GetAll<Issue>(Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/issues"),
+                    Arg.Any<Dictionary<string, string>>(),
+                    "application/vnd.github.squirrel-girl-preview",
+                    options);
             }
 
             [Fact]
@@ -286,6 +292,7 @@ public async Task RequestsCorrectUrlWithRepositoryIdWithApiOptions()
 
                 connection.Received().GetAll<Issue>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/issues"),
                     Arg.Any<Dictionary<string, string>>(),
+                    "application/vnd.github.squirrel-girl-preview",
                     options);
             }
 
@@ -327,6 +334,7 @@ public async Task SendsAppropriateParametersWithRepositoryId()
                         && d["direction"] == "asc"
                         && d["sort"] == "created"
                         && d["filter"] == "assigned"),
+                    "application/vnd.github.squirrel-girl-preview",
                     Args.ApiOptions);
             }
 
@@ -354,6 +362,7 @@ public async Task SendsAppropriateParametersWithApiOptions()
                         && d["direction"] == "asc"
                         && d["sort"] == "created"
                         && d["filter"] == "assigned"),
+                    "application/vnd.github.squirrel-girl-preview",
                     options);
             }
 
@@ -381,6 +390,7 @@ public async Task SendsAppropriateParametersWithRepositoryIdWithApiOptions()
                         && d["direction"] == "asc"
                         && d["sort"] == "created"
                         && d["filter"] == "assigned"),
+                    "application/vnd.github.squirrel-girl-preview",
                     options);
             }
         }

diff --git a/Octokit.Tests/Reactive/ObservableIssuesClientTests.cs b/Octokit.Tests/Reactive/ObservableIssuesClientTests.cs
@@ -94,7 +94,8 @@ public void RequestsCorrectUrl()
             client.GetAllForRepository("fake", "repo");
 
             gitHubClient.Connection.Received().Get<List<Issue>>(Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/issues"),
-                Arg.Any<IDictionary<string, string>>(), null);
+                Arg.Any<IDictionary<string, string>>(),
+                "application/vnd.github.squirrel-girl-preview");
         }
 
         [Fact]
@@ -131,7 +132,8 @@ public void RequestsCorrectUrlWithApiOptions()
                 && d["sort"] == "created"
                 && d["direction"] == "desc"
                 && d["page"] == "1"
-                && d["per_page"] == "1"), null);
+                && d["per_page"] == "1"),
+                "application/vnd.github.squirrel-girl-preview");
         }
 
         [Fact]
@@ -175,7 +177,8 @@ public void SendsAppropriateParameters()
                 && d["filter"] == "assigned"
                 && d["state"] == "open"
                 && d["sort"] == "created"
-                && d["direction"] == "asc"), null);
+                && d["direction"] == "asc"),
+                "application/vnd.github.squirrel-girl-preview");
         }
 
         [Fact]
@@ -223,7 +226,7 @@ public void SendsAppropriateParametersWithApiOptions()
                 && d["direction"] == "asc"
                 && d["page"] == "1"
                 && d["per_page"] == "1"),
-                null);
+                "application/vnd.github.squirrel-girl-preview");
         }
 
         [Fact]

diff --git a/Octokit/Clients/IssueCommentsClient.cs b/Octokit/Clients/IssueCommentsClient.cs
@@ -42,7 +42,7 @@ public Task<IssueComment> Get(string owner, string name, int id)
         /// <param name="id">The issue comment id</param>
         public Task<IssueComment> Get(int repositoryId, int id)
         {
-            return ApiConnection.Get<IssueComment>(ApiUrls.IssueComment(repositoryId, id));
+            return ApiConnection.Get<IssueComment>(ApiUrls.IssueComment(repositoryId, id), null, AcceptHeaders.ReactionsPreview);
         }
 
         /// <summary>
@@ -95,7 +95,7 @@ public Task<IReadOnlyList<IssueComment>> GetAllForRepository(int repositoryId, A
         {
             Ensure.ArgumentNotNull(options, "options");
 
-            return ApiConnection.GetAll<IssueComment>(ApiUrls.IssueComments(repositoryId), options);
+            return ApiConnection.GetAll<IssueComment>(ApiUrls.IssueComments(repositoryId), null, AcceptHeaders.ReactionsPreview, options);
         }
 
         /// <summary>
@@ -152,7 +152,7 @@ public Task<IReadOnlyList<IssueComment>> GetAllForIssue(int repositoryId, int nu
         {
             Ensure.ArgumentNotNull(options, "options");
 
-            return ApiConnection.GetAll<IssueComment>(ApiUrls.IssueComments(repositoryId, number), options);
+            return ApiConnection.GetAll<IssueComment>(ApiUrls.IssueComments(repositoryId, number), null, AcceptHeaders.ReactionsPreview, options);
         }
 
         /// <summary>

diff --git a/Octokit/Clients/IssuesClient.cs b/Octokit/Clients/IssuesClient.cs
@@ -78,7 +78,7 @@ public Task<Issue> Get(string owner, string name, int number)
         /// <param name="number">The issue number</param>
         public Task<Issue> Get(int repositoryId, int number)
         {
-            return ApiConnection.Get<Issue>(ApiUrls.Issue(repositoryId, number));
+            return ApiConnection.Get<Issue>(ApiUrls.Issue(repositoryId, number), null, AcceptHeaders.ReactionsPreview);
         }
 
         /// <summary>
@@ -393,7 +393,7 @@ public Task<IReadOnlyList<Issue>> GetAllForRepository(int repositoryId, Reposito
             Ensure.ArgumentNotNull(request, "request");
             Ensure.ArgumentNotNull(options, "options");
 
-            return ApiConnection.GetAll<Issue>(ApiUrls.Issues(repositoryId), request.ToParametersDictionary(), options);
+            return ApiConnection.GetAll<Issue>(ApiUrls.Issues(repositoryId), request.ToParametersDictionary(), AcceptHeaders.ReactionsPreview, options);
         }
 
         /// <summary>