Skip to content

Commit

Permalink
💄 tidy up test code
Browse files Browse the repository at this point in the history
  • Loading branch information
@shiftkey
shiftkey committed Feb 18, 2014
1 parent 02f80a0 commit 7684613
Showing 1 changed file with 30 additions and 30 deletions.
60 changes: 30 additions & 30 deletions Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
public class PullRequestsClientTests : IDisposable
{
readonly IGitHubClient _client;
readonly IPullRequestsClient _pullRequestsClient;
readonly IPullRequestsClient _fixture;
readonly Repository _repository;

public PullRequestsClientTests()
Expand All @@ -19,7 +19,7 @@ public PullRequestsClientTests()
Credentials = Helper.Credentials
};

_pullRequestsClient = _client.Repository.PullRequest;
_fixture = _client.Repository.PullRequest;

var repoName = Helper.MakeNameWithTimestamp("source-repo");

Expand All @@ -32,7 +32,7 @@ public async Task CanCreate()
await CreateTheWorld();

var newPullRequest = new NewPullRequest("a pull request", "my-branch", "master");
var result = await _pullRequestsClient.Create(Helper.UserName, _repository.Name, newPullRequest);
var result = await _fixture.Create(Helper.UserName, _repository.Name, newPullRequest);

Assert.Equal("a pull request", result.Title);
Assert.False(result.Merged);
Expand All @@ -44,12 +44,12 @@ public async Task CanGetForRepository()
await CreateTheWorld();

var newPullRequest = new NewPullRequest("a pull request", "my-branch", "master");
var pullRequest = await _pullRequestsClient.Create(Helper.UserName, _repository.Name, newPullRequest);
var result = await _fixture.Create(Helper.UserName, _repository.Name, newPullRequest);

var requests = await _pullRequestsClient.GetForRepository(Helper.UserName, _repository.Name);
var pullRequests = await _fixture.GetForRepository(Helper.UserName, _repository.Name);

Assert.Equal(1, requests.Count);
Assert.Equal(pullRequest.Title, requests[0].Title);
Assert.Equal(1, pullRequests.Count);
Assert.Equal(result.Title, pullRequests[0].Title);
}

[IntegrationTest]
Expand All @@ -58,13 +58,13 @@ public async Task CanGetOpenPullRequest()
await CreateTheWorld();

var newPullRequest = new NewPullRequest("a pull request", "my-branch", "master");
var pullRequest = await _pullRequestsClient.Create(Helper.UserName, _repository.Name, newPullRequest);
var result = await _fixture.Create(Helper.UserName, _repository.Name, newPullRequest);

var openPullRequests = new PullRequestRequest { State = ItemState.Open };
var requests = await _pullRequestsClient.GetForRepository(Helper.UserName, _repository.Name, openPullRequests);
var pullRequests = await _fixture.GetForRepository(Helper.UserName, _repository.Name, openPullRequests);

Assert.Equal(1, requests.Count);
Assert.Equal(pullRequest.Title, requests[0].Title);
Assert.Equal(1, pullRequests.Count);
Assert.Equal(result.Title, pullRequests[0].Title);
}

[IntegrationTest]
Expand All @@ -73,12 +73,12 @@ public async Task IgnoresOpenPullRequest()
await CreateTheWorld();

var newPullRequest = new NewPullRequest("a pull request", "my-branch", "master");
await _pullRequestsClient.Create(Helper.UserName, _repository.Name, newPullRequest);
await _fixture.Create(Helper.UserName, _repository.Name, newPullRequest);

var openPullRequests = new PullRequestRequest { State = ItemState.Closed };
var requests = await _pullRequestsClient.GetForRepository(Helper.UserName, _repository.Name, openPullRequests);
var pullRequests = await _fixture.GetForRepository(Helper.UserName, _repository.Name, openPullRequests);

Assert.Empty(requests);
Assert.Empty(pullRequests);
}

[IntegrationTest]
Expand All @@ -87,10 +87,10 @@ public async Task CanUpdate()
await CreateTheWorld();

var newPullRequest = new NewPullRequest("a pull request", "my-branch", "master");
var pullRequest = await _pullRequestsClient.Create(Helper.UserName, _repository.Name, newPullRequest);
var pullRequest = await _fixture.Create(Helper.UserName, _repository.Name, newPullRequest);

var updatePullRequest = new PullRequestUpdate { Title = "updated title", Body = "Hello New Body" };
var result = await _pullRequestsClient.Update(Helper.UserName, _repository.Name, pullRequest.Number, updatePullRequest);
var result = await _fixture.Update(Helper.UserName, _repository.Name, pullRequest.Number, updatePullRequest);

Assert.Equal(updatePullRequest.Title, result.Title);
Assert.Equal(updatePullRequest.Body, result.Body);
Expand All @@ -102,10 +102,10 @@ public async Task CanClose()
await CreateTheWorld();

