Skip to content

Refactor console writer to display provider #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
geofflamrock merged 1 commit into from
Aug 31, 2025
Merged

Refactor console writer to display provider #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions src/Stack.Tests/Commands/Helpers/StackActionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public async Task UpdateStack_UsingMerge_WhenThereAreConflictsMergingBranches_An
var branch2 = Some.BranchName();

var logger = XUnitLogger.CreateLogger<StackActions>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);
var gitClient = Substitute.For<IGitClient>();
var gitHubClient = Substitute.For<IGitHubClient>();
var inputProvider = Substitute.For<IInputProvider>();
Expand Down Expand Up @@ -80,7 +80,7 @@ public async Task UpdateStack_UsingMerge_WhenThereAreConflictsMergingBranches_An
var gitClient = Substitute.For<IGitClient>();
var gitHubClient = Substitute.For<IGitHubClient>();
var logger = XUnitLogger.CreateLogger<StackActions>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);

var stack = new Config.Stack(
"Stack1",
Expand Down Expand Up @@ -134,7 +134,7 @@ public async Task UpdateStack_UsingRebase_WhenThereAreConflictsMergingBranches_A
var branch2 = Some.BranchName();

var logger = XUnitLogger.CreateLogger<StackActions>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);
var gitClient = Substitute.For<IGitClient>();
var gitHubClient = Substitute.For<IGitHubClient>();
var inputProvider = Substitute.For<IInputProvider>();
Expand Down Expand Up @@ -193,7 +193,7 @@ public async Task UpdateStack_UsingRebase_WhenThereAreConflictsMergingBranches_A
var gitClient = Substitute.For<IGitClient>();
var gitHubClient = Substitute.For<IGitHubClient>();
var logger = XUnitLogger.CreateLogger<StackActions>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);

var stack = new Config.Stack(
"Stack1",
Expand Down Expand Up @@ -247,7 +247,7 @@ public async Task UpdateStack_UsingRebase_WhenARemoteBranchIsDeleted_RebasesOnto
var gitClient = Substitute.For<IGitClient>();
var gitHubClient = Substitute.For<IGitHubClient>();
var logger = XUnitLogger.CreateLogger<StackActions>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);

// Setup branch statuses to simulate the scenario
gitClient.GetBranchStatuses(Arg.Any<string[]>()).Returns(new Dictionary<string, GitBranchStatus>
Expand Down Expand Up @@ -294,7 +294,7 @@ public async Task UpdateStack_UsingRebase_WhenARemoteBranchIsDeleted_ButTheTarge
var gitClient = Substitute.For<IGitClient>();
var gitHubClient = Substitute.For<IGitHubClient>();
var logger = XUnitLogger.CreateLogger<StackActions>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);

// Setup branch statuses to simulate the scenario
gitClient.GetBranchStatuses(Arg.Any<string[]>()).Returns(new Dictionary<string, GitBranchStatus>
Expand Down Expand Up @@ -348,7 +348,7 @@ public async Task UpdateStack_UsingRebase_WhenARemoteBranchIsDeleted_AndLocalBra
new List<Config.Branch> { new Config.Branch(branch1, new List<Config.Branch> { new Config.Branch(branch2, new List<Config.Branch>()) }) }
);

var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);
var stackActions = new StackActions(gitClient, gitHubClient, inputProvider, logger, console);

gitClient.Fetch(true);
Expand All @@ -373,7 +373,7 @@ public async Task UpdateStack_UsingRebase_WhenStackHasATreeStructure_RebasesAllB
var gitClient = Substitute.For<IGitClient>();
var gitHubClient = Substitute.For<IGitHubClient>();
var logger = XUnitLogger.CreateLogger<StackActions>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);

