Clean

ubisoft · Sep 22, 2023 · 737ecb2 · 737ecb2
1 parent 9256cb4
commit 737ecb2
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/NGitLab.Mock.Tests/ProjectsMockTests.cs b/NGitLab.Mock.Tests/ProjectsMockTests.cs
@@ -58,6 +58,28 @@ public void Test_project_with_submodules()
             Assert.IsTrue(System.IO.File.Exists(tempDir.GetFullPath("ModuleB/B.txt")));
         }
 
+        [Test]
+        public void Test_project_with_nested_submodules()
+        {
+            using var tempDir = TemporaryDirectory.Create();
+            using var server = new GitLabConfig()
+                .WithUser("Test", isDefault: true)
+                .WithProject("ModuleA", configure: x => x.WithCommit(configure: c => c.WithFile("A.txt")))
+                .WithProject("ModuleB", configure: x => x.WithCommit(configure: c
+                                                                         => c.WithFile("B.txt")
+                                                                             .WithSubModule("ModuleA")))
+                .WithProject("Test", clonePath: tempDir.FullPath, configure: x =>
+                    x.WithCommit(configure: c
+                        => c.WithSubModule("ModuleB")))
+                .BuildServer();
+
+            Assert.IsTrue(Directory.Exists(tempDir.GetFullPath(".git")));
+            Assert.IsTrue(System.IO.File.Exists(tempDir.GetFullPath("ModuleB/.git")));
+            Assert.IsTrue(System.IO.File.Exists(tempDir.GetFullPath("ModuleB/B.txt")));
+            Assert.IsTrue(System.IO.File.Exists(tempDir.GetFullPath("ModuleB/ModuleA/.git")));
+            Assert.IsTrue(System.IO.File.Exists(tempDir.GetFullPath("ModuleB/ModuleA/A.txt")));
+        }
+
         [Test]
         public void Test_projects_created_url_ends_with_namespace_and_name()
         {

diff --git a/NGitLab.Mock/Config/GitLabHelpers.cs b/NGitLab.Mock/Config/GitLabHelpers.cs
@@ -1278,12 +1278,17 @@ private static IEnumerable<string> CreateSubModules(GitLabServer server, Project
                 using var process = Process.Start(
                     new ProcessStartInfo("git", $"-c protocol.file.allow=always submodule add {subModuleProject.SshUrl} {subModuleProject.Name}")
                     {
+                        RedirectStandardError = true,
+                        UseShellExecute = false,
                         WorkingDirectory = prj.Repository.FullPath,
                     });
 
                 process.WaitForExit();
                 if (process.ExitCode != 0)
-                    throw new GitLabException("Cannot add submodule");
+                {
+                    var error = process.StandardError.ReadToEnd();
+                    throw new GitLabException($"Cannot add submodule: {error}");
+                }
 
                 submodules.Add(subModuleProject.Name);
             }