test: move queryObjects to a CDP only tests (#11050)

test/TestExpectations.json

@@ -906,7 +906,7 @@
     "expectations": ["PASS"]
   },
   {
-    "testIdPattern": "[page.spec] Page ExecutionContext.queryObjects *",
+    "testIdPattern": "[queryObjects.spec] *",
     "platforms": ["darwin", "linux", "win32"],
     "parameters": ["chrome", "webDriverBiDi"],
     "expectations": ["PASS"]
@@ -2934,17 +2934,29 @@
     "expectations": ["FAIL"]
   },
   {
-    "testIdPattern": "[page.spec] Page ExecutionContext.queryObjects should work",
+    "testIdPattern": "[queryObjects.spec] page.queryObjects should work",
     "platforms": ["darwin", "linux", "win32"],
     "parameters": ["cdp", "firefox"],
     "expectations": ["FAIL"]
   },
   {
-    "testIdPattern": "[page.spec] Page ExecutionContext.queryObjects should work for non-trivial page",
+    "testIdPattern": "[queryObjects.spec] page.queryObjects should work for non-trivial page",
     "platforms": ["darwin", "linux", "win32"],
     "parameters": ["cdp", "firefox"],
     "expectations": ["FAIL"]
   },
+  {
+    "testIdPattern": "[queryObjects.spec] page.queryObjects should fail for disposed handles",
+    "platforms": ["darwin", "linux", "win32"],
+    "parameters": ["firefox", "webDriverBiDi"],
+    "expectations": ["PASS"]
+  },
+  {
+    "testIdPattern": "[queryObjects.spec] page.queryObjects should fail primitive values as prototypes",
+    "platforms": ["darwin", "linux", "win32"],
+    "parameters": ["firefox", "webDriverBiDi"],
+    "expectations": ["PASS"]
+  },
   {
     "testIdPattern": "[page.spec] Page Page.addScriptTag should throw when added with content to the CSP page",
     "platforms": ["darwin", "linux", "win32"],

test/src/cdp/queryObjects.spec.ts

@@ -0,0 +1,118 @@
+/**
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import expect from 'expect';
+
+import {getTestState, setupTestBrowserHooks} from '../mocha-utils.js';
+
+describe('page.queryObjects', function () {
+  setupTestBrowserHooks();
+
+  it('should work', async () => {
+    const {page} = await getTestState();
+
+    // Create a custom class
+    using classHandle = await page.evaluateHandle(() => {
+      return class CustomClass {};
+    });
+
+    // Create an instance.
+    await page.evaluate(CustomClass => {
+      // @ts-expect-error: Different context.
+      self.customClass = new CustomClass();
+    }, classHandle);
+
+    // Validate only one has been added.
+    using prototypeHandle = await page.evaluateHandle(CustomClass => {
+      return CustomClass.prototype;
+    }, classHandle);
+    using objectsHandle = await page.queryObjects(prototypeHandle);
+    await expect(
+      page.evaluate(objects => {
+        return objects.length;
+      }, objectsHandle)
+    ).resolves.toBe(1);
+
+    // Check that instances.
+    await expect(
+      page.evaluate(objects => {
+        // @ts-expect-error: Different context.
+        return objects[0] === self.customClass;
+      }, objectsHandle)
+    ).resolves.toBeTruthy();
+  });
+  it('should work for non-trivial page', async () => {
+    const {page, server} = await getTestState();
+    await page.goto(server.EMPTY_PAGE);
+
+    // Create a custom class
+    using classHandle = await page.evaluateHandle(() => {
+      return class CustomClass {};
+    });
+
+    // Create an instance.
+    await page.evaluate(CustomClass => {
+      // @ts-expect-error: Different context.
+      self.customClass = new CustomClass();
+    }, classHandle);
+
+    // Validate only one has been added.
+    using prototypeHandle = await page.evaluateHandle(CustomClass => {
+      return CustomClass.prototype;
+    }, classHandle);
+    using objectsHandle = await page.queryObjects(prototypeHandle);
+    await expect(
+      page.evaluate(objects => {
+        return objects.length;
+      }, objectsHandle)
+    ).resolves.toBe(1);
+
+    // Check that instances.
+    await expect(
+      page.evaluate(objects => {
+        // @ts-expect-error: Different context.
+        return objects[0] === self.customClass;
+      }, objectsHandle)
+    ).resolves.toBeTruthy();
+  });
+  it('should fail for disposed handles', async () => {
+    const {page} = await getTestState();
+
+    using prototypeHandle = await page.evaluateHandle(() => {
+      return HTMLBodyElement.prototype;
+    });
+    // We want to dispose early.
+    await prototypeHandle.dispose();
+    let error!: Error;
+    await page.queryObjects(prototypeHandle).catch(error_ => {
+      return (error = error_);
+    });
+    expect(error.message).toBe('Prototype JSHandle is disposed!');
+  });
+  it('should fail primitive values as prototypes', async () => {
+    const {page} = await getTestState();
+
+    using prototypeHandle = await page.evaluateHandle(() => {
+      return 42;
+    });
+    let error!: Error;
+    await page.queryObjects(prototypeHandle).catch(error_ => {
+      return (error = error_);
+    });
+    expect(error.message).toBe(
+      'Prototype JSHandle must not be referencing primitive value'
+    );
+  });
+});

test/src/page.spec.ts

@@ -526,104 +526,6 @@ describe('Page', function () {
     });
   });
 
-  describe('ExecutionContext.queryObjects', function () {
-    it('should work', async () => {
-      const {page} = await getTestState();
-
-      // Create a custom class
-      using classHandle = await page.evaluateHandle(() => {
-        return class CustomClass {};
-      });
-
-      // Create an instance.
-      await page.evaluate(CustomClass => {
-        // @ts-expect-error: Different context.
-        self.customClass = new CustomClass();
-      }, classHandle);
-
-      // Validate only one has been added.
-      using prototypeHandle = await page.evaluateHandle(CustomClass => {
-        return CustomClass.prototype;
-      }, classHandle);
-      using objectsHandle = await page.queryObjects(prototypeHandle);
-      await expect(
-        page.evaluate(objects => {
-          return objects.length;
-        }, objectsHandle)
-      ).resolves.toBe(1);
-
-      // Check that instances.
-      await expect(
-        page.evaluate(objects => {
-          // @ts-expect-error: Different context.
-          return objects[0] === self.customClass;
-        }, objectsHandle)
-      ).resolves.toBeTruthy();
-    });
-    it('should work for non-trivial page', async () => {
-      const {page, server} = await getTestState();
-      await page.goto(server.EMPTY_PAGE);
-
-      // Create a custom class
-      using classHandle = await page.evaluateHandle(() => {
-        return class CustomClass {};
-      });
-
-      // Create an instance.
-      await page.evaluate(CustomClass => {
-        // @ts-expect-error: Different context.
-        self.customClass = new CustomClass();
-      }, classHandle);
-
-      // Validate only one has been added.
-      using prototypeHandle = await page.evaluateHandle(CustomClass => {
-        return CustomClass.prototype;
-      }, classHandle);
-      using objectsHandle = await page.queryObjects(prototypeHandle);
-      await expect(
-        page.evaluate(objects => {
-          return objects.length;
-        }, objectsHandle)
-      ).resolves.toBe(1);
-
-      // Check that instances.
-      await expect(
-        page.evaluate(objects => {
-          // @ts-expect-error: Different context.
-          return objects[0] === self.customClass;
-        }, objectsHandle)
-      ).resolves.toBeTruthy();
-    });
-    it('should fail for disposed handles', async () => {
-      const {page} = await getTestState();
-
-      using prototypeHandle = await page.evaluateHandle(() => {
-        return HTMLBodyElement.prototype;
-      });
-      // We want to dispose early.
-      await prototypeHandle.dispose();
-      let error!: Error;
-      await page.queryObjects(prototypeHandle).catch(error_ => {
-        return (error = error_);
-      });
-      expect(error.message).toBe('Prototype JSHandle is disposed!');
-    });
-    it('should fail primitive values as prototypes', async () => {
-      const {page} = await getTestState();
-
-      using prototypeHandle = await page.evaluateHandle(() => {
-        return 42;
-      });
-      let error!: Error;
-      await page.queryObjects(prototypeHandle).catch(error_ => {
-        return (error = error_);
-      });
-      expect(error.message).toBe(
-        'Prototype JSHandle must not be referencing primitive value'
-      );
-    });
-  });
-
   describe('Page.Events.Console', function () {
     it('should work', async () => {
       const {page} = await getTestState();