Update Digital Credentials WebDriver tests to use BiDi, add cleanup and complex data tests

Author: mohamedamir

digital-credentials/webdriver/create.https.html

@@ -11,26 +11,44 @@
 
   promise_test(async (t) => {
     const responseData = "test-create-response-data";
-    await test_driver.set_virtual_wallet_response(responseData);
+    await test_driver.set_virtual_wallet_behavior("respond", "openid4vci", { "value": responseData });
+    t.add_cleanup(() => test_driver.set_virtual_wallet_behavior("clear"));
     await test_driver.bless("user activation");
 
     const options = makeCreateOptions({ protocol: "openid4vci" });
     const result = await navigator.credentials.create(options);
 
     assert_equals(result.protocol, "openid4vci");
-    assert_equals(result.data, responseData);
+    assert_equals(result.data.value, responseData);
   }, "navigator.credentials.create() with respond mode should resolve with the specified data.");
 
   promise_test(async (t) => {
-    await test_driver.set_virtual_wallet_to_decline();
+    const complexData = { "a": 1, "b": [2, 3], "c": { "d": 4 } };
+    await test_driver.set_virtual_wallet_behavior("respond", "openid4vci", complexData);
+    t.add_cleanup(() => test_driver.set_virtual_wallet_behavior("clear"));
+    await test_driver.bless("user activation");
+
+    const options = makeCreateOptions({ protocol: "openid4vci" });
+    const result = await navigator.credentials.create(options);
+
+    assert_equals(result.protocol, "openid4vci");
+    assert_equals(result.data.a, 1);
+    assert_array_equals(result.data.b, [2, 3]);
+    assert_equals(result.data.c.d, 4);
+  }, "navigator.credentials.create() with complex data response should resolve with structured data.");
+
+  promise_test(async (t) => {
+    await test_driver.set_virtual_wallet_behavior("decline");
+    t.add_cleanup(() => test_driver.set_virtual_wallet_behavior("clear"));
     await test_driver.bless("user activation");
 
     const options = makeCreateOptions({ protocol: "openid4vci" });
     await promise_rejects_dom(t, "NotAllowedError", navigator.credentials.create(options));
   }, "navigator.credentials.create() with decline mode should reject with NotAllowedError.");
 
   promise_test(async (t) => {
-    await test_driver.set_virtual_wallet_to_wait();
+    await test_driver.set_virtual_wallet_behavior("wait");
+    t.add_cleanup(() => test_driver.set_virtual_wallet_behavior("clear"));
     await test_driver.bless("user activation");
 
     const controller = new AbortController();

digital-credentials/webdriver/get.https.html

@@ -11,26 +11,44 @@
 
   promise_test(async (t) => {
     const responseData = "test-response-data";
-    await test_driver.set_virtual_wallet_response(responseData);
+    await test_driver.set_virtual_wallet_behavior("respond", "openid4vp-v1-unsigned", { "value": responseData });
+    t.add_cleanup(() => test_driver.set_virtual_wallet_behavior("clear"));
     await test_driver.bless("user activation");
 
     const options = makeGetOptions({ protocol: "openid4vp-v1-unsigned" });
     const result = await navigator.credentials.get(options);
 
     assert_equals(result.protocol, "openid4vp-v1-unsigned");
-    assert_equals(result.data, responseData);
+    assert_equals(result.data.value, responseData);
   }, "navigator.credentials.get() with respond mode should resolve with the specified data.");
 
   promise_test(async (t) => {
-    await test_driver.set_virtual_wallet_to_decline();
+    const complexData = { "a": 1, "b": [2, 3], "c": { "d": 4 } };
+    await test_driver.set_virtual_wallet_behavior("respond", "openid4vp-v1-unsigned", complexData);
+    t.add_cleanup(() => test_driver.set_virtual_wallet_behavior("clear"));
+    await test_driver.bless("user activation");
+
+    const options = makeGetOptions({ protocol: "openid4vp-v1-unsigned" });
+    const result = await navigator.credentials.get(options);
+
+    assert_equals(result.protocol, "openid4vp-v1-unsigned");
+    assert_equals(result.data.a, 1);
+    assert_array_equals(result.data.b, [2, 3]);
+    assert_equals(result.data.c.d, 4);
+  }, "navigator.credentials.get() with complex data response should resolve with structured data.");
+
+  promise_test(async (t) => {
+    await test_driver.set_virtual_wallet_behavior("decline");
+    t.add_cleanup(() => test_driver.set_virtual_wallet_behavior("clear"));
     await test_driver.bless("user activation");
 
     const options = makeGetOptions({ protocol: "openid4vp-v1-unsigned" });
     await promise_rejects_dom(t, "NotAllowedError", navigator.credentials.get(options));
   }, "navigator.credentials.get() with decline mode should reject with NotAllowedError.");
 
   promise_test(async (t) => {
-    await test_driver.set_virtual_wallet_to_wait();
+    await test_driver.set_virtual_wallet_behavior("wait");
+    t.add_cleanup(() => test_driver.set_virtual_wallet_behavior("clear"));
     await test_driver.bless("user activation");
 
     const controller = new AbortController();

resources/testdriver.js

@@ -1986,59 +1986,22 @@
         },
 
         /**
-         * Sets the response for the next digital credentials request.
+         * Sets the behavior for the virtual wallet.
          *
-         * Matches the `Set Wallet Response
-         * <https://github.com/w3c-fedid/digital-credentials/pull/381>`_
-         * WebDriver command.
-         *
-         * @param {String} data - The data to be returned by the wallet.
-         * @param {WindowProxy} context - Browsing context in which
-         *                                to run the call, or null for the current
-         *                                browsing context.
-         *
-         * @returns {Promise} Fulfilled after the response has been set,
-         *                    or rejected in case the WebDriver command errors.
-         */
-        set_virtual_wallet_response: function(data, context=null) {
-          return window.test_driver_internal.set_virtual_wallet_response(data, context);
-        },
-
-        /**
-         * Sets the virtual wallet to wait indefinitely for the next digital credentials request.
+         * Matches the `Set Virtual Wallet Behavior`
+         * WebDriver BiDi command in Digital Credentials spec.
          *
-         * Matches the `Set Wallet to Wait
-         * <https://github.com/w3c-fedid/digital-credentials/pull/381>`_
-         * WebDriver command.
-         *
-         * @param {WindowProxy} context - Browsing context in which
-         *                                to run the call, or null for the current
-         *                                browsing context.
+         * @param {String} action - The action to take ("decline", "respond", "wait", "clear").
+         * @param {String} [protocol=null] - The protocol requested (required for "respond").
+         * @param {Object} [response=null] - The response data (optional for "respond").
+         * @param {WindowProxy} [context=null] - Browsing context in which to run the call.
          *
-         * @returns {Promise} Fulfilled after the wallet has been set to wait,
-         *                    or rejected in case the WebDriver command errors.
+         * @returns {Promise} Fulfilled after the behavior has been set.
          */
-        set_virtual_wallet_to_wait: function(context=null) {
-          return window.test_driver_internal.set_virtual_wallet_to_wait(context);
+        set_virtual_wallet_behavior: function(action, protocol=null, response=null, context=null) {
+          return window.test_driver_internal.set_virtual_wallet_behavior(action, protocol, response, context);
         },
 
-        /**
-         * Sets the virtual wallet to decline the next digital credentials request.
-         *
-         * Matches the `Set Wallet to Decline
-         * <https://github.com/w3c-fedid/digital-credentials/pull/381>`_
-         * WebDriver command.
-         *
-         * @param {WindowProxy} context - Browsing context in which
-         *                                to run the call, or null for the current
-         *                                browsing context.
-         *
-         * @returns {Promise} Fulfilled after the wallet has been set to decline,
-         *                    or rejected in case the WebDriver command errors.
-         */
-        set_virtual_wallet_to_decline: function(context=null) {
-          return window.test_driver_internal.set_virtual_wallet_to_decline(context);
-        },
 
         /**
          * Creates a virtual sensor for use with the Generic Sensors APIs.
@@ -2750,17 +2713,10 @@
             throw new Error("reset_fedcm_cooldown() is not implemented by testdriver-vendor.js");
         },
 
-        async set_virtual_wallet_response(data, context=null) {
-            throw new Error("set_virtual_wallet_response() is not implemented by testdriver-vendor.js");
+        async set_virtual_wallet_behavior(action, protocol=null, response=null, context=null) {
+            throw new Error("set_virtual_wallet_behavior() is not implemented by testdriver-vendor.js");
         },
 
-        async set_virtual_wallet_to_wait(context=null) {
-            throw new Error("set_virtual_wallet_to_wait() is not implemented by testdriver-vendor.js");
-        },
-
-        async set_virtual_wallet_to_decline(context=null) {
-            throw new Error("set_virtual_wallet_to_decline() is not implemented by testdriver-vendor.js");
-        },
 
         async create_virtual_sensor(sensor_type, sensor_params, context=null) {
             throw new Error("create_virtual_sensor() is not implemented by testdriver-vendor.js");

tools/wptrunner/wptrunner/executors/actions.py

@@ -441,41 +441,19 @@ def __call__(self, payload):
         return self.protocol.fedcm.reset_fedcm_cooldown()
 
 
-class SetVirtualWalletResponseAction:
-    name = "set_virtual_wallet_response"
+class SetVirtualWalletBehaviorAction:
+    name = "set_virtual_wallet_behavior"
 
     def __init__(self, logger, protocol):
         self.logger = logger
         self.protocol = protocol
 
     def __call__(self, payload):
-        data = payload["data"]
-        self.logger.debug("Setting virtual wallet response to %s" % data)
-        return self.protocol.digital_credentials.set_virtual_wallet_response(data)
-
-
-class SetVirtualWalletToWaitAction:
-    name = "set_virtual_wallet_to_wait"
-
-    def __init__(self, logger, protocol):
-        self.logger = logger
-        self.protocol = protocol
-
-    def __call__(self, payload):
-        self.logger.debug("Setting virtual wallet to wait")
-        return self.protocol.digital_credentials.set_virtual_wallet_to_wait()
-
-
-class SetVirtualWalletToDeclineAction:
-    name = "set_virtual_wallet_to_decline"
-
-    def __init__(self, logger, protocol):
-        self.logger = logger
-        self.protocol = protocol
-
-    def __call__(self, payload):
-        self.logger.debug("Setting virtual wallet to decline")
-        return self.protocol.digital_credentials.set_virtual_wallet_to_decline()
+        action = payload["action"]
+        protocol = payload.get("protocol")
+        response = payload.get("response")
+        self.logger.debug("Setting virtual wallet behavior to %s" % action)
+        return self.protocol.digital_credentials.set_virtual_wallet_behavior(action, protocol, response)
 
 
 class CreateVirtualSensorAction:
@@ -690,9 +668,7 @@ def __call__(self, payload):
            GetFedCMDialogTypeAction,
            SetFedCMDelayEnabledAction,
            ResetFedCMCooldownAction,
-           SetVirtualWalletResponseAction,
-           SetVirtualWalletToWaitAction,
-           SetVirtualWalletToDeclineAction,
+           SetVirtualWalletBehaviorAction,
            CreateVirtualSensorAction,
            UpdateVirtualSensorAction,
            RemoveVirtualSensorAction,

tools/wptrunner/wptrunner/executors/executorwebdriver.py

@@ -933,15 +933,16 @@ class WebDriverDigitalCredentialsProtocolPart(DigitalCredentialsProtocolPart):
     def setup(self):
         self.webdriver = self.parent.webdriver
 
-    def set_virtual_wallet_response(self, data):
-        body = {"data": data}
-        return self.webdriver.send_session_command("POST", "digital-credentials/response", body)
-
-    def set_virtual_wallet_to_wait(self):
-        return self.webdriver.send_session_command("POST", "digital-credentials/response_wait")
-
-    def set_virtual_wallet_to_decline(self):
-        return self.webdriver.send_session_command("POST", "digital-credentials/response_decline")
+    def set_virtual_wallet_behavior(self, action, protocol=None, response=None):
+        params = {"action": action}
+        if protocol is not None:
+            params["protocol"] = protocol
+        if response is not None:
+            params["response"] = response
+
+        return self.parent.loop.run_until_complete(
+            self.webdriver.bidi_session.send_command("digitalCredentials.setVirtualWalletBehavior", params)
+        )
 
 
 class WebDriverDebugProtocolPart(DebugProtocolPart):

tools/wptrunner/wptrunner/executors/protocol.py

@@ -1152,20 +1152,12 @@ class DigitalCredentialsProtocolPart(ProtocolPart):
     name = "digital_credentials"
 
     @abstractmethod
-    def set_virtual_wallet_response(self, data):
-        """Set the virtual wallet response
+    def set_virtual_wallet_behavior(self, action, protocol=None, response=None):
+        """Set the virtual wallet behavior
 
-        :param str data: The response data to set"""
-        pass
-
-    @abstractmethod
-    def set_virtual_wallet_to_wait(self):
-        """Set the virtual wallet to wait indefinitely"""
-        pass
-
-    @abstractmethod
-    def set_virtual_wallet_to_decline(self):
-        """Set the virtual wallet to decline"""
+        :param str action: The action to take ("decline", "respond", "wait", "clear")
+        :param str protocol: The protocol requested (required for "respond")
+        :param dict response: The response data (optional for "respond")"""
         pass
 
 

tools/wptrunner/wptrunner/testdriver-extra.js

@@ -655,19 +655,10 @@
         return create_context_action("reset_fedcm_cooldown", context, {});
     };
 
-    window.test_driver_internal.set_virtual_wallet_response = function(data, context=null) {
-        return create_context_action("set_virtual_wallet_response", context, {data});
+    window.test_driver_internal.set_virtual_wallet_behavior = function(action, protocol=null, response=null, context=null) {
+        return create_context_action("set_virtual_wallet_behavior", context, {action, protocol, response});
     };
 
-    window.test_driver_internal.set_virtual_wallet_to_wait = function(context=null) {
-        return create_context_action("set_virtual_wallet_to_wait", context, {});
-    };
-
-    window.test_driver_internal.set_virtual_wallet_to_decline = function(context=null) {
-        return create_context_action("set_virtual_wallet_to_decline", context, {});
-    };
-
-
     window.test_driver_internal.create_virtual_sensor = function(sensor_type, sensor_params={}, context=null) {
         return create_context_action("create_virtual_sensor", context, {sensor_type, sensor_params});
     };