Skip to content

Commit 0ac1542

Browse files
geofflamrockgeofflamrock
committed
Fixes after rebase
1 parent 046e830 commit 0ac1542

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

‎src/Stack.Tests/Commands/Branch/MoveBranchCommandHandlerTests.cs‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using Meziantou.Extensions.Logging.Xunit;
44
using Stack.Commands;
55
using Stack.Commands.Helpers;
6-
using Stack.Config;
76
using Stack.Git;
87
using Stack.Infrastructure;
98
using Stack.Tests.Helpers;
@@ -25,7 +24,7 @@ public async Task WhenMovingBranchWithoutChildren_MovesBranchToNewParent()
2524

2625
var inputProvider = Substitute.For<IInputProvider>();
2726
var logger = XUnitLogger.CreateLogger<MoveBranchCommandHandler>(testOutputHelper);
28-
var displayProvider = new TestDisplayProvider(testOutputHelper);
27+
var outputProvider = Substitute.For<IOutputProvider>();
2928
var gitClient = Substitute.For<IGitClient>();
3029
gitClient.GetRemoteUri().Returns(remoteUri);
3130
gitClient.GetCurrentBranch().Returns(sourceBranch);
@@ -40,7 +39,7 @@ public async Task WhenMovingBranchWithoutChildren_MovesBranchToNewParent()
4039
.WithChildBranch(child => child.WithName(branchToMove))))
4140
.Build();
4241

43-
var handler = new MoveBranchCommandHandler(inputProvider, logger, displayProvider, gitClient, stackConfig);
42+
var handler = new MoveBranchCommandHandler(inputProvider, logger, outputProvider, gitClient, stackConfig);
4443

4544
inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns("Stack1");
4645
inputProvider.Select(Questions.SelectBranch, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns(branchToMove);
@@ -72,6 +71,7 @@ public async Task WhenMovingBranchWithChildren_AndMoveChildrenOption_MovesBranch
7271
var inputProvider = Substitute.For<IInputProvider>();
7372
var logger = XUnitLogger.CreateLogger<MoveBranchCommandHandler>(testOutputHelper);
7473
var gitClient = Substitute.For<IGitClient>();
74+
var outputProvider = Substitute.For<IOutputProvider>();
7575
gitClient.GetRemoteUri().Returns(remoteUri);
7676
gitClient.GetCurrentBranch().Returns(sourceBranch);
7777

@@ -85,8 +85,7 @@ public async Task WhenMovingBranchWithChildren_AndMoveChildrenOption_MovesBranch
8585
.WithChildBranch(child => child.WithName(childBranch))))
8686
.Build();
8787

88-
var displayProvider = new TestDisplayProvider(testOutputHelper);
89-
var handler = new MoveBranchCommandHandler(inputProvider, logger, displayProvider, gitClient, stackConfig);
88+
var handler = new MoveBranchCommandHandler(inputProvider, logger, outputProvider, gitClient, stackConfig);
9089

9190
inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns("Stack1");
9291
inputProvider.Select(Questions.SelectBranch, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns(branchToMove);
@@ -119,6 +118,7 @@ public async Task WhenMovingBranchWithChildren_AndReParentChildrenOption_MovesBr
119118
var inputProvider = Substitute.For<IInputProvider>();
120119
var logger = XUnitLogger.CreateLogger<MoveBranchCommandHandler>(testOutputHelper);
121120
var gitClient = Substitute.For<IGitClient>();
121+
var outputProvider = Substitute.For<IOutputProvider>();
122122
gitClient.GetRemoteUri().Returns(remoteUri);
123123
gitClient.GetCurrentBranch().Returns(sourceBranch);
124124

@@ -132,8 +132,7 @@ public async Task WhenMovingBranchWithChildren_AndReParentChildrenOption_MovesBr
132132
.WithChildBranch(child => child.WithName(childBranch))))
133133
.Build();
134134

135-
var displayProvider = new TestDisplayProvider(testOutputHelper);
136-
var handler = new MoveBranchCommandHandler(inputProvider, logger, displayProvider, gitClient, stackConfig);
135+
var handler = new MoveBranchCommandHandler(inputProvider, logger, outputProvider, gitClient, stackConfig);
137136

138137
inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns("Stack1");
139138
inputProvider.Select(Questions.SelectBranch, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns(branchToMove);
@@ -166,6 +165,7 @@ public async Task WhenMovingBranchToSourceBranch_MovesBranchToRootLevel()
166165
var inputProvider = Substitute.For<IInputProvider>();
167166
var logger = XUnitLogger.CreateLogger<MoveBranchCommandHandler>(testOutputHelper);
168167
var gitClient = Substitute.For<IGitClient>();
168+
var outputProvider = Substitute.For<IOutputProvider>();
169169
gitClient.GetRemoteUri().Returns(remoteUri);
170170
gitClient.GetCurrentBranch().Returns(sourceBranch);
171171

@@ -178,8 +178,7 @@ public async Task WhenMovingBranchToSourceBranch_MovesBranchToRootLevel()
178178
.WithChildBranch(child => child.WithName(branchToMove))))
179179
.Build();
180180

181-
var displayProvider = new TestDisplayProvider(testOutputHelper);
182-
var handler = new MoveBranchCommandHandler(inputProvider, logger, displayProvider, gitClient, stackConfig);
181+
var handler = new MoveBranchCommandHandler(inputProvider, logger, outputProvider, gitClient, stackConfig);
183182

