Skip to content

Reorganise stack persistence and model folder structure #389

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 3 commits into from
Oct 15, 2025
Merged

Reorganise stack persistence and model folder structure #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a9cf92
Reorganise stack persistence and model folder structure
geofflamrock Oct 13, 2025
5dd4b7f
Fix build
geofflamrock Oct 14, 2025
e63b365
Cleanup
geofflamrock Oct 14, 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
25 changes: 12 additions & 13 deletions src/Stack.Tests/Commands/Branch/AddBranchCommandHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using NSubstitute;
using Stack.Commands;
using Stack.Commands.Helpers;
using Stack.Config;
using Stack.Git;
using Stack.Infrastructure;
using Stack.Infrastructure.Settings;
Expand Down Expand Up @@ -53,9 +52,9 @@ public async Task WhenNoInputsProvided_AsksForStackAndBranchAndParentBranchAndCo
await handler.Handle(new AddBranchCommandInputs(null, null, null), CancellationToken.None);

// Assert
stackRepository.Stacks.Should().BeEquivalentTo(new List<Config.Stack>
stackRepository.Stacks.Should().BeEquivalentTo(new List<Model.Stack>
{
new("Stack1", stackRepository.RemoteUri, sourceBranch, [new Config.Branch(firstBranch, [new Config.Branch(childBranch, []), new Config.Branch(branchToAdd, [])])]),
new("Stack1", stackRepository.RemoteUri, sourceBranch, [new Model.Branch(firstBranch, [new Model.Branch(childBranch, []), new Model.Branch(branchToAdd, [])])]),
new("Stack2", stackRepository.RemoteUri, sourceBranch, [])
});
}
Expand Down Expand Up @@ -95,9 +94,9 @@ public async Task WhenStackNameProvided_DoesNotAskForStackName_AddsBranchFromSta

// Assert
await inputProvider.DidNotReceive().Select(Questions.SelectStack, Arg.Any<string[]>(), Arg.Any<CancellationToken>());
stackRepository.Stacks.Should().BeEquivalentTo(new List<Config.Stack>
stackRepository.Stacks.Should().BeEquivalentTo(new List<Model.Stack>
{
new("Stack1", stackRepository.RemoteUri, sourceBranch, [new Config.Branch(anotherBranch, [new Config.Branch(branchToAdd, [])])]),
new("Stack1", stackRepository.RemoteUri, sourceBranch, [new Model.Branch(anotherBranch, [new Model.Branch(branchToAdd, [])])]),
new("Stack2", stackRepository.RemoteUri, sourceBranch, [])
});
}
Expand Down Expand Up @@ -136,9 +135,9 @@ public async Task WhenOnlyOneStackExists_DoesNotAskForStackName_AddsBranchFromSt

// Assert
await inputProvider.DidNotReceive().Select(Questions.SelectStack, Arg.Any<string[]>(), Arg.Any<CancellationToken>());
stackRepository.Stacks.Should().BeEquivalentTo(new List<Config.Stack>
stackRepository.Stacks.Should().BeEquivalentTo(new List<Model.Stack>
{
new("Stack1", stackRepository.RemoteUri, sourceBranch, [new Config.Branch(anotherBranch, [new Config.Branch(branchToAdd, [])])])
new("Stack1", stackRepository.RemoteUri, sourceBranch, [new Model.Branch(anotherBranch, [new Model.Branch(branchToAdd, [])])])
});
}

Expand Down Expand Up @@ -211,9 +210,9 @@ public async Task WhenBranchNameProvided_DoesNotAskForBranchName_AddsBranchFromS
await handler.Handle(new AddBranchCommandInputs(null, branchToAdd, null), CancellationToken.None);

