Added test with invalid global.json

seesharper · seesharper · commit 028449aba35a · 2020-08-10T23:51:00.000+02:00
diff --git a/src/Dotnet.Script.Tests/ScriptExecutionTests.cs b/src/Dotnet.Script.Tests/ScriptExecutionTests.cs
@@ -456,6 +456,15 @@ public void ShouldHandleScriptWithTargetFrameworkInShebang()
             Assert.Contains("Hello world!", result.output);
         }
 
+        [Fact]
+        public void ShouldIgnoreGlobalJsonInScriptFolder()
+        {
+            var fixture = "InvalidGlobalJson";
+            var workingDirectory = Path.GetDirectoryName(TestPathUtils.GetPathToTestFixture(fixture));
+            var result = ScriptTestRunner.Default.ExecuteFixture("InvalidGlobalJson", $"--no-cache", workingDirectory);
+            Assert.Contains("Hello world!", result.output);
+        }
+
 
         private static string CreateTestScript(string scriptFolder)
         {
diff --git a/src/Dotnet.Script.Tests/ScriptTestRunner.cs b/src/Dotnet.Script.Tests/ScriptTestRunner.cs
@@ -35,10 +35,10 @@ public int ExecuteInProcess(string arguments = null)
             return Program.Main(arguments?.Split(" ") ?? Array.Empty<string>());
         }
 
-        public (string output, int exitCode) ExecuteFixture(string fixture, string arguments = null)
+        public (string output, int exitCode) ExecuteFixture(string fixture, string arguments = null, string workingDirectory = null)
         {
             var pathToFixture = TestPathUtils.GetPathToTestFixture(fixture);
-            var result = ProcessHelper.RunAndCaptureOutput("dotnet", GetDotnetScriptArguments($"{pathToFixture} {arguments}"));
+            var result = ProcessHelper.RunAndCaptureOutput("dotnet", GetDotnetScriptArguments($"{pathToFixture} {arguments}"), workingDirectory);
             return result;
         }
 
diff --git a/src/Dotnet.Script.Tests/TestFixtures/InvalidGlobalJson/InvalidGlobalJson.csx b/src/Dotnet.Script.Tests/TestFixtures/InvalidGlobalJson/InvalidGlobalJson.csx
@@ -0,0 +1 @@
+Console.WriteLine("Hello world!");
diff --git a/src/Dotnet.Script.Tests/TestFixtures/InvalidGlobalJson/global.json b/src/Dotnet.Script.Tests/TestFixtures/InvalidGlobalJson/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "3.0.100"
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -456,6 +456,15 @@ public void ShouldHandleScriptWithTargetFrameworkInShebang()`
`456`	`456`	`Assert.Contains("Hello world!", result.output);`
`457`	`457`	`}`
`458`	`458`
	`459`	`+ [Fact]`
	`460`	`+ public void ShouldIgnoreGlobalJsonInScriptFolder()`
	`461`	`+ {`
	`462`	`+ var fixture = "InvalidGlobalJson";`
	`463`	`+ var workingDirectory = Path.GetDirectoryName(TestPathUtils.GetPathToTestFixture(fixture));`
	`464`	`+ var result = ScriptTestRunner.Default.ExecuteFixture("InvalidGlobalJson", $"--no-cache", workingDirectory);`
	`465`	`+ Assert.Contains("Hello world!", result.output);`
	`466`	`+ }`
	`467`	`+`
`459`	`468`
`460`	`469`	`private static string CreateTestScript(string scriptFolder)`
`461`	`470`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,10 @@ public int ExecuteInProcess(string arguments = null)`
`35`	`35`	`return Program.Main(arguments?.Split(" ") ?? Array.Empty<string>());`
`36`	`36`	`}`
`37`	`37`
`38`		`- public (string output, int exitCode) ExecuteFixture(string fixture, string arguments = null)`
	`38`	`+ public (string output, int exitCode) ExecuteFixture(string fixture, string arguments = null, string workingDirectory = null)`
`39`	`39`	`{`
`40`	`40`	`var pathToFixture = TestPathUtils.GetPathToTestFixture(fixture);`
`41`		`- var result = ProcessHelper.RunAndCaptureOutput("dotnet", GetDotnetScriptArguments($"{pathToFixture} {arguments}"));`
	`41`	`+ var result = ProcessHelper.RunAndCaptureOutput("dotnet", GetDotnetScriptArguments($"{pathToFixture} {arguments}"), workingDirectory);`
`42`	`42`	`return result;`
`43`	`43`	`}`
`44`	`44`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +  "sdk": {
 +    "version": "3.0.100"
 +  }
 +}