Skip to content

Refactor stack status #250

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 10 commits into from
May 26, 2025
Merged

Refactor stack status #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d8f27d7
Refactor stack status
geofflamrock May 26, 2025
f820f6e
Fix update tests
geofflamrock May 26, 2025
c2980d2
Fix PR tests
geofflamrock May 26, 2025
c418b95
Cleanup
geofflamrock May 26, 2025
728c0a9
Ignore computed props
geofflamrock May 26, 2025
0c67f78
Use specific command output types
geofflamrock May 26, 2025
750164a
Cleanup
geofflamrock May 26, 2025
626bef5
Re-add in status logging
geofflamrock May 26, 2025
6535dc4
More cleanup
geofflamrock May 26, 2025
0b7310b
Fix tests
geofflamrock May 26, 2025
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
35 changes: 7 additions & 28 deletions src/Stack.Tests/Commands/Helpers/StackHelpersTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using FluentAssertions;
using NSubstitute;
using Stack.Commands;
using Stack.Commands.Helpers;
using Stack.Git;
using Stack.Infrastructure;
Expand All @@ -22,20 +23,9 @@ public void UpdateStack_WhenThereAreConflictsMergingBranches_AndUpdateIsContinue
var inputProvider = Substitute.For<IInputProvider>();

var stack = new Config.Stack("Stack1", Some.HttpsUri().ToString(), sourceBranch, [branch1, branch2]);
var branchDetail1 = new BranchDetail
{
Status = new BranchStatus(true, true, true, false, 0, 0, 0, 0, null)
};
var branchDetail2 = new BranchDetail
{
Status = new BranchStatus(true, true, true, false, 0, 0, 0, 0, null)
};

var stackStatus = new StackStatus(new Dictionary<string, BranchDetail>
{
{ branch1, branchDetail1 },
{ branch2, branchDetail2 },
});
var branchDetail1 = new BranchDetail(branch1, true, new Commit(Some.Sha(), Some.Name()), new RemoteTrackingBranchStatus($"origin/{branch1}", true, 0, 0), null, null);
var branchDetail2 = new BranchDetail(branch2, true, new Commit(Some.Sha(), Some.Name()), new RemoteTrackingBranchStatus($"origin/{branch2}", true, 0, 0), null, null);
var stackStatus = new StackStatus("Stack1", new Branch(sourceBranch, true, null, null), [branchDetail1, branchDetail2]);

inputProvider
.Select(
Expand Down Expand Up @@ -76,20 +66,9 @@ public void UpdateStack_WhenThereAreConflictsMergingBranches_AndUpdateIsAborted_
var logger = new TestLogger(testOutputHelper);

var stack = new Config.Stack("Stack1", Some.HttpsUri().ToString(), sourceBranch, [branch1, branch2]);
var branchDetail1 = new BranchDetail
{
Status = new BranchStatus(true, true, true, false, 0, 0, 0, 0, null)
};
var branchDetail2 = new BranchDetail
{
Status = new BranchStatus(true, true, true, false, 0, 0, 0, 0, null)
};

var stackStatus = new StackStatus(new Dictionary<string, BranchDetail>
{
{ branch1, branchDetail1 },
{ branch2, branchDetail2 },
});
var branchDetail1 = new BranchDetail(branch1, true, new Commit(Some.Sha(), Some.Name()), new RemoteTrackingBranchStatus($"origin/{branch1}", true, 0, 0), null, null);
var branchDetail2 = new BranchDetail(branch2, true, new Commit(Some.Sha(), Some.Name()), new RemoteTrackingBranchStatus($"origin/{branch2}", true, 0, 0), null, null);
var stackStatus = new StackStatus("Stack1", new Branch(sourceBranch, true, null, null), [branchDetail1, branchDetail2]);

gitClient
.When(g => g.MergeFromLocalSourceBranch(sourceBranch))
Expand Down
7 changes: 7 additions & 0 deletions src/Stack.Tests/Commands/Stack/CleanupStackCommandHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public async Task WhenBranchExistsLocally_ButHasNotBeenPushedToTheRemote_BranchI

var remoteUri = Some.HttpsUri().ToString();
stackConfig.Load().Returns(stacks);
logger.WhenForAnyArgs(o => o.Status(Arg.Any<string>(), Arg.Any<Action>())).Do(ci => ci.ArgAt<Action>(1)());

inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>()).Returns("Stack1");
inputProvider.Confirm(Questions.ConfirmDeleteBranches).Returns(true);
Expand Down Expand Up @@ -80,6 +81,7 @@ public async Task WhenBranchExistsLocally_AndHasBeenDeletedFromTheRemote_BranchI