// Assert
stackRepository.Stacks.Should().BeEquivalentTo(new List<Config.Stack>
stackRepository.Stacks.Should().BeEquivalentTo(new List<Model.Stack>
{
new("Stack1", stackRepository.RemoteUri, sourceBranch, [new Config.Branch(anotherBranch, [new Config.Branch(branchToAdd, [])])]),
new("Stack1", stackRepository.RemoteUri, sourceBranch, [new Model.Branch(anotherBranch, [new Model.Branch(branchToAdd, [])])]),
new("Stack2", stackRepository.RemoteUri, sourceBranch, [])
});
await inputProvider.DidNotReceive().Select(Questions.SelectBranch, Arg.Any<string[]>(), Arg.Any<CancellationToken>());
Expand Down Expand Up @@ -326,9 +325,9 @@ public async Task WhenAllInputsProvided_DoesNotAskForAnything_AddsBranchFromStac
await handler.Handle(new AddBranchCommandInputs("Stack1", branchToAdd, anotherBranch), CancellationToken.None);

// Assert
stackRepository.Stacks.Should().BeEquivalentTo(new List<Config.Stack>
stackRepository.Stacks.Should().BeEquivalentTo(new List<Model.Stack>
{
new("Stack1", stackRepository.RemoteUri, sourceBranch, [new Config.Branch(anotherBranch, [new Config.Branch(branchToAdd, [])])]),
new("Stack1", stackRepository.RemoteUri, sourceBranch, [new Model.Branch(anotherBranch, [new Model.Branch(branchToAdd, [])])]),
new("Stack2", stackRepository.RemoteUri, sourceBranch, [])
});
inputProvider.ReceivedCalls().Should().BeEmpty();
Expand Down Expand Up @@ -371,9 +370,9 @@ public async Task WhenParentBranchProvided_DoesNotAskForParentBranch_CreatesNewB
await handler.Handle(new AddBranchCommandInputs(null, null, firstBranch), CancellationToken.None);

// Assert
stackRepository.Stacks.Should().BeEquivalentTo(new List<Config.Stack>
stackRepository.Stacks.Should().BeEquivalentTo(new List<Model.Stack>
{
new("Stack1", stackRepository.RemoteUri, sourceBranch, [new Config.Branch(firstBranch, [new Config.Branch(childBranch, []), new Config.Branch(branchToAdd, [])])]),
new("Stack1", stackRepository.RemoteUri, sourceBranch, [new Model.Branch(firstBranch, [new Model.Branch(childBranch, []), new Model.Branch(branchToAdd, [])])]),
new("Stack2", stackRepository.RemoteUri, sourceBranch, [])
});

Expand Down
30 changes: 15 additions & 15 deletions src/Stack.Tests/Commands/Branch/MoveBranchCommandHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using FluentAssertions;
using NSubstitute;
using Meziantou.Extensions.Logging.Xunit;
using NSubstitute;
using Stack.Commands;
using Stack.Commands.Helpers;
using Stack.Git;
using Stack.Infrastructure;
using Stack.Infrastructure.Settings;
using Stack.Tests.Helpers;
using Xunit.Abstractions;
using Stack.Infrastructure.Settings;

namespace Stack.Tests.Commands.Branch;

Expand Down Expand Up @@ -50,11 +50,11 @@ public async Task WhenMovingBranchWithoutChildren_MovesBranchToNewParent()
await handler.Handle(new MoveBranchCommandInputs(null, null, null, null), CancellationToken.None);

// Assert
stackRepository.Stacks.Should().BeEquivalentTo(new List<Config.Stack>
stackRepository.Stacks.Should().BeEquivalentTo(new List<Model.Stack>
{
new("Stack1", stackRepository.RemoteUri, sourceBranch, [
new Config.Branch(firstBranch, [new Config.Branch(branchToMove, [])]),
new Config.Branch(secondBranch, [])
new Model.Branch(firstBranch, [new Model.Branch(branchToMove, [])]),
new Model.Branch(secondBranch, [])
])
});
}
Expand Down Expand Up @@ -98,10 +98,10 @@ public async Task WhenMovingBranchWithChildren_AndMoveChildrenOption_MovesBranch
await handler.Handle(new MoveBranchCommandInputs(null, null, null, null), CancellationToken.None);

// Assert
stackRepository.Stacks.Should().BeEquivalentTo(new List<Config.Stack>
stackRepository.Stacks.Should().BeEquivalentTo(new List<Model.Stack>
{
new("Stack1", stackRepository.RemoteUri, sourceBranch, [
new Config.Branch(firstBranch, [new Config.Branch(branchToMove, [new Config.Branch(childBranch, [])])])
new Model.Branch(firstBranch, [new Model.Branch(branchToMove, [new Model.Branch(childBranch, [])])])
])
});
}
Expand Down Expand Up @@ -145,11 +145,11 @@ public async Task WhenMovingBranchWithChildren_AndReParentChildrenOption_MovesBr
await handler.Handle(new MoveBranchCommandInputs(null, null, null, null), CancellationToken.None);

// Assert
stackRepository.Stacks.Should().BeEquivalentTo(new List<Config.Stack>
stackRepository.Stacks.Should().BeEquivalentTo(new List<Model.Stack>
{
new("Stack1", stackRepository.RemoteUri, sourceBranch, [
new Config.Branch(firstBranch, [new Config.Branch(branchToMove, [])]),
new Config.Branch(childBranch, [])
new Model.Branch(firstBranch, [new Model.Branch(branchToMove, [])]),
new Model.Branch(childBranch, [])
])
});
}
Expand Down Expand Up @@ -189,11 +189,11 @@ public async Task WhenMovingBranchToSourceBranch_MovesBranchToRootLevel()
await handler.Handle(new MoveBranchCommandInputs(null, null, null, null), CancellationToken.None);

// Assert
stackRepository.Stacks.Should().BeEquivalentTo(new List<Config.Stack>
stackRepository.Stacks.Should().BeEquivalentTo(new List<Model.Stack>
{
new("Stack1", stackRepository.RemoteUri, sourceBranch, [
new Config.Branch(firstBranch, []),
new Config.Branch(branchToMove, [])
new Model.Branch(firstBranch, []),
new Model.Branch(branchToMove, [])
])
});
}
Expand Down Expand Up @@ -229,10 +229,10 @@ public async Task WhenAllInputsProvided_DoesNotPromptUser()
await handler.Handle(new MoveBranchCommandInputs("Stack1", branchToMove, firstBranch, MoveBranchChildAction.MoveChildren), CancellationToken.None);

// Assert
stackRepository.Stacks.Should().BeEquivalentTo(new List<Config.Stack>
stackRepository.Stacks.Should().BeEquivalentTo(new List<Model.Stack>
{
new("Stack1", stackRepository.RemoteUri, sourceBranch, [
new Config.Branch(firstBranch, [new Config.Branch(branchToMove, [])])
new Model.Branch(firstBranch, [new Model.Branch(branchToMove, [])])
])
});

Expand Down
Loading