zoriya/octokit.net
1
0
Fork 0
mirror of https://github.com/zoriya/octokit.net.git synced 2026-06-04 11:24:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch GitDatabase->Git on IGitHubProvider

Browse Source
This commit is contained in:
Robert Pethick
2015-12-24 17:01:37 +00:00
parent 078c710f8e
commit ffc0b35608
25 changed files with 114 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Octokit.Tests.Integration/Clients/MergingClientTests.cs
+6 -6
View File
@@ -40,21 +40,21 @@ public class MergingClientTests : IDisposable
async Task CreateTheWorld()
{
var master = await _github.GitDatabase.Reference.Get(Helper.UserName, _context.RepositoryName, "heads/master");
var master = await _github.Git.Reference.Get(Helper.UserName, _context.RepositoryName, "heads/master");
// create new commit for master branch
var newMasterTree = await CreateTree(new Dictionary<string, string> { { "README.md", "Hello World! I want to be overwritten by featurebranch!" } });
var newMaster = await CreateCommit("baseline for merge", newMasterTree.Sha, master.Object.Sha);
// update master
await _github.GitDatabase.Reference.Update(Helper.UserName, _context.RepositoryName, "heads/master", new ReferenceUpdate(newMaster.Sha));
await _github.Git.Reference.Update(Helper.UserName, _context.RepositoryName, "heads/master", new ReferenceUpdate(newMaster.Sha));
// create new commit for feature branch
var featureBranchTree = await CreateTree(new Dictionary<string, string> { { "README.md", "I am overwriting this blob with something new" } });
var featureBranchCommit = await CreateCommit("this is the commit to merge", featureBranchTree.Sha, newMaster.Sha);
// create branch
await _github.GitDatabase.Reference.Create(Helper.UserName, _context.RepositoryName, new NewReference("refs/heads/my-branch", featureBranchCommit.Sha));
await _github.Git.Reference.Create(Helper.UserName, _context.RepositoryName, new NewReference("refs/heads/my-branch", featureBranchCommit.Sha));
}
async Task<TreeResponse> CreateTree(IEnumerable<KeyValuePair<string, string>> treeContents)
@@ -68,7 +68,7 @@ public class MergingClientTests : IDisposable
Content = c.Value,
Encoding = EncodingType.Utf8
};
var baselineBlobResult = await _github.GitDatabase.Blob.Create(Helper.UserName, _context.RepositoryName, baselineBlob);
var baselineBlobResult = await _github.Git.Blob.Create(Helper.UserName, _context.RepositoryName, baselineBlob);
collection.Add(new NewTreeItem
{
@@ -85,13 +85,13 @@ public class MergingClientTests : IDisposable
newTree.Tree.Add(item);
}
return await _github.GitDatabase.Tree.Create(Helper.UserName, _context.RepositoryName, newTree);
return await _github.Git.Tree.Create(Helper.UserName, _context.RepositoryName, newTree);
}
async Task<Commit> CreateCommit(string message, string sha, string parent)
{
var newCommit = new NewCommit(message, sha, parent);
return await _github.GitDatabase.Commit.Create(Helper.UserName, _context.RepositoryName, newCommit);
return await _github.Git.Commit.Create(Helper.UserName, _context.RepositoryName, newCommit);
}
public void Dispose()