Update test to pass --no-restore to templates

mlorbetske · mlorbetske · commit ea467db3afb5 · 2017-07-10T16:27:54.000-07:00
diff --git a/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs b/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs
@@ -47,7 +47,7 @@ public override bool Execute()
                 {
                     ToolPath = ToolPath,
                     TemplateType = newArgs[0],
-                    TemplateArgs = newArgs[1] + $" --debug:ephemeral-hive -n TempProject -o \"{outputDir}\"",
+                    TemplateArgs = newArgs[1] + $" --debug:ephemeral-hive -n TempProject -o \"{outputDir}\" --no-restore",
                     HostObject = HostObject,
                     BuildEngine = BuildEngine
                 };
diff --git a/src/dotnet/commands/dotnet-migrate/DotnetNewRedirector.cs b/src/dotnet/commands/dotnet-migrate/DotnetNewRedirector.cs
@@ -15,7 +15,7 @@ public void CreateWithEphemeralHiveAndNoRestore(
             string outputDirectory,
             string workingDirectory)
         {
-            RunCommand("new", new string[] { "console", "-o", workingDirectory, "--debug:ephemeral-hive" }, workingDirectory);
+            RunCommand("new", new string[] { "console", "-o", workingDirectory, "--debug:ephemeral-hive", "--no-restore" }, workingDirectory);
         }
         private void RunCommand(string commandToExecute, IEnumerable<string> args, string workingDirectory)
         {
diff --git a/test/EndToEnd/GivenDotNetUsesMSBuild.cs b/test/EndToEnd/GivenDotNetUsesMSBuild.cs
@@ -19,7 +19,7 @@ public void ItCanNewRestoreBuildRunCleanMSBuildProject()
             {
                 string projectDirectory = directory.Path;
 
-                string newArgs = "console -f netcoreapp2.0 --debug:ephemeral-hive";
+                string newArgs = "console -f netcoreapp2.0 --debug:ephemeral-hive --no-restore";
                 new NewCommandShim()
                     .WithWorkingDirectory(projectDirectory)
                     .Execute(newArgs)
diff --git a/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs b/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs
@@ -68,7 +68,7 @@ private ProjDir NewLib(string dir = null, [System.Runtime.CompilerServices.Calle
 
             try
             {
-                string args = $"classlib -o \"{projDir.Path}\" --debug:ephemeral-hive";
+                string args = $"classlib -o \"{projDir.Path}\" --debug:ephemeral-hive --no-restore";
                 new NewCommandShim()
                     .WithWorkingDirectory(projDir.Path)
                     .ExecuteWithCapturedOutput(args)
diff --git a/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs b/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
@@ -93,7 +93,7 @@ public void ItRunsWhenRestoringToSpecificPackageDir()
             string dir = "pkgs";
             string args = $"--packages {dir}";
 
-            string newArgs = $"console -f netcoreapp2.0 -o \"{rootPath}\" --debug:ephemeral-hive";
+            string newArgs = $"console -f netcoreapp2.0 -o \"{rootPath}\" --debug:ephemeral-hive --no-restore";
             new NewCommandShim()
                 .WithWorkingDirectory(rootPath)
                 .Execute(newArgs)
diff --git a/test/dotnet-list-reference.Tests/GivenDotnetListReference.cs b/test/dotnet-list-reference.Tests/GivenDotnetListReference.cs
@@ -209,7 +209,7 @@ private ProjDir NewLib(string testProjectName = "temp", [System.Runtime.Compiler
 
             try
             {
-                string newArgs = $"classlib -o \"{dir.Path}\" --debug:ephemeral-hive";
+                string newArgs = $"classlib -o \"{dir.Path}\" --debug:ephemeral-hive --no-restore";
                 new NewCommandShim()
                     .WithWorkingDirectory(dir.Path)
                     .ExecuteWithCapturedOutput(newArgs)
diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs
@@ -21,13 +21,13 @@ public void When_dotnet_new_is_invoked_mupliple_times_it_should_fail()
 
             new NewCommand()
                 .WithWorkingDirectory(rootPath)
-                .Execute($"console --debug:ephemeral-hive");
+                .Execute($"console --debug:ephemeral-hive --no-restore");
 
             DateTime expectedState = Directory.GetLastWriteTime(rootPath);
 
             var result = new NewCommand()
                 .WithWorkingDirectory(rootPath)
-                .ExecuteWithCapturedOutput($"console --debug:ephemeral-hive");
+                .ExecuteWithCapturedOutput($"console --debug:ephemeral-hive --no-restore");
 
             DateTime actualState = Directory.GetLastWriteTime(rootPath);
 
@@ -64,7 +64,7 @@ private void CreateAndRestoreNewProject(
 
             new NewCommand()
                 .WithWorkingDirectory(projectFolder)
-                .Execute($"{projectType} --debug:ephemeral-hive")
+                .Execute($"{projectType} --debug:ephemeral-hive --no-restore")
                 .Should().Pass();
 
             // https://github.com/dotnet/templating/issues/946 - remove DisableImplicitAssetTargetFallback once this is fixed.
@@ -87,7 +87,7 @@ public void NewProjectRestoresCorrectPackageVersion(string type, string property
 
             new NewCommand()
                 .WithWorkingDirectory(rootPath)
-                .Execute($"{type} --name {projectName} -o . --debug:ephemeral-hive")
+                .Execute($"{type} --name {projectName} -o . --debug:ephemeral-hive --no-restore")
                 .Should().Pass();
 
             new RestoreCommand()
diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs
@@ -42,9 +42,11 @@ public void TemplateRestoresAndBuildsWithoutWarnings(
             bool skipSpaWebpackSteps)
         {
             string rootPath = TestAssets.CreateTestDirectory(identifier: $"{language}_{projectType}").FullName;
+            //This works around the SPA templates not currently supporting the "--no-restore" switch
+            string noRestoreDirective = skipSpaWebpackSteps ? "" : "--no-restore";
 
             new TestCommand("dotnet") { WorkingDirectory = rootPath }
-                .Execute($"new {projectType} -lang {language} -o {rootPath} --debug:ephemeral-hive")
+                .Execute($"new {projectType} -lang {language} -o {rootPath} --debug:ephemeral-hive {noRestoreDirective}")
                 .Should().Pass();
 
             if (useNuGetConfigForAspNet)
diff --git a/test/dotnet-pack.Tests/PackTests.cs b/test/dotnet-pack.Tests/PackTests.cs
@@ -245,7 +245,7 @@ public void ItPacksAppWhenRestoringToSpecificPackageDirectory()
             string dir = "pkgs";
             string args = $"--packages {dir}";
 
-            string newArgs = $"console -o \"{rootPath}\"";
+            string newArgs = $"console -o \"{rootPath}\" --no-restore";
             new NewCommandShim()
                 .WithWorkingDirectory(rootPath)
                 .Execute(newArgs)
diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs
@@ -206,7 +206,7 @@ public void ItPublishesAppWhenRestoringToSpecificPackageDirectory()
             string dir = "pkgs";
             string args = $"--packages {dir}";
 
-            string newArgs = $"console -o \"{rootPath}\"";
+            string newArgs = $"console -o \"{rootPath}\" --no-restore";
             new NewCommandShim()
                 .WithWorkingDirectory(rootPath)
                 .Execute(newArgs)
diff --git a/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs b/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs
@@ -65,7 +65,7 @@ private ProjDir NewLib(string dir = null, [System.Runtime.CompilerServices.Calle
 
             try
             {
-                string newArgs = $"classlib -o \"{projDir.Path}\"";
+                string newArgs = $"classlib -o \"{projDir.Path}\" --no-restore";
                 new NewCommandShim()
                     .WithWorkingDirectory(projDir.Path)
                     .ExecuteWithCapturedOutput(newArgs)
diff --git a/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs b/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs
@@ -24,7 +24,7 @@ public void ItRestoresAppToSpecificDirectory()
             string dir = "pkgs";
             string fullPath = Path.GetFullPath(Path.Combine(rootPath, dir));
 
-            string newArgs = $"console -o \"{rootPath}\"";
+            string newArgs = $"console -o \"{rootPath}\" --no-restore";
             new NewCommandShim()
                 .WithWorkingDirectory(rootPath)
                 .Execute(newArgs)
@@ -51,7 +51,7 @@ public void ItRestoresLibToSpecificDirectory()
             string dir = "pkgs";
             string fullPath = Path.GetFullPath(Path.Combine(rootPath, dir));
 
-            string newArgs = $"classlib -o \"{rootPath}\"";
+            string newArgs = $"classlib -o \"{rootPath}\" --no-restore";
             new NewCommandShim()
                 .WithWorkingDirectory(rootPath)
                 .Execute(newArgs)
@@ -98,7 +98,7 @@ public void ItRestoresWithTheSpecifiedVerbosity()
             string dir = "pkgs";
             string fullPath = Path.GetFullPath(Path.Combine(rootPath, dir));
 
-            string newArgs = $"console -o \"{rootPath}\"";
+            string newArgs = $"console -o \"{rootPath}\" --no-restore";
             new NewCommandShim()
                 .WithWorkingDirectory(rootPath)
                 .Execute(newArgs)
diff --git a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs
@@ -198,7 +198,7 @@ public void ItRunsAppWhenRestoringToSpecificPackageDirectory()
             string dir = "pkgs";
             string args = $"--packages {dir}";
 
-            string newArgs = $"console -o \"{rootPath}\"";
+            string newArgs = $"console -o \"{rootPath}\" --no-restore";
             new NewCommandShim()
                 .WithWorkingDirectory(rootPath)
                 .Execute(newArgs)

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public override bool Execute()`
`47`	`47`	`{`
`48`	`48`	`ToolPath = ToolPath,`
`49`	`49`	`TemplateType = newArgs[0],`
`50`		`- TemplateArgs = newArgs[1] + $" --debug:ephemeral-hive -n TempProject -o \"{outputDir}\"",`
	`50`	`+ TemplateArgs = newArgs[1] + $" --debug:ephemeral-hive -n TempProject -o \"{outputDir}\" --no-restore",`
`51`	`51`	`HostObject = HostObject,`
`52`	`52`	`BuildEngine = BuildEngine`
`53`	`53`	`};`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public void CreateWithEphemeralHiveAndNoRestore(`
`15`	`15`	`string outputDirectory,`
`16`	`16`	`string workingDirectory)`
`17`	`17`	`{`
`18`		`- RunCommand("new", new string[] { "console", "-o", workingDirectory, "--debug:ephemeral-hive" }, workingDirectory);`
	`18`	`+ RunCommand("new", new string[] { "console", "-o", workingDirectory, "--debug:ephemeral-hive", "--no-restore" }, workingDirectory);`
`19`	`19`	`}`
`20`	`20`	`private void RunCommand(string commandToExecute, IEnumerable<string> args, string workingDirectory)`
`21`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public void ItCanNewRestoreBuildRunCleanMSBuildProject()`
`19`	`19`	`{`
`20`	`20`	`string projectDirectory = directory.Path;`
`21`	`21`
`22`		`- string newArgs = "console -f netcoreapp2.0 --debug:ephemeral-hive";`
	`22`	`+ string newArgs = "console -f netcoreapp2.0 --debug:ephemeral-hive --no-restore";`
`23`	`23`	`new NewCommandShim()`
`24`	`24`	`.WithWorkingDirectory(projectDirectory)`
`25`	`25`	`.Execute(newArgs)`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ private ProjDir NewLib(string dir = null, [System.Runtime.CompilerServices.Calle`
`68`	`68`
`69`	`69`	`try`
`70`	`70`	`{`
`71`		`- string args = $"classlib -o \"{projDir.Path}\" --debug:ephemeral-hive";`
	`71`	`+ string args = $"classlib -o \"{projDir.Path}\" --debug:ephemeral-hive --no-restore";`
`72`	`72`	`new NewCommandShim()`
`73`	`73`	`.WithWorkingDirectory(projDir.Path)`
`74`	`74`	`.ExecuteWithCapturedOutput(args)`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ private ProjDir NewLib(string testProjectName = "temp", [System.Runtime.Compiler`
`209`	`209`
`210`	`210`	`try`
`211`	`211`	`{`
`212`		`- string newArgs = $"classlib -o \"{dir.Path}\" --debug:ephemeral-hive";`
	`212`	`+ string newArgs = $"classlib -o \"{dir.Path}\" --debug:ephemeral-hive --no-restore";`
`213`	`213`	`new NewCommandShim()`
`214`	`214`	`.WithWorkingDirectory(dir.Path)`
`215`	`215`	`.ExecuteWithCapturedOutput(newArgs)`