gitClient.GetBranchStatuses(Arg.Any<string[]>()).Returns(new Dictionary<string, GitBranchStatus>
{
Expand Down Expand Up @@ -422,7 +422,7 @@ public async Task UpdateStack_UsingMerge_WhenStackHasATreeStructure_MergesAllBra
var gitClient = Substitute.For<IGitClient>();
var gitHubClient = Substitute.For<IGitHubClient>();
var logger = XUnitLogger.CreateLogger<StackActions>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);

gitClient.GetBranchStatuses(Arg.Any<string[]>()).Returns(new Dictionary<string, GitBranchStatus>
{
Expand Down Expand Up @@ -470,7 +470,7 @@ public void PullChanges_WhenSomeBranchesHaveChanges_AndOthersDoNot_OnlyPullsChan
var gitHubClient = Substitute.For<IGitHubClient>();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<StackActions>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);

var branchStatus = new Dictionary<string, GitBranchStatus>
{
Expand Down Expand Up @@ -509,7 +509,7 @@ public void PullChanges_WhenSomeBranchesDoNotExistInRemote_OnlyPullsBranchesThat
var gitHubClient = Substitute.For<IGitHubClient>();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<StackActions>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);

var branchStatus = new Dictionary<string, GitBranchStatus>
{
Expand Down Expand Up @@ -549,7 +549,7 @@ public void PullChanges_WhenOnlyNonCurrentBranchesBehind_FetchesThem()
var inputProvider = Substitute.For<IInputProvider>();
gitClient.GetCurrentBranch().Returns(sourceBranch);
var logger = XUnitLogger.CreateLogger<StackActions>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);

var statuses = new Dictionary<string, GitBranchStatus>
{
Expand Down Expand Up @@ -585,7 +585,7 @@ public void PullChanges_WhenOnlyCurrentBranchBehind_PullsIt()
var inputProvider = Substitute.For<IInputProvider>();
gitClient.GetCurrentBranch().Returns(sourceBranch);
var logger = XUnitLogger.CreateLogger<StackActions>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);

var statuses = new Dictionary<string, GitBranchStatus>
{
Expand Down Expand Up @@ -615,7 +615,7 @@ public void PullChanges_WhenCurrentAndOtherBranchesBehind_PullsCurrentAndFetches
var gitHubClient = Substitute.For<IGitHubClient>();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<StackActions>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);

gitClient.GetCurrentBranch().Returns(sourceBranch);
var statuses = new Dictionary<string, GitBranchStatus>
Expand Down Expand Up @@ -650,7 +650,7 @@ public void PullChanges_WhenNoBranchesBehind_DoesNothing()
var gitHubClient = Substitute.For<IGitHubClient>();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<StackActions>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);

gitClient.GetCurrentBranch().Returns(sourceBranch);
var statuses = new Dictionary<string, GitBranchStatus>
Expand Down Expand Up @@ -683,7 +683,7 @@ public void PullChanges_WhenBranchIsBehind_AndCheckedOutInAnotherWorktree_PullsI
var gitHubClient = Substitute.For<IGitHubClient>();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<StackActions>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);

gitClient.GetCurrentBranch().Returns(sourceBranch);
var statuses = new Dictionary<string, GitBranchStatus>
Expand Down Expand Up @@ -722,7 +722,7 @@ public void PushChanges_WhenSomeLocalBranchesAreAhead_OnlyPushesChangesForBranch
var gitHubClient = Substitute.For<IGitHubClient>();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<StackActions>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);

var branchStatus = new Dictionary<string, GitBranchStatus>
{
Expand Down Expand Up @@ -766,7 +766,7 @@ public void PushChanges_WhenSomeBranchesDoNotExistInRemote_OnlyPushesBranchesTha
var gitHubClient = Substitute.For<IGitHubClient>();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<StackActions>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);

var branchStatus = new Dictionary<string, GitBranchStatus>
{
Expand Down Expand Up @@ -810,7 +810,7 @@ public void PushChanges_WhenSomeBranchesHaveNoRemoteTrackingBranch_PushesThemAsN
var gitHubClient = Substitute.For<IGitHubClient>();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<StackActions>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);

var branchStatus = new Dictionary<string, GitBranchStatus>
{
Expand Down Expand Up @@ -861,7 +861,7 @@ public void PushChanges_WhenMaxBatchSizeIsSmaller_PushesBranchesInMultipleBatche
var gitHubClient = Substitute.For<IGitHubClient>();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<StackActions>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);

var branchStatus = new Dictionary<string, GitBranchStatus>
{
Expand Down Expand Up @@ -909,7 +909,7 @@ public void PushChanges_WhenForceWithLeaseIsTrue_PassesForceWithLeaseParameterTo
var gitHubClient = Substitute.For<IGitHubClient>();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<StackActions>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);

var branchStatus = new Dictionary<string, GitBranchStatus>
{
Expand Down Expand Up @@ -945,7 +945,7 @@ public void PushChanges_WhenNoBranchesNeedToBePushed_DoesNotCallPushMethods()
var gitHubClient = Substitute.For<IGitHubClient>();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<StackActions>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);

