From f74a946d1789ea69f9ef6e04db5116c0f565157b Mon Sep 17 00:00:00 2001 From: Devesh Khandelwal Date: Thu, 7 Apr 2016 11:09:19 +0530 Subject: [PATCH] Reflect changes made to clients in tests. --- .../Clients/MigrationsClientTests.cs | 2 +- Octokit.Tests/Clients/MigrationsClientTests.cs | 18 +++++++++++++----- Octokit.Tests/Models/MigrationTests.cs | 11 +++++++---- .../ObservableMigrationsClientTests.cs | 3 ++- .../Models/Request/StartMigrationRequest.cs | 12 ++++++------ 5 files changed, 29 insertions(+), 17 deletions(-) diff --git a/Octokit.Tests.Integration/Clients/MigrationsClientTests.cs b/Octokit.Tests.Integration/Clients/MigrationsClientTests.cs index 247d4f72..e75a8dcd 100644 --- a/Octokit.Tests.Integration/Clients/MigrationsClientTests.cs +++ b/Octokit.Tests.Integration/Clients/MigrationsClientTests.cs @@ -138,7 +138,7 @@ public class MigrationsClientTests var organization = Environment.GetEnvironmentVariable("OCTOKIT_GITHUBORGANIZATION"); var repos = (await _gitHub.Repository.GetAllForOrg(organization)); var repoNames = repos.Select(repo => repo.FullName).ToList(); - var migrationRequest = new StartMigrationRequest(repoNames, true); + var migrationRequest = new StartMigrationRequest(repoNames, true, false); var migration = await _gitHub.Migration.Migrations.Start(organization, migrationRequest); await _gitHub.Migration.Migrations.UnlockRepository(organization, migration.Id, migration.Repositories[0].FullName); diff --git a/Octokit.Tests/Clients/MigrationsClientTests.cs b/Octokit.Tests/Clients/MigrationsClientTests.cs index 07caafe0..fa6b996c 100644 --- a/Octokit.Tests/Clients/MigrationsClientTests.cs +++ b/Octokit.Tests/Clients/MigrationsClientTests.cs @@ -19,7 +19,9 @@ namespace Octokit.Tests.Clients client.Get("fake", 69); connection.Received().Get( - Arg.Is(u => u.ToString() == "orgs/fake/migrations/69")); + Arg.Is(u => u.ToString() == "orgs/fake/migrations/69"), + null, + AcceptHeaders.MigrationsApiPreview); } [Fact] @@ -44,7 +46,9 @@ namespace Octokit.Tests.Clients client.GetAll("fake"); connection.Received().Get>( - Arg.Is(u => u.ToString() == "orgs/fake/migrations")); + Arg.Is(u => u.ToString() == "orgs/fake/migrations"), + null, + AcceptHeaders.MigrationsApiPreview); } [Fact] @@ -71,7 +75,8 @@ namespace Octokit.Tests.Clients connection.Received().Post( Arg.Is(u => u.ToString() == "orgs/fake/migrations"), - migrationRequest); + Arg.Any(), + AcceptHeaders.MigrationsApiPreview); } [Fact] @@ -103,7 +108,8 @@ namespace Octokit.Tests.Clients Arg.Is(m => m.Repositories.Equals(migrationRequest.Repositories) && m.LockRepositories == migrationRequest.LockRepositories && - m.ExcludeAttachments == migrationRequest.ExcludeAttachments)); + m.ExcludeAttachments == migrationRequest.ExcludeAttachments), + AcceptHeaders.MigrationsApiPreview); } } @@ -118,7 +124,9 @@ namespace Octokit.Tests.Clients client.GetArchive("fake", 69); connection.Received().Get( - Arg.Is(u => u.ToString() == "orgs/fake/migrations/69/archive")); + Arg.Is(u => u.ToString() == "orgs/fake/migrations/69/archive"), + null, + AcceptHeaders.MigrationsApiPreview); } [Fact] diff --git a/Octokit.Tests/Models/MigrationTests.cs b/Octokit.Tests/Models/MigrationTests.cs index 0b3c52b0..34255dd3 100644 --- a/Octokit.Tests/Models/MigrationTests.cs +++ b/Octokit.Tests/Models/MigrationTests.cs @@ -148,10 +148,13 @@ namespace Octokit.Tests.Models ""lock_repositories"": true }"; - private static readonly StartMigrationRequest migrationRequest = new StartMigrationRequest(new List - { - "octocat/Hello-World" - }, true); + private static readonly StartMigrationRequest migrationRequest = new StartMigrationRequest( + new List + { + "octocat/Hello-World" + }, + true, + false); [Fact] public void CanBeDeserialized() diff --git a/Octokit.Tests/Reactive/ObservableMigrationsClientTests.cs b/Octokit.Tests/Reactive/ObservableMigrationsClientTests.cs index e9ea2965..513da13c 100644 --- a/Octokit.Tests/Reactive/ObservableMigrationsClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableMigrationsClientTests.cs @@ -16,7 +16,8 @@ namespace Octokit.Tests.Reactive var client = new ObservableMigrationsClient(github); var migrationRequest = new StartMigrationRequest( new List { "fake/repo" }, - true); + true, + false); client.Start("fake", migrationRequest); github.Migration.Migrations.Received(1).Start( diff --git a/Octokit/Models/Request/StartMigrationRequest.cs b/Octokit/Models/Request/StartMigrationRequest.cs index 80d0bf4b..7832884b 100644 --- a/Octokit/Models/Request/StartMigrationRequest.cs +++ b/Octokit/Models/Request/StartMigrationRequest.cs @@ -26,12 +26,12 @@ namespace Octokit this(repositories, false, false) { } - public StartMigrationRequest( - IReadOnlyList repositories, - bool lockRepositories) : - this(repositories, lockRepositories, false) - { } - + /// + /// Instantiate a new Migration Request object. + /// + /// List of repositories in {owner}/{repo} format. + /// To lock the repos or not. + /// To exclude the attachments or not. public StartMigrationRequest( IReadOnlyList repositories, bool lockRepositories,