var remoteUri = Some.HttpsUri().ToString();
stackConfig.Load().Returns(stacks);
logger.WhenForAnyArgs(o => o.Status(Arg.Any<string>(), Arg.Any<Action>())).Do(ci => ci.ArgAt<Action>(1)());

inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>()).Returns("Stack1");
inputProvider.Confirm(Questions.ConfirmDeleteBranches).Returns(true);
Expand Down Expand Up @@ -117,6 +119,7 @@ public async Task WhenBranchExistsLocally_AndInRemote_BranchIsNotDeletedLocally(
new("Stack2", repo.RemoteUri, sourceBranch, [])
]);
stackConfig.Load().Returns(stacks);
logger.WhenForAnyArgs(o => o.Status(Arg.Any<string>(), Arg.Any<Action>())).Do(ci => ci.ArgAt<Action>(1)());

inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>()).Returns("Stack1");
inputProvider.Confirm(Questions.ConfirmDeleteBranches).Returns(true);
Expand Down Expand Up @@ -154,6 +157,7 @@ public async Task WhenConfirmationIsFalse_DoesNotDeleteAnyBranches()
new("Stack2", repo.RemoteUri, sourceBranch, [])
]);
stackConfig.Load().Returns(stacks);
logger.WhenForAnyArgs(o => o.Status(Arg.Any<string>(), Arg.Any<Action>())).Do(ci => ci.ArgAt<Action>(1)());

inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>()).Returns("Stack1");
inputProvider.Confirm(Questions.ConfirmDeleteBranches).Returns(false);
Expand Down Expand Up @@ -191,6 +195,7 @@ public async Task WhenStackNameIsProvided_ItIsNotAskedFor()
new("Stack2", repo.RemoteUri, sourceBranch, [])
]);
stackConfig.Load().Returns(stacks);
logger.WhenForAnyArgs(o => o.Status(Arg.Any<string>(), Arg.Any<Action>())).Do(ci => ci.ArgAt<Action>(1)());

inputProvider.Confirm(Questions.ConfirmDeleteBranches).Returns(true);

Expand Down Expand Up @@ -263,6 +268,7 @@ public async Task WhenOnlyASingleStackExists_StackIsSelectedAutomatically()
new("Stack1", repo.RemoteUri, sourceBranch, [branchToCleanup, branchToKeep]),
]);
stackConfig.Load().Returns(stacks);
logger.WhenForAnyArgs(o => o.Status(Arg.Any<string>(), Arg.Any<Action>())).Do(ci => ci.ArgAt<Action>(1)());

inputProvider.Confirm(Questions.ConfirmDeleteBranches).Returns(true);

Expand Down Expand Up @@ -303,6 +309,7 @@ public async Task WhenConfirmIsProvided_DoesNotAskForConfirmation_DeletesBranche

var remoteUri = Some.HttpsUri().ToString();
stackConfig.Load().Returns(stacks);
logger.WhenForAnyArgs(o => o.Status(Arg.Any<string>(), Arg.Any<Action>())).Do(ci => ci.ArgAt<Action>(1)());

inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>()).Returns("Stack1");

Expand Down
14 changes: 10 additions & 4 deletions src/Stack.Tests/Commands/Stack/DeleteStackCommandHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public async Task WhenNoInputsAreProvided_AsksForName_AndConfirmation_AndDeletes
{
// Arrange
var sourceBranch = Some.BranchName();
using var repo = new TestGitRepositoryBuilder().Build();
using var repo = new TestGitRepositoryBuilder().WithBranch(sourceBranch).Build();

var stackConfig = Substitute.For<IStackConfig>();
var inputProvider = Substitute.For<IInputProvider>();
Expand All @@ -34,6 +34,7 @@ public async Task WhenNoInputsAreProvided_AsksForName_AndConfirmation_AndDeletes
stackConfig
.WhenForAnyArgs(s => s.Save(Arg.Any<List<Config.Stack>>()))
.Do(ci => stacks = ci.ArgAt<List<Config.Stack>>(0));
logger.WhenForAnyArgs(o => o.Status(Arg.Any<string>(), Arg.Any<Action>())).Do(ci => ci.ArgAt<Action>(1)());

inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>()).Returns("Stack1");
inputProvider.Confirm(Questions.ConfirmDeleteStack).Returns(true);
Expand Down Expand Up @@ -71,6 +72,7 @@ public async Task WhenConfirmationIsFalse_DoesNotDeleteStack()
stackConfig
.WhenForAnyArgs(s => s.Save(Arg.Any<List<Config.Stack>>()))
.Do(ci => stacks = ci.ArgAt<List<Config.Stack>>(0));
logger.WhenForAnyArgs(o => o.Status(Arg.Any<string>(), Arg.Any<Action>())).Do(ci => ci.ArgAt<Action>(1)());

inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>()).Returns("Stack1");
inputProvider.Confirm(Questions.ConfirmDeleteStack).Returns(false);
Expand All @@ -91,7 +93,7 @@ public async Task WhenNameIsProvided_AsksForConfirmation_AndDeletesStack()
{
// Arrange
var sourceBranch = Some.BranchName();
using var repo = new TestGitRepositoryBuilder().Build();
using var repo = new TestGitRepositoryBuilder().WithBranch(sourceBranch).Build();

var stackConfig = Substitute.For<IStackConfig>();
var inputProvider = Substitute.For<IInputProvider>();
Expand All @@ -109,6 +111,7 @@ public async Task WhenNameIsProvided_AsksForConfirmation_AndDeletesStack()
stackConfig
.WhenForAnyArgs(s => s.Save(Arg.Any<List<Config.Stack>>()))
.Do(ci => stacks = ci.ArgAt<List<Config.Stack>>(0));
logger.WhenForAnyArgs(o => o.Status(Arg.Any<string>(), Arg.Any<Action>())).Do(ci => ci.ArgAt<Action>(1)());

inputProvider.Confirm(Questions.ConfirmDeleteStack).Returns(true);

Expand Down Expand Up @@ -189,6 +192,7 @@ public async Task WhenThereAreLocalBranchesThatAreDeletedInTheRemote_AsksToClean
stackConfig
.WhenForAnyArgs(s => s.Save(Arg.Any<List<Config.Stack>>()))
.Do(ci => stacks = ci.ArgAt<List<Config.Stack>>(0));
logger.WhenForAnyArgs(o => o.Status(Arg.Any<string>(), Arg.Any<Action>())).Do(ci => ci.ArgAt<Action>(1)());

inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>()).Returns("Stack1");
inputProvider.Confirm(Questions.ConfirmDeleteStack).Returns(true);
Expand All @@ -210,7 +214,7 @@ public async Task WhenOnlyOneStackExists_DoesNotAskForStackName()
{
// Arrange
var sourceBranch = Some.BranchName();
using var repo = new TestGitRepositoryBuilder().Build();
using var repo = new TestGitRepositoryBuilder().WithBranch(sourceBranch).Build();

var stackConfig = Substitute.For<IStackConfig>();
var inputProvider = Substitute.For<IInputProvider>();
Expand All @@ -227,6 +231,7 @@ public async Task WhenOnlyOneStackExists_DoesNotAskForStackName()
stackConfig
.WhenForAnyArgs(s => s.Save(Arg.Any<List<Config.Stack>>()))
.Do(ci => stacks = ci.ArgAt<List<Config.Stack>>(0));
logger.WhenForAnyArgs(o => o.Status(Arg.Any<string>(), Arg.Any<Action>())).Do(ci => ci.ArgAt<Action>(1)());

inputProvider.Confirm(Questions.ConfirmDeleteStack).Returns(true);

Expand All @@ -244,7 +249,7 @@ public async Task WhenConfirmIsProvided_DoesNotAskForConfirmation_DeletesStack()
{
// Arrange
var sourceBranch = Some.BranchName();
using var repo = new TestGitRepositoryBuilder().Build();
using var repo = new TestGitRepositoryBuilder().WithBranch(sourceBranch).Build();

var stackConfig = Substitute.For<IStackConfig>();
var inputProvider = Substitute.For<IInputProvider>();
Expand All @@ -262,6 +267,7 @@ public async Task WhenConfirmIsProvided_DoesNotAskForConfirmation_DeletesStack()
stackConfig
.WhenForAnyArgs(s => s.Save(Arg.Any<List<Config.Stack>>()))
.Do(ci => stacks = ci.ArgAt<List<Config.Stack>>(0));
logger.WhenForAnyArgs(o => o.Status(Arg.Any<string>(), Arg.Any<Action>())).Do(ci => ci.ArgAt<Action>(1)());

inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>()).Returns("Stack1");

Expand Down
Loading