var newPullRequest = new NewPullRequest("a pull request", "my-branch", "master");
var pullRequest = await _pullRequestsClient.Create(Helper.UserName, _repository.Name, newPullRequest);
var pullRequest = await _fixture.Create(Helper.UserName, _repository.Name, newPullRequest);

var updatePullRequest = new PullRequestUpdate { State = ItemState.Closed };
var result = await _pullRequestsClient.Update(Helper.UserName, _repository.Name, pullRequest.Number, updatePullRequest);
var result = await _fixture.Update(Helper.UserName, _repository.Name, pullRequest.Number, updatePullRequest);

Assert.Equal(ItemState.Closed, result.State);
Assert.Equal(pullRequest.Title, result.Title);
Expand All @@ -118,15 +118,15 @@ public async Task CanFindClosedPullRequest()
await CreateTheWorld();

var newPullRequest = new NewPullRequest("a pull request", "my-branch", "master");
var pullRequest = await _pullRequestsClient.Create(Helper.UserName, _repository.Name, newPullRequest);
var pullRequest = await _fixture.Create(Helper.UserName, _repository.Name, newPullRequest);

var updatePullRequest = new PullRequestUpdate { State = ItemState.Closed };
await _pullRequestsClient.Update(Helper.UserName, _repository.Name, pullRequest.Number, updatePullRequest);
await _fixture.Update(Helper.UserName, _repository.Name, pullRequest.Number, updatePullRequest);

var closedPullRequests = new PullRequestRequest { State = ItemState.Closed };
var requests = await _pullRequestsClient.GetForRepository(Helper.UserName, _repository.Name, closedPullRequests);
var pullRequests = await _fixture.GetForRepository(Helper.UserName, _repository.Name, closedPullRequests);

Assert.Equal(1, requests.Count);
Assert.Equal(1, pullRequests.Count);
}

[IntegrationTest]
Expand All @@ -135,9 +135,9 @@ public async Task IsNotMergedInitially()
await CreateTheWorld();

var newPullRequest = new NewPullRequest("a pull request", "my-branch", "master");
var pullRequest = await _pullRequestsClient.Create(Helper.UserName, _repository.Name, newPullRequest);
var pullRequest = await _fixture.Create(Helper.UserName, _repository.Name, newPullRequest);

var result = await _pullRequestsClient.Merged(Helper.UserName, _repository.Name, pullRequest.Number);
var result = await _fixture.Merged(Helper.UserName, _repository.Name, pullRequest.Number);

Assert.False(result);
}
Expand All @@ -148,10 +148,10 @@ public async Task CanBeMerged()
await CreateTheWorld();

var newPullRequest = new NewPullRequest("a pull request", "my-branch", "master");
var pullRequest = await _pullRequestsClient.Create(Helper.UserName, _repository.Name, newPullRequest);
var pullRequest = await _fixture.Create(Helper.UserName, _repository.Name, newPullRequest);

var merge = new MergePullRequest("thing the thing");
var result = await _pullRequestsClient.Merge(Helper.UserName, _repository.Name, pullRequest.Number, merge);
var result = await _fixture.Merge(Helper.UserName, _repository.Name, pullRequest.Number, merge);

Assert.True(result.Merged);
}
Expand All @@ -162,10 +162,10 @@ public async Task UpdatesMaster()
await CreateTheWorld();

var newPullRequest = new NewPullRequest("a pull request", "my-branch", "master");
var pullRequest = await _pullRequestsClient.Create(Helper.UserName, _repository.Name, newPullRequest);
var pullRequest = await _fixture.Create(Helper.UserName, _repository.Name, newPullRequest);

var merge = new MergePullRequest("thing the thing");
var result = await _pullRequestsClient.Merge(Helper.UserName, _repository.Name, pullRequest.Number, merge);
var result = await _fixture.Merge(Helper.UserName, _repository.Name, pullRequest.Number, merge);

var master = await _client.GitDatabase.Reference.Get(Helper.UserName, _repository.Name, "heads/master");

Expand All @@ -178,9 +178,9 @@ public async Task CanBrowseCommits()
await CreateTheWorld();

var newPullRequest = new NewPullRequest("a pull request", "my-branch", "master");
var pullRequest = await _pullRequestsClient.Create(Helper.UserName, _repository.Name, newPullRequest);
var pullRequest = await _fixture.Create(Helper.UserName, _repository.Name, newPullRequest);

var result = await _pullRequestsClient.Commits(Helper.UserName, _repository.Name, pullRequest.Number);
var result = await _fixture.Commits(Helper.UserName, _repository.Name, pullRequest.Number);

Assert.Equal(1, result.Count);
Assert.Equal("this is the commit to merge into the pull request", result[0].Message);
Expand Down

0 comments on commit 7684613

Please sign in to comment.