use a different property to get the current username, instead of Credentials

This commit is contained in:
Brendan Forster
2013-11-28 14:23:34 -08:00
parent 73f301e8e7
commit 1a60206f35
4 changed files with 24 additions and 15 deletions
@@ -41,7 +41,7 @@ public class AssigneesClientTests
{
// Repository owner is always an assignee
var assignees = await _gitHubClient.Issue.Assignee.GetForRepository(_owner, _repository.Name);
Assert.True(assignees.Any(u => u.Login == Helper.Credentials.Login));
Assert.True(assignees.Any(u => u.Login == Helper.UserName));
}
public void Dispose()
@@ -21,11 +21,11 @@ namespace Octokit.Tests.Integration
try
{
var cloneUrl = string.Format("https://github.com/{0}/{1}.git", github.Credentials.Login, repoName);
var cloneUrl = string.Format("https://github.com/{0}/{1}.git", Helper.UserName, repoName);
Assert.Equal(repoName, createdRepository.Name);
Assert.False(createdRepository.Private);
Assert.Equal(cloneUrl, createdRepository.CloneUrl);
var repository = await github.Repository.Get(github.Credentials.Login, repoName);
var repository = await github.Repository.Get(Helper.UserName, repoName);
Assert.Equal(repoName, repository.Name);
Assert.Null(repository.Description);
Assert.False(repository.Private);
@@ -58,7 +58,7 @@ namespace Octokit.Tests.Integration
try
{
Assert.True(createdRepository.Private);
var repository = await github.Repository.Get(github.Credentials.Login, repoName);
var repository = await github.Repository.Get(Helper.UserName, repoName);
Assert.True(repository.Private);
}
finally
@@ -85,7 +85,7 @@ namespace Octokit.Tests.Integration
try
{
Assert.False(createdRepository.HasDownloads);
var repository = await github.Repository.Get(github.Credentials.Login, repoName);
var repository = await github.Repository.Get(Helper.UserName, repoName);
Assert.False(repository.HasDownloads);
}
finally
@@ -112,7 +112,7 @@ namespace Octokit.Tests.Integration
try
{
Assert.False(createdRepository.HasIssues);
var repository = await github.Repository.Get(github.Credentials.Login, repoName);
var repository = await github.Repository.Get(Helper.UserName, repoName);
Assert.False(repository.HasIssues);
}
finally
@@ -139,7 +139,7 @@ namespace Octokit.Tests.Integration
try
{
Assert.False(createdRepository.HasWiki);
var repository = await github.Repository.Get(github.Credentials.Login, repoName);
var repository = await github.Repository.Get(Helper.UserName, repoName);
Assert.False(repository.HasWiki);
}
finally
@@ -166,7 +166,7 @@ namespace Octokit.Tests.Integration
try
{
Assert.Equal("theDescription", createdRepository.Description);
var repository = await github.Repository.Get(github.Credentials.Login, repoName);
var repository = await github.Repository.Get(Helper.UserName, repoName);
Assert.Equal("theDescription", repository.Description);
}
finally
@@ -193,7 +193,7 @@ namespace Octokit.Tests.Integration
try
{
Assert.Equal("http://aUrl.to/nowhere", createdRepository.Homepage);
var repository = await github.Repository.Get(github.Credentials.Login, repoName);
var repository = await github.Repository.Get(Helper.UserName, repoName);
Assert.Equal("http://aUrl.to/nowhere", repository.Homepage);
}
finally
@@ -221,7 +221,7 @@ namespace Octokit.Tests.Integration
{
// TODO: Once the contents API has been added, check the actual files in the created repo
Assert.Equal(repoName, createdRepository.Name);
var repository = await github.Repository.Get(github.Credentials.Login, repoName);
var repository = await github.Repository.Get(Helper.UserName, repoName);
Assert.Equal(repoName, repository.Name);
}
finally
@@ -250,7 +250,7 @@ namespace Octokit.Tests.Integration
{
// TODO: Once the contents API has been added, check the actual files in the created repo
Assert.Equal(repoName, createdRepository.Name);
var repository = await github.Repository.Get(github.Credentials.Login, repoName);
var repository = await github.Repository.Get(Helper.UserName, repoName);
Assert.Equal(repoName, repository.Name);
}
finally
@@ -270,7 +270,7 @@ namespace Octokit.Tests.Integration
Credentials = Helper.Credentials
};
var repoName = Helper.MakeNameWithTimestamp("public-org-repo");
var orgLogin = github.Credentials.Login + "-org";
var orgLogin = Helper.UserName + "-org";
// TODO: Create the org as part of the test
var createdRepository = await github.Repository.Create(orgLogin, new NewRepository { Name = repoName });
@@ -311,7 +311,7 @@ namespace Octokit.Tests.Integration
var repoName = Helper.MakeNameWithTimestamp("repo-to-delete");
await github.Repository.Create(new NewRepository { Name = repoName });
Assert.DoesNotThrow(async () => { await github.Repository.Delete(github.Credentials.Login, repoName); });
Assert.DoesNotThrow(async () => { await github.Repository.Delete(Helper.UserName, repoName); });
}
}
@@ -60,7 +60,7 @@ namespace Octokit.Tests.Integration
var user = await github.User.Current();
Assert.Equal(Helper.Credentials.Login, user.Login);
Assert.Equal(Helper.UserName, user.Login);
}
}
@@ -86,7 +86,7 @@ namespace Octokit.Tests.Integration
{
var github = new GitHubClient(new ProductHeaderValue("OctokitTests"))
{
Credentials = new Credentials(Helper.Credentials.Login, "bad-password")
Credentials = new Credentials(Helper.UserName, "bad-password")
};
var userUpdate = new UserUpdate
{
+9
View File
@@ -8,6 +8,13 @@ namespace Octokit.Tests.Integration
static readonly Lazy<Credentials> _credentialsThunk = new Lazy<Credentials>(() =>
{
var githubUsername = Environment.GetEnvironmentVariable("OCTOKIT_GITHUBUSERNAME");
UserName = githubUsername;
var githubToken = Environment.GetEnvironmentVariable("OCTOKIT_OAUTHTOKEN");
if (githubToken != null)
return new Credentials(githubToken);
var githubPassword = Environment.GetEnvironmentVariable("OCTOKIT_GITHUBPASSWORD");
if (githubUsername == null || githubPassword == null)
@@ -16,6 +23,8 @@ namespace Octokit.Tests.Integration
return new Credentials(githubUsername, githubPassword);
});
public static string UserName { get; private set; }
public static Credentials Credentials { get { return _credentialsThunk.Value; }}
public static void DeleteRepo(Repository repository)