Fixed broken conventions. Wrote a integrationstests that performs an actual merge between two branches.

This commit is contained in:
Lars Tabro Sørensen
2015-01-31 23:15:26 +01:00
parent 150e38a264
commit 7a6b988f8a
16 changed files with 176 additions and 41 deletions

View File

@@ -0,0 +1,31 @@
using System;
using System.Reactive.Threading.Tasks;
namespace Octokit.Reactive
{
public class ObservableMergingClient : IObservableMergingClient
{
readonly IMergingClient _client;
public ObservableMergingClient(IGitHubClient client)
{
Ensure.ArgumentNotNull(client, "client");
_client = client.Repository.Merging;
}
/// <summary>
/// Create a merge for a given repository
/// </summary>
/// <remarks>
/// http://developer.github.com/v3/repos/merging/#perform-a-merge
/// </remarks>
/// <param name="owner">The owner of the repository</param>
/// <param name="name">The name of the repository</param>
/// <param name="merge">The merge to create</param>
/// <returns></returns>
public IObservable<Merge> Create(string owner, string name, NewMerge merge)
{
return _client.Create(owner, name, merge).ToObservable();
}
}
}