Skip to content

Commit 9ab08fc

Browse files
committed
Remove additional files from initial project structure
With the latest changes, new files have been added to the template repository which should not be part of the initial project structure when executing `moryx new`.
1 parent 81e0e57 commit 9ab08fc

File tree

3 files changed

+50
-8
lines changed

3 files changed

+50
-8
lines changed

src/Moryx.Cli.Commands/CreateNew.cs

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,7 @@ private static void CreateBareSolution(TemplateSettings settings)
5050
{
5151
var cleanedResourceNames = Template.Template.GetCleanedResourceNames(settings);
5252
var projectFilenames = cleanedResourceNames.InitialProjects();
53-
var filteredResourceNames = cleanedResourceNames
54-
.WithoutStep()
55-
.WithoutProduct()
56-
.WithoutRecipe()
57-
.WithoutSetupTrigger()
58-
.WithoutCellSelector()
59-
.WithoutModule()
60-
;
53+
var filteredResourceNames = FilteredResourceNames(cleanedResourceNames);
6154

6255
var dictionary = Template.Template.PrepareFileStructure(settings.AppName, filteredResourceNames, projectFilenames);
6356

@@ -70,6 +63,20 @@ private static void CreateBareSolution(TemplateSettings settings)
7063
});
7164
}
7265

66+
public static List<string> FilteredResourceNames(List<string> resourceNames)
67+
{
68+
return resourceNames
69+
.WithoutStep()
70+
.WithoutProduct()
71+
.WithoutRecipe()
72+
.WithoutSetupTrigger()
73+
.WithoutCellSelector()
74+
.WithoutModule()
75+
.WithoutResource()
76+
.WithoutState()
77+
;
78+
}
79+
7380
private static void InitializeGitRepo(string solutionName, Action<string> onStatus)
7481
{
7582
var initialDirectory = Environment.CurrentDirectory;
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
using Moryx.Cli.Commands;
2+
using Moryx.Cli.Template.Extensions;
3+
using Moryx.Cli.Template.StateBaseTemplate;
4+
5+
namespace Moryx.Cli.Tests.CommandTests
6+
{
7+
public class CreateNewTests
8+
{
9+
private const int InitialProjectFilesCount = 28;
10+
11+
[SetUp]
12+
public void Setup()
13+
{
14+
}
15+
16+
[Test]
17+
public void CheckInitialProjectFilesCount()
18+
{
19+
var filteredNames = CreateNew.FilteredResourceNames(DummyFileList.Get());
20+
21+
Assert.Multiple(() =>
22+
{
23+
filteredNames.Each((s, i) =>
24+
{
25+
Assert.That(s, Does.Not.Contain("MyResource"));
26+
Assert.That(s, Does.Not.Contain("State.cs"));
27+
Assert.That(s, Does.Not.Contain("StateBase.cs"));
28+
});
29+
30+
Assert.That(filteredNames, Has.Count.EqualTo(InitialProjectFilesCount));
31+
});
32+
}
33+
}
34+
}

src/Tests/Moryx.Cli.Tests/Moryx.Cli.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35+
<ProjectReference Include="..\..\Moryx.Cli.Commands\Moryx.Cli.Commands.csproj" />
3536
<ProjectReference Include="..\..\Moryx.Cli.Template\Moryx.Cli.Template.csproj" />
3637
</ItemGroup>
3738

0 commit comments

Comments
 (0)