Skip to content

Commit

Permalink
Merge branch 'master' into pr/140-update-tests-target-framework
Browse files Browse the repository at this point in the history 
# Conflicts:
#	Octokit.GraphQL.IntegrationTests/Queries/IssueTests.cs
  • Loading branch information
@StanleyGoldman
StanleyGoldman committed Aug 3, 2018
2 parents 0ee7158 + 826485c commit 7489861
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 50 deletions.
4 changes: 0 additions & 4 deletions Octokit.GraphQL.Core/Connection.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,21 @@ public class Connection : IConnection
/// </summary>
public static readonly Uri GithubApiUri = new Uri("https://api.github.com/graphql");

/// <inheritdoc />
public Connection(ProductHeaderValue productInformation, string token)
: this(productInformation, GithubApiUri, token)
{
}

/// <inheritdoc />
public Connection(ProductHeaderValue productInformation, Uri uri, string token)
: this(productInformation, uri, new InMemoryCredentialStore(token))
{
}

/// <inheritdoc />
public Connection(ProductHeaderValue productInformation, ICredentialStore credentialStore)
: this(productInformation, GithubApiUri, credentialStore)
{
}

/// <inheritdoc />
public Connection(ProductHeaderValue productInformation, Uri uri, ICredentialStore credentialStore)
{
Uri = uri;
Expand Down
22 changes: 12 additions & 10 deletions Octokit.GraphQL.IntegrationTests/Queries/IssueTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@ 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
{
i.Title,
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);
}
}

[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
Expand All @@ -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);
Expand All @@ -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()
Expand All @@ -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()
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Octokit.GraphQL.IntegrationTests/Queries/PullRequestTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
Expand Down
58 changes: 29 additions & 29 deletions Octokit.GraphQL.IntegrationTests/Queries/RepositoryTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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"))
Expand All @@ -52,31 +52,31 @@ 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
{
r.Name,
r.DatabaseId,
});

var repository = Connection.Run(query).Result;
var repository = await Connection.Run(query);

Assert.NotNull(repository);
Assert.Equal(repository.Name, "octokit.net");
Assert.Equal(repository.DatabaseId, 7528679);
}

[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
{
Direction = OrderDirection.Asc,
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);
Expand All @@ -86,15 +86,15 @@ 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
{
Direction = OrderDirection.Asc,
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);
Expand All @@ -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"))
Expand All @@ -116,27 +116,27 @@ 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<Model.Repository, string>("repositoryName", repo => repo.Name);

var query = new Query()
.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<Model.Repository, string>("repositoryName", repo => repo.Name);

Expand All @@ -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<Model.Repository, string>("repositoryName", repo => repo.Name);

Expand All @@ -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<Model.Repository, TestModelObject>("repositoryName", repo => new TestModelObject
{
Expand All @@ -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<Model.Repository, TestModelObject>("repositoryName", repo => new TestModelObject
{
Expand All @@ -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<Model.Repository, TestModelObject>("repositoryName", repo => new TestModelObject
{
Expand All @@ -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<Model.Repository, TestModelObject>("repositoryName", repo => new TestModelObject
{
Expand All @@ -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<Model.User, TestModelObject>("repositoryName", repo => new TestModelObject
{
Expand All @@ -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);
}
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down
Loading

0 comments on commit 7489861

Please sign in to comment.