Clean up tests and react to feedbackcs/user-jwts-path-fix

3 files changed, 17 insertions, 39 deletions

diff --git a/src/Tools/dotnet-user-jwts/src/Helpers/DevJwtCliHelpers.cs b/src/Tools/dotnet-user-jwts/src/Helpers/DevJwtCliHelpers.cs
index e1f4c9da41..f91aaf90ec 100644
--- a/src/Tools/dotnet-user-jwts/src/Helpers/DevJwtCliHelpers.cs
+++ b/src/Tools/dotnet-user-jwts/src/Helpers/DevJwtCliHelpers.cs
@@ -32,7 +32,7 @@ internal static class DevJwtCliHelpers
             return projectPath;
         }
 
-        var csprojFiles = Directory.EnumerateFileSystemEntries(Directory.GetCurrentDirectory(), "*.*proj", SearchOption.AllDirectories)
+        var csprojFiles = Directory.EnumerateFileSystemEntries(Directory.GetCurrentDirectory(), "*.*proj", SearchOption.TopDirectoryOnly)
                 .Where(f => !".xproj".Equals(Path.GetExtension(f), StringComparison.OrdinalIgnoreCase))
                 .ToList();
         if (csprojFiles is [var path])
@@ -112,7 +112,7 @@ internal static class DevJwtCliHelpers
 
     public static List<string> GetAudienceCandidatesFromLaunchSettings(string project)
     {
-        if (project is null)
+        if (string.IsNullOrEmpty(project))
         {
             return new List<string>();
         }
diff --git a/src/Tools/dotnet-user-jwts/src/Resources.resx b/src/Tools/dotnet-user-jwts/src/Resources.resx
index 2413023ff7..fc6b74817e 100644
--- a/src/Tools/dotnet-user-jwts/src/Resources.resx
+++ b/src/Tools/dotnet-user-jwts/src/Resources.resx
@@ -295,7 +295,7 @@
     <value>Whether to show all details associated with the JWT.</value>
   </data>
   <data name="ProjectOption_ProjectNotFound" xml:space="preserve">
-    <value>No project found at `-p|--project` path, current directory, or child directories.</value>
+    <value>No project found at `-p|--project` path or current directory.</value>
   </data>
   <data name="ProjectOption_SercretIdNotFound" xml:space="preserve">
     <value>Project does not contain a user secrets ID.</value>
diff --git a/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs b/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs
index a18c8222f0..6d06d56a73 100644
--- a/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs
+++ b/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs
@@ -485,83 +485,61 @@ public class UserJwtsTests : IClassFixture<UserJwtsTestFixture>
     public void Create_CanHandleNoProjectOptionProvided()
     {
         var projectPath = _fixture.CreateProject();
-
-        Directory.SetCurrentDirectory(Path.Combine(projectPath, ".."));
+        Directory.SetCurrentDirectory(projectPath);
 
         var app = new Program(_console);
         app.Run(new[] { "create" });
 
-        Assert.DoesNotContain("No project found at `-p|--project` path, current directory, or child directories.", _console.GetOutput());
+        Assert.DoesNotContain("No project found at `-p|--project` path or current directory.", _console.GetOutput());
         Assert.Contains("New JWT saved", _console.GetOutput());
     }
 
     [Fact]
     public void Create_CanHandleNoProjectOptionProvided_WithNoProjects()
     {
-        var projectPath = _fixture.CreateProject();
-        var projectParent = Path.Combine(projectPath, "..");
-
-        Directory.Delete(projectParent, true);
-        Directory.CreateDirectory(projectParent);
-
-        Directory.SetCurrentDirectory(projectParent);
+        var path = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), "userjwtstest"));
+        Directory.SetCurrentDirectory(path.FullName);
 
         var app = new Program(_console);
         app.Run(new[] { "create" });
 
-        Assert.Contains("No project found at `-p|--project` path, current directory, or child directories.", _console.GetOutput());
+        Assert.Contains("No project found at `-p|--project` path or current directory.", _console.GetOutput());
         Assert.DoesNotContain(Resources.CreateCommand_NoAudience_Error, _console.GetOutput());
     }
 
     [Fact]
     public void Delete_CanHandleNoProjectOptionProvided_WithNoProjects()
     {
-        var projectPath = _fixture.CreateProject();
-        var projectParent = Path.Combine(projectPath, "..");
-
-        Directory.Delete(projectParent, true);
-        Directory.CreateDirectory(projectParent);
-
-        Directory.SetCurrentDirectory(projectParent);
+        var path = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), "userjwtstest"));
+        Directory.SetCurrentDirectory(path.FullName);
 
         var app = new Program(_console);
         app.Run(new[] { "remove", "some-id" });
 
-        Assert.Contains("No project found at `-p|--project` path, current directory, or child directories.", _console.GetOutput());
+        Assert.Contains("No project found at `-p|--project` path or current directory.", _console.GetOutput());
     }
 
     [Fact]
     public void Clear_CanHandleNoProjectOptionProvided_WithNoProjects()
     {
-        var projectPath = _fixture.CreateProject();
-        var projectParent = Path.Combine(projectPath, "..");
-
-        Directory.Delete(projectParent, true);
-        Directory.CreateDirectory(projectParent);
-
-        Directory.SetCurrentDirectory(projectParent);
+        var path = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), "userjwtstest"));
+        Directory.SetCurrentDirectory(path.FullName);
 
         var app = new Program(_console);
         app.Run(new[] { "clear" });
 
-        Assert.Contains("No project found at `-p|--project` path, current directory, or child directories.", _console.GetOutput());
+        Assert.Contains("No project found at `-p|--project` path or current directory.", _console.GetOutput());
     }
 
     [Fact]
     public void List_CanHandleNoProjectOptionProvided_WithNoProjects()
     {
-        var projectPath = _fixture.CreateProject();
-        var projectParent = Path.Combine(projectPath, "..");
-
-        Directory.Delete(projectParent, true);
-        Directory.CreateDirectory(projectParent);
-
-        Directory.SetCurrentDirectory(projectParent);
+        var path = Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), "userjwtstest"));
+        Directory.SetCurrentDirectory(path.FullName);
 
         var app = new Program(_console);
         app.Run(new[] { "list" });
 
-        Assert.Contains("No project found at `-p|--project` path, current directory, or child directories.", _console.GetOutput());
-        Console.WriteLine(_console.GetOutput());
+        Assert.Contains("No project found at `-p|--project` path or current directory.", _console.GetOutput());
     }
 }