tmp

Author: fjtrujy

Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/SwiftTesting/Tests/CheckTests.swift

@@ -1,12 +1,16 @@
 import Testing
 import JavaScriptKit
+import JavaScriptEventLoop
 
 @Test func expectToBeTrue() async throws {
     let expectToBeTrue = #require(JSObject.global.expectToBeTrue.function)
-    let result = expectToBeTrue.callAsFunction().boolean
-    #expect(result == true)
-}
 
-enum TestError: Error {
-    case nilResult(String)
+    // expectToBeTrue returns a Promise, so we need to await it
+    let promiseObject = try #require(expectToBeTrue.callAsFunction().object)
+    let promise = try #require(JSPromise(promiseObject))
+
+    let resultValue = try await promise.value
+    let result = try #require(resultValue.boolean)
+
+    #expect(result)
 }

Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/XCTest/Tests/CheckTests.swift

@@ -1,13 +1,23 @@
 import XCTest
 import JavaScriptKit
+import JavaScriptEventLoop
 
 final class CheckTests: XCTestCase {
     func testExpectToBeTrue() async throws {
         guard let expectToBeTrue = JSObject.global.expectToBeTrue.function
         else { return XCTFail("Function expectToBeTrue not found") }
-        let result = expectToBeTrue().boolean
-        guard let result
+
+        // expectToBeTrue returns a Promise, so we need to await it
+        guard let promiseObject = expectToBeTrue().object
+        else { return XCTFail("expectToBeTrue() did not return an object") }
+
+        guard let promise = JSPromise(promiseObject)
+        else { return XCTFail("expectToBeTrue() did not return a Promise") }
+
+        let resultValue = try await promise.value
+        guard let result = resultValue.boolean
         else { return XCTFail("expectToBeTrue() returned nil") }
+
         XCTAssertTrue(result)
     }
 }

Plugins/PackageToJS/Templates/bin/test.js

@@ -96,6 +96,7 @@ Hint: This typically means that a continuation leak occurred.
     },
     browser: async ({ preludeScript }) => {
         const onPageLoad = (page) => {
+            console.log("===> onPageLoad")
             page.exposeFunction("expectToBeTrue", () => {
                 return true;
             });

Plugins/PackageToJS/Templates/test.js

@@ -100,8 +100,16 @@ Please run the following command to install it:
     const context = await browser.newContext();
     const page = await context.newPage();
     // Allow the user to customize the page before it's loaded, for defining custom export functions
-    if (options.playwright?.onPageLoad) { await options.playwright.onPageLoad(page); }
+    if (options.playwright?.onPageLoad) { 
+        console.log("===> onPageLoad 2")
+        await options.playwright.onPageLoad(page); 
+    }
 
+    // Forward console messages in the page to the Node.js console
+    page.on("console", (message) => {
+        console.log(message.text());
+    });
+    
     const onExit = new Promise((resolve) => {
         page.exposeFunction("exitTest", resolve);
     });

Plugins/PackageToJS/Tests/ExampleTests.swift

@@ -411,10 +411,13 @@ extension Trait where Self == ConditionTrait {
         try withPackage(
             at: "Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/XCTest",
             assertTerminationStatus: { $0 == 0 }
-        ) { packageDir, _, runSwift in
+        ) { packageDir, runProcess, runSwift in
+            try runProcess(which("npm"), ["install"], [:])
+            try runProcess(which("npx"), ["playwright", "install", "chromium-headless-shell"], [:])
+
             try runSwift(
                 ["package", "--disable-sandbox"] + Self.stackSizeLinkerFlags + [
-                    "--swift-sdk", swiftSDKID, "js", "test",
+                    "--swift-sdk", swiftSDKID, "js", "test", "--environment", "browser",
                 ],
                 [:]
             )
@@ -429,8 +432,14 @@ extension Trait where Self == ConditionTrait {
         try withPackage(
             at: "Plugins/PackageToJS/Fixtures/PlaywrightOnPageLoadTest/SwiftTesting",
             assertTerminationStatus: { $0 == 0 }
-        ) { packageDir, _, runSwift in
-            try runSwift(["package", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test"], [:])
+        ) { packageDir, runProcess, runSwift in
+            try runProcess(which("npm"), ["install"], [:])
+            try runProcess(which("npx"), ["playwright", "install", "chromium-headless-shell"], [:])
+
+            try runSwift(
+                ["package", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test", "--environment", "browser"],
+                [:]
+            )
         }
     }
     #endif