184183
inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns("Stack1");
185184
inputProvider.Select(Questions.SelectBranch, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns(branchToMove);
@@ -210,6 +209,7 @@ public async Task WhenAllInputsProvided_DoesNotPromptUser()
210209
var inputProvider = Substitute.For<IInputProvider>();
211210
var logger = XUnitLogger.CreateLogger<MoveBranchCommandHandler>(testOutputHelper);
212211
var gitClient = Substitute.For<IGitClient>();
212+
var outputProvider = Substitute.For<IOutputProvider>();
213213
gitClient.GetRemoteUri().Returns(remoteUri);
214214
gitClient.GetCurrentBranch().Returns(sourceBranch);
215215

@@ -222,8 +222,7 @@ public async Task WhenAllInputsProvided_DoesNotPromptUser()
222222
.WithBranch(branch => branch.WithName(branchToMove)))
223223
.Build();
224224

225-
var displayProvider = new TestDisplayProvider(testOutputHelper);
226-
var handler = new MoveBranchCommandHandler(inputProvider, logger, displayProvider, gitClient, stackConfig);
225+
var handler = new MoveBranchCommandHandler(inputProvider, logger, outputProvider, gitClient, stackConfig);
227226

228227
// Act
229228
await handler.Handle(new MoveBranchCommandInputs("Stack1", branchToMove, firstBranch, MoveBranchChildAction.MoveChildren), CancellationToken.None);
@@ -251,6 +250,7 @@ public async Task WhenBranchNotFound_ThrowsException()
251250
var inputProvider = Substitute.For<IInputProvider>();
252251
var logger = XUnitLogger.CreateLogger<MoveBranchCommandHandler>(testOutputHelper);
253252
var gitClient = Substitute.For<IGitClient>();
253+
var outputProvider = Substitute.For<IOutputProvider>();
254254
gitClient.GetRemoteUri().Returns(remoteUri);
255255
gitClient.GetCurrentBranch().Returns(sourceBranch);
256256

@@ -262,8 +262,7 @@ public async Task WhenBranchNotFound_ThrowsException()
262262
.WithBranch(branch => branch.WithName(firstBranch)))
263263
.Build();
264264

265-
var displayProvider = new TestDisplayProvider(testOutputHelper);
266-
var handler = new MoveBranchCommandHandler(inputProvider, logger, displayProvider, gitClient, stackConfig);
265+
var handler = new MoveBranchCommandHandler(inputProvider, logger, outputProvider, gitClient, stackConfig);
267266

268267
inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns("Stack1");
269268
inputProvider.Select(Questions.SelectBranch, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns(nonExistentBranch);
@@ -287,6 +286,7 @@ public async Task WhenBranchWithoutChildren_DoesNotPromptForChildAction()
287286
var inputProvider = Substitute.For<IInputProvider>();
288287
var logger = XUnitLogger.CreateLogger<MoveBranchCommandHandler>(testOutputHelper);
289288
var gitClient = Substitute.For<IGitClient>();
289+
var outputProvider = Substitute.For<IOutputProvider>();
290290
gitClient.GetRemoteUri().Returns(remoteUri);
291291
gitClient.GetCurrentBranch().Returns(sourceBranch);
292292

@@ -299,8 +299,7 @@ public async Task WhenBranchWithoutChildren_DoesNotPromptForChildAction()
299299
.WithBranch(branch => branch.WithName(branchToMove)))
300300
.Build();
301301

302-
var displayProvider = new TestDisplayProvider(testOutputHelper);
303-
var handler = new MoveBranchCommandHandler(inputProvider, logger, displayProvider, gitClient, stackConfig);
302+
var handler = new MoveBranchCommandHandler(inputProvider, logger, outputProvider, gitClient, stackConfig);
304303

305304
inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns("Stack1");
306305
inputProvider.Select(Questions.SelectBranch, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns(branchToMove);

‎src/Stack/Commands/Branch/MoveBranchCommand.cs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ public class MoveBranchCommand : Command
3333
private readonly MoveBranchCommandHandler handler;
3434

3535
public MoveBranchCommand(
36-
ILogger<MoveBranchCommand> logger,
37-
IDisplayProvider displayProvider,
38-
IInputProvider inputProvider,
36+
MoveBranchCommandHandler handler,
3937
CliExecutionContext executionContext,
40-
MoveBranchCommandHandler handler)
41-
: base("move", "Move a branch to another location in a stack.", logger, displayProvider, inputProvider, executionContext)
38+
IInputProvider inputProvider,
39+
IOutputProvider outputProvider,
40+
ILogger<MoveBranchCommand> logger)
41+
: base("move", "Move a branch to another location in a stack.", executionContext, inputProvider, outputProvider, logger)
4242
{
4343
this.handler = handler;
4444
Add(CommonOptions.Stack);
@@ -76,7 +76,7 @@ public record MoveBranchCommandInputs(string? StackName, string? BranchName, str
7676
public class MoveBranchCommandHandler(
7777
IInputProvider inputProvider,
7878
ILogger<MoveBranchCommandHandler> logger,
79-
IDisplayProvider displayProvider,
79+
IOutputProvider outputProvider,
8080
IGitClient gitClient,
8181
IStackConfig stackConfig)
8282
: CommandHandlerBase<MoveBranchCommandInputs>
@@ -134,7 +134,8 @@ public override async Task Handle(MoveBranchCommandInputs inputs, CancellationTo
134134
stackConfig.Save(stackData);
135135

136136
logger.BranchMovedInStack(branchName, stack.Name);
137-
await displayProvider.DisplayMessage($"Run {"stack sync".Example()} or {"stack update".Example()} to synchronize the changes with Git.", cancellationToken);
137+
138+
await outputProvider.WriteMessage($"Run {$"stack sync --stack \"{stack.Name}\"".Example()} or {$"stack update --stack \"{stack.Name}\"".Example()} to synchronize the changes with your repository.", cancellationToken);
138139
}
139140
}
140141

0 commit comments

Comments
 (0)