diff --git a/Octokit.GraphQL.Core/Connection.cs b/Octokit.GraphQL.Core/Connection.cs
index f6689636..4d98b862 100644
--- a/Octokit.GraphQL.Core/Connection.cs
+++ b/Octokit.GraphQL.Core/Connection.cs
@@ -14,25 +14,21 @@ public class Connection : IConnection
///
public static readonly Uri GithubApiUri = new Uri("https://api.github.com/graphql");
- ///
public Connection(ProductHeaderValue productInformation, string token)
: this(productInformation, GithubApiUri, token)
{
}
- ///
public Connection(ProductHeaderValue productInformation, Uri uri, string token)
: this(productInformation, uri, new InMemoryCredentialStore(token))
{
}
- ///
public Connection(ProductHeaderValue productInformation, ICredentialStore credentialStore)
: this(productInformation, GithubApiUri, credentialStore)
{
}
- ///
public Connection(ProductHeaderValue productInformation, Uri uri, ICredentialStore credentialStore)
{
Uri = uri;
diff --git a/Octokit.GraphQL.IntegrationTests/Queries/IssueTests.cs b/Octokit.GraphQL.IntegrationTests/Queries/IssueTests.cs
index 787179e8..fc1a4cba 100644
--- a/Octokit.GraphQL.IntegrationTests/Queries/IssueTests.cs
+++ b/Octokit.GraphQL.IntegrationTests/Queries/IssueTests.cs
@@ -11,7 +11,7 @@ namespace Octokit.GraphQL.IntegrationTests.Queries
public class IssueTests : IntegrationTestBase
{
[IntegrationTest]
- public void Should_Query_Issues_By_Repository()
+ public async Task Should_Query_Issues_By_Repository()
{
var query = new GraphQL.Query().Repository("octokit", "octokit.net").Issues(first: 3).Nodes.Select(i => new
{
@@ -19,7 +19,7 @@ public void Should_Query_Issues_By_Repository()
RepositoryName = i.Repository.Name,
});
- var results = Connection.Run(query).Result;
+ var results = await Connection.Run(query);
foreach (var result in results)
{
Assert.Equal("octokit.net", result.RepositoryName);
@@ -27,7 +27,7 @@ public void Should_Query_Issues_By_Repository()
}
[IntegrationTest]
- public void Should_Query_Issues_By_State_And_Repository()
+ public async Task Should_Query_Issues_By_State_And_Repository()
{
var openState = new[] { IssueState.Closed };
var query = new GraphQL.Query().Repository("octokit", "octokit.net").Issues(first: 3, states: openState).Nodes.Select(i => new
@@ -37,7 +37,7 @@ public void Should_Query_Issues_By_State_And_Repository()
RepositoryName = i.Repository.Name,
});
- var results = Connection.Run(query).Result.ToArray();
+ var results = (await Connection.Run(query)).ToArray();
foreach (var result in results)
{
Assert.Equal("octokit.net", result.RepositoryName);
@@ -46,7 +46,7 @@ public void Should_Query_Issues_By_State_And_Repository()
}
[IntegrationTest]
- public void Should_Query_Issues_With_Variable()
+ public async Task Should_Query_Issues_With_Variable()
{
var openState = new[] { IssueState.Closed };
var query = new Query()
@@ -66,12 +66,12 @@ public void Should_Query_Issues_With_Variable()
};
var compiled = query.Compile();
- var results = Connection.Run(compiled, vars).Result.ToArray();
+ var results = (await Connection.Run(query)).ToArray();
Assert.Equal(3, results.Length);
}
[IntegrationTest]
- public void Should_Query_Issue_Page_With_Author_Model()
+ public async Task Should_Query_Issue_Page_With_Author_Model()
{
var openState = new[] { IssueState.Closed };
var query = new Query()
@@ -101,7 +101,7 @@ public void Should_Query_Issue_Page_With_Author_Model()
{ "after", null }
};
- var results = Connection.Run(query, vars).Result;
+ var results = await Connection.Run(query, vars);
Assert.Equal(100, results.Items.Count);
}
@@ -191,7 +191,7 @@ public async Task Can_AutoPage_Issues_Comments()
}
[IntegrationTest(Skip = "Querying unions like this no longer works")]
- public void Should_Query_Union_Issue_Or_PullRequest2()
+ public async Task Should_Query_Union_Issue_Or_PullRequest2()
{
var query = new Query().Repository("octokit", "octokit.net").Issue(23)
.Timeline(first: 30).Nodes
@@ -213,7 +213,9 @@ public void Should_Query_Union_Issue_Or_PullRequest2()
UnsubscribedEventId = issueTimelineItem.UnsubscribedEvent.Id,
});
- Assert.NotEqual(default(ID), Connection.Run(query).Result.Last().ClosedEventId);
+ var result = (await Connection.Run(query)).Last();
+
+ Assert.NotEqual(default(ID), result.ClosedEventId);
}
class ActorModel
diff --git a/Octokit.GraphQL.IntegrationTests/Queries/PullRequestTests.cs b/Octokit.GraphQL.IntegrationTests/Queries/PullRequestTests.cs
index 89301a29..969664ea 100644
--- a/Octokit.GraphQL.IntegrationTests/Queries/PullRequestTests.cs
+++ b/Octokit.GraphQL.IntegrationTests/Queries/PullRequestTests.cs
@@ -10,7 +10,7 @@ namespace Octokit.GraphQL.IntegrationTests.Queries
public class PullRequestTests : IntegrationTestBase
{
[IntegrationTest]
- public void Should_Query_Commits()
+ public async Task Should_Query_Commits()
{
var query = new GraphQL.Query().Repository("octokit", "octokit.net").PullRequest(1).Commits(3).Nodes
.Select(pullRequestCommit => new
@@ -20,7 +20,7 @@ public void Should_Query_Commits()
pullRequestCommit.Commit.Author.Name
});
- var results = Enumerable.ToArray(Connection.Run(query).Result);
+ var results = (await Connection.Run(query)).ToArray();
Assert.Single(results);
Assert.Equal("MDY6Q29tbWl0NzUyODY3OTpkYWZhYjhhZjA0ODM5NDU1ODM4Y2QzZmRlMTFkMTM5MTc0MTYyZmFh", results[0].Id.Value);
diff --git a/Octokit.GraphQL.IntegrationTests/Queries/RepositoryTests.cs b/Octokit.GraphQL.IntegrationTests/Queries/RepositoryTests.cs
index c8402c20..a22c8934 100644
--- a/Octokit.GraphQL.IntegrationTests/Queries/RepositoryTests.cs
+++ b/Octokit.GraphQL.IntegrationTests/Queries/RepositoryTests.cs
@@ -12,11 +12,11 @@ namespace Octokit.GraphQL.IntegrationTests.Queries
public class RepositoryTests : IntegrationTestBase
{
[IntegrationTest]
- public void Should_Query_All_RepositoryOwner_Repositories()
+ public async Task Should_Query_All_RepositoryOwner_Repositories()
{
var query = new Query().RepositoryOwner("octokit").Repositories(first: 30).Nodes.Select(repository => repository.Name);
- var repositoryNames = Connection.Run(query).Result.ToArray();
+ var repositoryNames = (await Connection.Run(query)).ToArray();
Assert.Contains("discussions", repositoryNames);
Assert.Contains("octokit.net", repositoryNames);
@@ -26,7 +26,7 @@ public void Should_Query_All_RepositoryOwner_Repositories()
}
[IntegrationTest]
- public void Should_Run_Readme_Query()
+ public async Task Should_Run_Readme_Query()
{
var query = new Query()
.RepositoryOwner(Var("owner"))
@@ -52,7 +52,7 @@ public void Should_Run_Readme_Query()
}
[IntegrationTest]
- public void Should_Query_Repository_ByName()
+ public async Task Should_Query_Repository_ByName()
{
var query = new Query().Repository("octokit", "octokit.net").Select(r => new
{
@@ -60,7 +60,7 @@ public void Should_Query_Repository_ByName()
r.DatabaseId,
});
- var repository = Connection.Run(query).Result;
+ var repository = await Connection.Run(query);
Assert.NotNull(repository);
Assert.Equal(repository.Name, "octokit.net");
@@ -68,7 +68,7 @@ public void Should_Query_Repository_ByName()
}
[IntegrationTest]
- public void Should_QueryRepositoryOwner_Repositories_OrderBy_Name_Ascending()
+ public async Task Should_QueryRepositoryOwner_Repositories_OrderBy_Name_Ascending()
{
var query = new Query().RepositoryOwner("octokit").Repositories(first: 30, orderBy: new RepositoryOrder
{
@@ -76,7 +76,7 @@ public void Should_QueryRepositoryOwner_Repositories_OrderBy_Name_Ascending()
Field = RepositoryOrderField.Name
}).Nodes.Select(repository => repository.Name);
- var repositoryNames = Connection.Run(query).Result.ToArray();
+ var repositoryNames = (await Connection.Run(query)).ToArray();
Assert.Contains("discussions", repositoryNames);
Assert.Contains("go-octokit", repositoryNames);
@@ -86,7 +86,7 @@ public void Should_QueryRepositoryOwner_Repositories_OrderBy_Name_Ascending()
}
[IntegrationTest]
- public void Should_QueryRepositoryOwner_Repositories_OrderBy_CreatedAt_Descending()
+ public async Task Should_QueryRepositoryOwner_Repositories_OrderBy_CreatedAt_Descending()
{
var query = new Query().RepositoryOwner("octokit").Repositories(first: 30, orderBy: new RepositoryOrder
{
@@ -94,7 +94,7 @@ public void Should_QueryRepositoryOwner_Repositories_OrderBy_CreatedAt_Descendin
Field = RepositoryOrderField.CreatedAt
}).Nodes.Select(repository => repository.Name);
- var repositoryNames = Connection.Run(query).Result.ToArray();
+ var repositoryNames = (await Connection.Run(query)).ToArray();
Assert.Contains("octokit.rb", repositoryNames);
Assert.Contains("octokit.net", repositoryNames);
@@ -104,7 +104,7 @@ public void Should_QueryRepositoryOwner_Repositories_OrderBy_CreatedAt_Descendin
}
[IntegrationTest]
- public void Should_Query_Repository_With_Variables()
+ public async Task Should_Query_Repository_With_Variables()
{
var query = new Query()
.Repository(Var("owner"), Var("name"))
@@ -116,13 +116,13 @@ public void Should_Query_Repository_With_Variables()
{ "name", "octokit.net" },
};
- var repositoryName = Connection.Run(query, vars).Result;
+ var repositoryName = await Connection.Run(query, vars);
Assert.Equal("octokit.net", repositoryName);
}
[IntegrationTest]
- public void Query_Repository_Select_Simple_Fragment()
+ public async Task Query_Repository_Select_Simple_Fragment()
{
var fragment = new Fragment("repositoryName", repo => repo.Name);
@@ -130,13 +130,13 @@ public void Query_Repository_Select_Simple_Fragment()
.Repository("octokit", "octokit.net")
.Select(fragment);
- var repositoryName = Connection.Run(query).Result;
+ var repositoryName = await Connection.Run(query);
Assert.Equal("octokit.net", repositoryName);
}
[IntegrationTest]
- public void Query_Repository_Select_Inner_Simple_Fragment()
+ public async Task Query_Repository_Select_Inner_Simple_Fragment()
{
var fragment = new Fragment("repositoryName", repo => repo.Name);
@@ -147,13 +147,13 @@ public void Query_Repository_Select_Inner_Simple_Fragment()
});
- var repository = Connection.Run(query).Result;
+ var repository = await Connection.Run(query);
Assert.Equal("octokit.net", repository.Name);
}
[IntegrationTest]
- public void Query_Organization_Repositories_Select_Simple_Fragment()
+ public async Task Query_Organization_Repositories_Select_Simple_Fragment()
{
var fragment = new Fragment("repositoryName", repo => repo.Name);
@@ -163,13 +163,13 @@ public void Query_Organization_Repositories_Select_Simple_Fragment()
.Nodes
.Select(fragment);
- var repositoryName = Connection.Run(query).Result.OrderByDescending(s => s).First();
+ var repositoryName = (await Connection.Run(query)).OrderByDescending(s => s).First();
Assert.Equal("webhooks.js", repositoryName);
}
[IntegrationTest]
- public void Query_Repository_Select_Object_Fragment()
+ public async Task Query_Repository_Select_Object_Fragment()
{
var fragment = new Fragment("repositoryName", repo => new TestModelObject
{
@@ -182,13 +182,13 @@ public void Query_Repository_Select_Object_Fragment()
.Repository("octokit", "octokit.net")
.Select(fragment);
- var testModelObject = Connection.Run(query).Result;
+ var testModelObject = await Connection.Run(query);
Assert.Equal("octokit.net", testModelObject.StringField1);
}
[IntegrationTest]
- public void Query_Repository_Select_Object_Fragment_Twice()
+ public async Task Query_Repository_Select_Object_Fragment_Twice()
{
var fragment = new Fragment("repositoryName", repo => new TestModelObject
{
@@ -204,14 +204,14 @@ public void Query_Repository_Select_Object_Fragment_Twice()
repo2 = q.Repository("octokit", "octokit.graphql.net").Select(fragment).Single(),
});
- var result = Connection.Run(query).Result;
+ var result = await Connection.Run(query);
Assert.Equal("octokit.net", result.repo1.StringField1);
Assert.Equal("octokit.graphql.net", result.repo2.StringField1);
}
[IntegrationTest]
- public void Query_Repository_Select_Inner_Object_Fragment()
+ public async Task Query_Repository_Select_Inner_Object_Fragment()
{
var fragment = new Fragment("repositoryName", repo => new TestModelObject
{
@@ -227,13 +227,13 @@ public void Query_Repository_Select_Inner_Object_Fragment()
});
- var result = Connection.Run(query).Result;
+ var result = await Connection.Run(query);
Assert.Equal("octokit.net", result.TestModel.StringField1);
}
[IntegrationTest]
- public void Query_Organization_Repositories_Select_Object_Fragment()
+ public async Task Query_Organization_Repositories_Select_Object_Fragment()
{
var fragment = new Fragment("repositoryName", repo => new TestModelObject
{
@@ -248,13 +248,13 @@ public void Query_Organization_Repositories_Select_Object_Fragment()
.Nodes
.Select(fragment);
- var testModelObject = Connection.Run(query).Result.OrderByDescending(s => s.StringField1).First();
+ var testModelObject = (await Connection.Run(query)).OrderByDescending(s => s.StringField1).First();
Assert.Equal("webhooks.js", testModelObject.StringField1);
}
[IntegrationTest]
- public void Query_Organization_Repositories_Select_Multiple_Object_Fragments()
+ public async Task Query_Organization_Repositories_Select_Multiple_Object_Fragments()
{
var fragment = new Fragment("repositoryName", repo => new TestModelObject
{
@@ -273,7 +273,7 @@ public void Query_Organization_Repositories_Select_Multiple_Object_Fragments()
.Select(fragment).ToList().OrderBy(o => o.StringField1).First()
});
- var testModelObject = Connection.Run(query).Result;
+ var testModelObject = await Connection.Run(query);
Assert.Equal("alanjrogers", testModelObject.Member.StringField1);
Assert.Equal("bkeepers", testModelObject.MentionableUser.StringField1);
}
@@ -302,7 +302,7 @@ public async Task Should_Query_Repository_Issues_PullRequests_With_Variables_Aut
}
[IntegrationTest(Skip = "Querying unions like this no longer works")]
- public void Should_Query_Union_Issue_Or_PullRequest()
+ public async Task Should_Query_Union_Issue_Or_PullRequest()
{
var query = new Query().Repository("octokit", "octokit.net")
.IssueOrPullRequest(1)
@@ -312,7 +312,7 @@ public void Should_Query_Union_Issue_Or_PullRequest()
PullRequestId = issueOrPullRequest.PullRequest.Id
});
- var result = Connection.Run(query).Result;
+ var result = await Connection.Run(query);
}
class TestModelObject
diff --git a/Octokit.GraphQL.IntegrationTests/Queries/ViewerTests.cs b/Octokit.GraphQL.IntegrationTests/Queries/ViewerTests.cs
index 8391105c..259f0525 100644
--- a/Octokit.GraphQL.IntegrationTests/Queries/ViewerTests.cs
+++ b/Octokit.GraphQL.IntegrationTests/Queries/ViewerTests.cs
@@ -1,4 +1,5 @@
using System.Linq;
+using System.Threading.Tasks;
using Octokit.GraphQL.Core;
using Octokit.GraphQL.IntegrationTests.Utilities;
using Xunit;
@@ -8,7 +9,7 @@ namespace Octokit.GraphQL.IntegrationTests.Queries
public class ViewerTests: IntegrationTestBase
{
[IntegrationTest]
- public void Viewer_By_OAuthToken_Matches_Username()
+ public async Task Viewer_By_OAuthToken_Matches_Username()
{
var query = new GraphQL.Query().Viewer.Select(user => new
{
@@ -17,7 +18,7 @@ public void Viewer_By_OAuthToken_Matches_Username()
user.IsViewer
});
- var graphqlUser = Connection.Run(query).Result;
+ var graphqlUser = await Connection.Run(query);
Assert.NotNull(graphqlUser);
Assert.True(graphqlUser.IsViewer);
@@ -26,11 +27,11 @@ public void Viewer_By_OAuthToken_Matches_Username()
}
[IntegrationTest]
- public void Viewer_By_GraphyQL_Matches_Api()
+ public async Task Viewer_By_GraphyQL_Matches_Api()
{
var gitHubClient = GetV3GitHubClient();
- var apiUser = gitHubClient.User.Current().Result;
+ var apiUser = await gitHubClient.User.Current();
var query = new GraphQL.Query().Viewer.Select(user => new
{
@@ -47,7 +48,7 @@ public void Viewer_By_GraphyQL_Matches_Api()
user.Location,
});
- var graphqlUser = Connection.Run(query).Result;
+ var graphqlUser = await Connection.Run(query);
Assert.NotNull(graphqlUser);