From 5199ba0960615d6eec61faad6e56d29266cec731 Mon Sep 17 00:00:00 2001
From: Erica Marigold <hi@devcomp.xyz>
Date: Wed, 4 Dec 2024 06:27:20 +0000
Subject: [PATCH] chore(lune): fix test skipping

* Previously, skipping tests using arguments of selective files
  to include did not work correctly due to our directory structure.
  This has been fixed.
* On test skip, the reporter would tyr to get the style for the report
  with no timestamp argument, causing a string formatting with nil
  error. For skips, we force the timestamp to be zero now.
---
 .lune/tests/init.luau     | 16 +++++++++++-----
 .lune/tests/reporter.luau |  4 ++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.lune/tests/init.luau b/.lune/tests/init.luau
index 89cbbb1..8f6e7ba 100644
--- a/.lune/tests/init.luau
+++ b/.lune/tests/init.luau
@@ -49,13 +49,19 @@ for _, test in discoverTests("src") do
 	-- we run all the tests
 
 	-- So, to include only a certain set of test files, you can provide either
-	-- the full path to the test file (with or without the extension) or the test
-	-- file name
-	local withoutExt = string.sub(test, 1, -6)
+	-- the full path of the test file or name of the test file, with or without 
+	-- the `.spec.luau` extension
+	local baseName = string.match(test, "([^/\\]+)$")
+	
+	local withoutExt = string.sub(test, 1, -11)
+	local baseNameWithoutExt = string.match(withoutExt, "([^/\\]+)$")
+
 	local isAllowed = #process.args == 0
-		or table.find(allowedTests, `tests/{test}`)
+		or table.find(allowedTests, test)
 		or table.find(allowedTests, withoutExt)
-		or table.find(allowedTests, `tests/{withoutExt}`)
+		or table.find(allowedTests, baseName)
+		or table.find(allowedTests, baseNameWithoutExt)
+		
 
 	local constructors = {
 		case = frktest.test.case,
diff --git a/.lune/tests/reporter.luau b/.lune/tests/reporter.luau
index a209997..887851d 100644
--- a/.lune/tests/reporter.luau
+++ b/.lune/tests/reporter.luau
@@ -45,13 +45,13 @@ function ReporterExt.init()
                 if test.failed then "error" else "success",
 
                 -- Await receival of the timestamp and convert the difference to ms
-                (os.clock() - recv_ts()) * 1000
+               (os.clock() - recv_ts()) * 1000
             )
         )
     end)
 
     frktest.test.on_test_skipped(function(test)
-        print(STYLE.report(test.name, "skip"))
+        print(STYLE.report(test.name, "skip", 0))
     end)
 
     Reporter.init()