var branchStatus = new Dictionary<string, GitBranchStatus>
{
Expand Down
22 changes: 11 additions & 11 deletions src/Stack.Tests/Commands/PullRequests/CreatePullRequestsCommandHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public async Task WhenNoPullRequestsExistForAStackWithMultipleBranches_CreatesPu
.Build();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<CreatePullRequestsCommandHandler>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);
var fileOperations = new FileOperations();
var gitClient = Substitute.For<IGitClient>();
gitClient.GetRemoteUri().Returns(remoteUri);
Expand Down Expand Up @@ -109,7 +109,7 @@ public async Task WhenCreatingPullRequestsForAStackWithMultipleBranches_EachPull
.Build();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<CreatePullRequestsCommandHandler>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);
var fileOperations = new FileOperations();
var gitClient = Substitute.For<IGitClient>();
gitClient.GetRemoteUri().Returns(remoteUri);
Expand Down Expand Up @@ -170,7 +170,7 @@ public async Task WhenAPullRequestExistForABranch_AndNoneForAnotherBranch_Create
.Build();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<CreatePullRequestsCommandHandler>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);
var fileOperations = new FileOperations();
var gitClient = Substitute.For<IGitClient>();
gitClient.GetRemoteUri().Returns(remoteUri);
Expand Down Expand Up @@ -228,7 +228,7 @@ public async Task WhenStackNameIsProvided_PullRequestsAreCreatedForThatStack()
.Build();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<CreatePullRequestsCommandHandler>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);
var fileOperations = new FileOperations();
var gitClient = Substitute.For<IGitClient>();
gitClient.GetRemoteUri().Returns(remoteUri);
Expand Down Expand Up @@ -288,7 +288,7 @@ public async Task WhenOnlyOneStackExists_DoesNotAskForStackName_PullRequestsAreC
.Build();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<CreatePullRequestsCommandHandler>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);
var fileOperations = new FileOperations();
var gitClient = Substitute.For<IGitClient>();
gitClient.GetRemoteUri().Returns(remoteUri);
Expand Down Expand Up @@ -352,7 +352,7 @@ public async Task WhenStackNameIsProvided_ButTheStackDoesNotExist_Throws()
.Build();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<CreatePullRequestsCommandHandler>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);
var fileOperations = new FileOperations();
var gitClient = Substitute.For<IGitClient>();
gitClient.GetRemoteUri().Returns(remoteUri);
Expand Down Expand Up @@ -405,7 +405,7 @@ public async Task WhenAPullRequestExistForABranch_AndHasBeenMerged_AndNoneForAno
.Build();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<CreatePullRequestsCommandHandler>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);
var fileOperations = new FileOperations();
var gitClient = Substitute.For<IGitClient>();
gitClient.GetRemoteUri().Returns(remoteUri);
Expand Down Expand Up @@ -469,7 +469,7 @@ public async Task WhenAPullRequestTemplateExistsInTheRepo_ItIsUsedAsTheBodyOfANe
.Build();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<CreatePullRequestsCommandHandler>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);
var fileOperations = new FileOperations();
var gitClient = Substitute.For<IGitClient>();
gitClient.GetRemoteUri().Returns(remoteUri);
Expand Down Expand Up @@ -535,7 +535,7 @@ public async Task WhenAPullRequestTemplateDoesNotExistInTheRepo_TheStackPrListMa
.Build();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<CreatePullRequestsCommandHandler>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);
var fileOperations = new FileOperations();
var gitClient = Substitute.For<IGitClient>();
gitClient.GetRemoteUri().Returns(remoteUri);
Expand Down Expand Up @@ -597,7 +597,7 @@ public async Task WhenAskedWhetherToCreateAPullRequestAsADraft_AndTheAnswerIsYes
.Build();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<CreatePullRequestsCommandHandler>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);
var fileOperations = new FileOperations();
var gitClient = Substitute.For<IGitClient>();
gitClient.GetRemoteUri().Returns(remoteUri);
Expand Down Expand Up @@ -652,7 +652,7 @@ public async Task WhenOnlySelectingSomeBranchesToCreatePullRequestsFor_OnlyThose
.Build();
var inputProvider = Substitute.For<IInputProvider>();
var logger = XUnitLogger.CreateLogger<CreatePullRequestsCommandHandler>(testOutputHelper);
var console = new TestAnsiConsoleWriter(testOutputHelper);
var console = new TestDisplayProvider(testOutputHelper);
var fileOperations = new FileOperations();
var gitClient = Substitute.For<IGitClient>();
gitClient.GetRemoteUri().Returns(remoteUri);
Expand Down
Loading
Loading