@isentinel/jest-roblox 0.2.1 → 0.2.2

package/plugin/out/shared/runner.luau

@@ -3,6 +3,7 @@ local HttpService = game:GetService("HttpService")
 local LogService = game:GetService("LogService")
 
 local InstanceResolver = require(script.Parent:FindFirstChild('instance-resolver'))
+local SetupTiming = require(script.Parent:FindFirstChild('setup-timing'))
 local SnapshotPatch = require(script.Parent:FindFirstChild('snapshot-patch'))
 
 type Config = {
@@ -133,6 +134,12 @@ function module.run(callingScript: LuaSourceContainer, config: Config): (string,
 		end
 		local t_resolveSetupFiles = os.clock()
 
+		local setupTimingState = SetupTiming.patch(
+			findValue,
+			config.setupFiles :: any,
+			config.setupFilesAfterEnv :: any
+		)
+
 		-- Strip private keys before Jest.runCLI (safe: single-task execution per VM)
 		config._timing = nil :: any
 		config._coverage = nil :: any
@@ -142,14 +149,29 @@ function module.run(callingScript: LuaSourceContainer, config: Config): (string,
 		end
 
 		local t_jestRunCLI0 = os.clock()
-		local jestResult = Jest.runCLI(callingScript, config, projects):expect()
+		local runCLIOk, runCLIValue = pcall(function()
+			return Jest.runCLI(callingScript, config, projects):expect()
+		end)
 		local t_jestRunCLI = os.clock()
 
+		local setupSeconds = SetupTiming.getSeconds(setupTimingState)
+		SetupTiming.unpatch(setupTimingState)
+
+		if not runCLIOk then
+			error(runCLIValue, 0)
+		end
+
+		local jestResult = runCLIValue
+
 		local result: { [string]: any } = {
 			success = true,
 			value = jestResult,
 		}
 
+		if setupSeconds > 0 then
+			result._setup = setupSeconds
+		end
+
 		if timingEnabled then
 			result._timing = {
 				findJest = t_findJest - t_findJest0,
@@ -230,4 +252,50 @@ function module.run(callingScript: LuaSourceContainer, config: Config): (string,
 	return jestResult, if logSuccess then logHistory else "[]"
 end
 
+type ProjectEntry = {
+	jestOutput: string,
+	gameOutput: string,
+	elapsedMs: number,
+}
+
+local function encodeExecutionError(err: any): string
+	return HttpService:JSONEncode({
+		success = true,
+		value = {
+			kind = "ExecutionError",
+			error = tostring(err),
+		},
+	})
+end
+
+-- TODO(runner-tests): dogfood harness for Runner.runProjects
+function module.runProjects(
+	callingScript: LuaSourceContainer,
+	configs: { Config }
+): { ProjectEntry }
+	local entries: { ProjectEntry } = {}
+
+	for index, cfg in configs do
+		local start = os.clock()
+		local ok, jestOutput, gameOutput = pcall(module.run, callingScript, cfg)
+		local elapsedMs = math.floor((os.clock() - start) * 1000)
+
+		if ok then
+			entries[index] = {
+				jestOutput = jestOutput :: string,
+				gameOutput = gameOutput :: string,
+				elapsedMs = elapsedMs,
+			}
+		else
+			entries[index] = {
+				jestOutput = encodeExecutionError(jestOutput),
+				gameOutput = "[]",
+				elapsedMs = elapsedMs,
+			}
+		end
+	end
+
+	return entries
+end
+
 return module

package/plugin/out/shared/setup-timing.luau

@@ -0,0 +1,89 @@
+--!strict
+local InstanceResolver = require(script.Parent:FindFirstChild('instance-resolver'))
+
+local module = {}
+
+export type PatchState = {
+	Runtime: any,
+	originalRequireModule: any,
+	accumulatedSeconds: { value: number },
+}
+
+function module.patch(
+	jestModule: ModuleScript,
+	setupFiles: { Instance }?,
+	setupFilesAfterEnv: { Instance }?
+): PatchState?
+	local setupSet: { [Instance]: boolean } = {}
+
+	if setupFiles then
+		for _, inst in setupFiles do
+			setupSet[inst] = true
+		end
+	end
+
+	if setupFilesAfterEnv then
+		for _, inst in setupFilesAfterEnv do
+			setupSet[inst] = true
+		end
+	end
+
+	if not next(setupSet) then
+		return nil
+	end
+
+	local jestRuntimeModule = InstanceResolver.findSiblingPackage(jestModule, "JestRuntime", "jest-runtime")
+	if not jestRuntimeModule then
+		warn("Could not find JestRuntime; setup timing unavailable")
+		return nil
+	end
+
+	local Runtime = (require :: any)(jestRuntimeModule)
+	local originalRequireModule = Runtime.requireModule
+	local accumulated = { value = 0 }
+	local insideSetupRequire = false
+
+	Runtime.requireModule = function(self: any, moduleName: any, ...): any
+		if not insideSetupRequire and typeof(moduleName) == "Instance" and setupSet[moduleName] then
+			insideSetupRequire = true
+			local t0 = os.clock()
+			local results = table.pack(pcall(originalRequireModule, self, moduleName, ...))
+			accumulated.value += os.clock() - t0
+			insideSetupRequire = false
+
+			if not results[1] then
+				error(results[2], 0)
+			end
+
+			return table.unpack(results, 2, results.n)
+		end
+
+		return originalRequireModule(self, moduleName, ...)
+	end
+
+	return {
+		Runtime = Runtime,
+		originalRequireModule = originalRequireModule,
+		accumulatedSeconds = accumulated,
+	}
+end
+
+function module.unpatch(state: PatchState?)
+	if not state then
+		return
+	end
+
+	if state.Runtime and state.originalRequireModule then
+		state.Runtime.requireModule = state.originalRequireModule
+	end
+end
+
+function module.getSeconds(state: PatchState?): number
+	if not state then
+		return 0
+	end
+
+	return state.accumulatedSeconds.value
+end
+
+return module

package/plugin/src/init.server.luau

@@ -4,7 +4,7 @@ local ReplicatedStorage = game:GetService("ReplicatedStorage")
 local RunService = game:GetService("RunService")
 local StudioTestService = game:GetService("StudioTestService")
 
-if RunService:IsRunning() then
+if not RunService:IsEdit() then
 	return
 end
 

package/plugin/src/test-in-run-mode.server.luau

@@ -8,7 +8,17 @@ if not RunService:IsRunning() then
 end
 
 local testArgs = StudioTestService:GetTestArgs()
-if not testArgs or not testArgs.test then
+if testArgs == nil then
+	for _ = 1, 50 do
+		task.wait(0.1)
+		testArgs = StudioTestService:GetTestArgs()
+		if testArgs ~= nil then
+			break
+		end
+	end
+end
+
+if testArgs == nil or testArgs.configs == nil then
 	return
 end
 
@@ -28,9 +38,9 @@ if not loadStringEnabled then
 end
 
 local Runner = require(script.Parent.shared.runner)
-local jestOutput, gameOutput = Runner.run(script, testArgs.config or {})
+local entries = Runner.runProjects(script, testArgs.configs)
 
 StudioTestService:EndTest({
-	jestOutput = jestOutput,
-	gameOutput = gameOutput,
+	jestOutput = HttpService:JSONEncode({ entries = entries }),
+	gameOutput = "[]",
 })