diff --git a/devtools/client/shared/components/test/browser/browser_reps_stubs.js b/devtools/client/shared/components/test/browser/browser_reps_stubs.js index 3dd57e6c444e..8b2e448dbf62 100644 --- a/devtools/client/shared/components/test/browser/browser_reps_stubs.js +++ b/devtools/client/shared/components/test/browser/browser_reps_stubs.js @@ -39,7 +39,6 @@ const EXPRESSIONS_BY_FILE = { ["NegZeroGrip", `1 / -Infinity`], ]), "undefined.js": new Map([["Undefined", `undefined`]]), - "window.js": new Map([["Window", `window`]]), // XXX: File a bug blocking Bug 1671400 for enabling automatic generation for one of // the following file. // "accessible.js", @@ -66,6 +65,7 @@ const EXPRESSIONS_BY_FILE = { // "stylesheet.js", // "symbol.js", // "text-node.js", + // "window.js", }; add_task(async function() { diff --git a/devtools/client/shared/components/test/node/components/object-inspector/component/__snapshots__/window.test.js.snap b/devtools/client/shared/components/test/node/components/object-inspector/component/__snapshots__/window.test.js.snap index 6f512c403db4..0fd08a7130e4 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/component/__snapshots__/window.test.js.snap +++ b/devtools/client/shared/components/test/node/components/object-inspector/component/__snapshots__/window.test.js.snap @@ -19,15 +19,14 @@ exports[`ObjectInspector - dimTopLevelWindow renders collapsed top-level window Object { "contents": Object { "value": Object { - "actor": "server0.conn0.windowGlobal2147483651/obj35", + "actor": "server1.conn3.obj198", "class": "Window", "extensible": true, "frozen": false, - "isError": false, - "ownPropertyLength": 806, + "ownPropertyLength": 887, "preview": Object { "kind": "ObjectWithURL", - "url": "data:text/html;charset=utf-8,stub generation", + "url": "about:newtab", }, "sealed": false, "type": "object", @@ -50,15 +49,14 @@ exports[`ObjectInspector - dimTopLevelWindow renders collapsed top-level window Object { "contents": Object { "value": Object { - "actor": "server0.conn0.windowGlobal2147483651/obj35", + "actor": "server1.conn3.obj198", "class": "Window", "extensible": true, "frozen": false, - "isError": false, - "ownPropertyLength": 806, + "ownPropertyLength": 887, "preview": Object { "kind": "ObjectWithURL", - "url": "data:text/html;charset=utf-8,stub generation", + "url": "about:newtab", }, "sealed": false, "type": "object", @@ -92,15 +90,14 @@ exports[`ObjectInspector - dimTopLevelWindow renders collapsed top-level window Object { "contents": Object { "value": Object { - "actor": "server0.conn0.windowGlobal2147483651/obj35", + "actor": "server1.conn3.obj198", "class": "Window", "extensible": true, "frozen": false, - "isError": false, - "ownPropertyLength": 806, + "ownPropertyLength": 887, "preview": Object { "kind": "ObjectWithURL", - "url": "data:text/html;charset=utf-8,stub generation", + "url": "about:newtab", }, "sealed": false, "type": "object", @@ -157,15 +154,14 @@ exports[`ObjectInspector - dimTopLevelWindow renders collapsed top-level window Object { "contents": Object { "value": Object { - "actor": "server0.conn0.windowGlobal2147483651/obj35", + "actor": "server1.conn3.obj198", "class": "Window", "extensible": true, "frozen": false, - "isError": false, - "ownPropertyLength": 806, + "ownPropertyLength": 887, "preview": Object { "kind": "ObjectWithURL", - "url": "data:text/html;charset=utf-8,stub generation", + "url": "about:newtab", }, "sealed": false, "type": "object", @@ -205,15 +201,14 @@ exports[`ObjectInspector - dimTopLevelWindow renders collapsed top-level window Object { "contents": Object { "value": Object { - "actor": "server0.conn0.windowGlobal2147483651/obj35", + "actor": "server1.conn3.obj198", "class": "Window", "extensible": true, "frozen": false, - "isError": false, - "ownPropertyLength": 806, + "ownPropertyLength": 887, "preview": Object { "kind": "ObjectWithURL", - "url": "data:text/html;charset=utf-8,stub generation", + "url": "about:newtab", }, "sealed": false, "type": "object", @@ -241,15 +236,14 @@ exports[`ObjectInspector - dimTopLevelWindow renders collapsed top-level window Object { "contents": Object { "value": Object { - "actor": "server0.conn0.windowGlobal2147483651/obj35", + "actor": "server1.conn3.obj198", "class": "Window", "extensible": true, "frozen": false, - "isError": false, - "ownPropertyLength": 806, + "ownPropertyLength": 887, "preview": Object { "kind": "ObjectWithURL", - "url": "data:text/html;charset=utf-8,stub generation", + "url": "about:newtab", }, "sealed": false, "type": "object", @@ -276,15 +270,14 @@ exports[`ObjectInspector - dimTopLevelWindow renders collapsed top-level window Object { "contents": Object { "value": Object { - "actor": "server0.conn0.windowGlobal2147483651/obj35", + "actor": "server1.conn3.obj198", "class": "Window", "extensible": true, "frozen": false, - "isError": false, - "ownPropertyLength": 806, + "ownPropertyLength": 887, "preview": Object { "kind": "ObjectWithURL", - "url": "data:text/html;charset=utf-8,stub generation", + "url": "about:newtab", }, "sealed": false, "type": "object", @@ -313,15 +306,14 @@ exports[`ObjectInspector - dimTopLevelWindow renders collapsed top-level window Object { "contents": Object { "value": Object { - "actor": "server0.conn0.windowGlobal2147483651/obj35", + "actor": "server1.conn3.obj198", "class": "Window", "extensible": true, "frozen": false, - "isError": false, - "ownPropertyLength": 806, + "ownPropertyLength": 887, "preview": Object { "kind": "ObjectWithURL", - "url": "data:text/html;charset=utf-8,stub generation", + "url": "about:newtab", }, "sealed": false, "type": "object", @@ -352,7 +344,7 @@ exports[`ObjectInspector - dimTopLevelWindow renders collapsed top-level window createNode({ name: "root", contents: { value } }); describe("nodeIsWindow", () => { it("returns true for Window", () => { - expect( - nodeIsWindow(createRootNode(gripWindowStubs.get("Window")._grip)) - ).toBe(true); + expect(nodeIsWindow(createRootNode(gripWindowStubs.get("Window")))).toBe( + true + ); }); }); diff --git a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-indexed-properties.test.js b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-indexed-properties.test.js index 8284113f0346..c22b16117fe2 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-indexed-properties.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-indexed-properties.test.js @@ -156,7 +156,7 @@ describe("shouldLoadItemIndexedProperties", () => { const node = createNode({ name: "root", contents: { - value: windowStubs.get("Window")._grip, + value: windowStubs.get("Window"), }, }); expect(shouldLoadItemIndexedProperties(node)).toBeTruthy(); @@ -166,7 +166,7 @@ describe("shouldLoadItemIndexedProperties", () => { const windowNode = createNode({ name: "root", contents: { - value: windowStubs.get("Window")._grip, + value: windowStubs.get("Window"), }, }); const loadedProperties = new Map([ diff --git a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-non-indexed-properties.test.js b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-non-indexed-properties.test.js index c21638d28f68..49850c1103d6 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-non-indexed-properties.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-non-indexed-properties.test.js @@ -117,7 +117,7 @@ describe("shouldLoadItemNonIndexedProperties", () => { const node = createNode({ name: "root", contents: { - value: windowStubs.get("Window")._grip, + value: windowStubs.get("Window"), }, }); expect(shouldLoadItemNonIndexedProperties(node)).toBeTruthy(); @@ -127,7 +127,7 @@ describe("shouldLoadItemNonIndexedProperties", () => { const windowNode = createNode({ name: "root", contents: { - value: windowStubs.get("Window")._grip, + value: windowStubs.get("Window"), }, }); const loadedProperties = new Map([ diff --git a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-prototype.test.js b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-prototype.test.js index a6f605ec519a..c7c04a138319 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-prototype.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-prototype.test.js @@ -115,7 +115,7 @@ describe("shouldLoadItemPrototype", () => { const node = createNode({ name: "root", contents: { - value: windowStubs.get("Window")._grip, + value: windowStubs.get("Window"), }, }); expect(shouldLoadItemPrototype(node)).toBeTruthy(); @@ -125,7 +125,7 @@ describe("shouldLoadItemPrototype", () => { const windowNode = createNode({ name: "root", contents: { - value: windowStubs.get("Window")._grip, + value: windowStubs.get("Window"), }, }); const loadedProperties = new Map([ diff --git a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-symbols.test.js b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-symbols.test.js index f00cd9837d37..30c2c3094a20 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-symbols.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-symbols.test.js @@ -115,7 +115,7 @@ describe("shouldLoadItemSymbols", () => { const node = createNode({ name: "root", contents: { - value: windowStubs.get("Window")._grip, + value: windowStubs.get("Window"), }, }); expect(shouldLoadItemSymbols(node)).toBeTruthy(); @@ -125,7 +125,7 @@ describe("shouldLoadItemSymbols", () => { const windowNode = createNode({ name: "root", contents: { - value: windowStubs.get("Window")._grip, + value: windowStubs.get("Window"), }, }); const loadedProperties = new Map([ diff --git a/devtools/client/shared/components/test/node/components/reps/window.test.js b/devtools/client/shared/components/test/node/components/reps/window.test.js index fde09fe1d0ae..2d706674eb0d 100644 --- a/devtools/client/shared/components/test/node/components/reps/window.test.js +++ b/devtools/client/shared/components/test/node/components/reps/window.test.js @@ -21,7 +21,7 @@ const { } = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); describe("test Window", () => { - const stub = stubs.get("Window")._grip; + const stub = stubs.get("Window"); it("selects Window Rep correctly", () => { expect(getRep(stub)).toBe(Window.rep); @@ -46,12 +46,8 @@ describe("test Window", () => { }) ); - expect(renderedComponent.text()).toEqual( - "Window data:text/html;charset=utf-8,stub generation" - ); - expect(renderedComponent.prop("title")).toEqual( - "Window data:text/html;charset=utf-8,stub generation" - ); + expect(renderedComponent.text()).toEqual("Window about:newtab"); + expect(renderedComponent.prop("title")).toEqual("Window about:newtab"); }); it("renders with correct inner HTML structure and content", () => { @@ -61,9 +57,7 @@ describe("test Window", () => { }) ); - expect(renderedComponent.find(".location").text()).toEqual( - "data:text/html;charset=utf-8,stub generation" - ); + expect(renderedComponent.find(".location").text()).toEqual("about:newtab"); }); it("renders with expected text in TINY mode", () => { @@ -76,9 +70,7 @@ describe("test Window", () => { ); expect(renderedComponent.text()).toEqual("Window"); - expect(renderedComponent.prop("title")).toEqual( - "Window data:text/html;charset=utf-8,stub generation" - ); + expect(renderedComponent.prop("title")).toEqual("Window about:newtab"); }); it("renders with expected text in LONG mode", () => { @@ -90,12 +82,8 @@ describe("test Window", () => { }) ); - expect(renderedComponent.text()).toEqual( - "Window data:text/html;charset=utf-8,stub generation" - ); - expect(renderedComponent.prop("title")).toEqual( - "Window data:text/html;charset=utf-8,stub generation" - ); + expect(renderedComponent.text()).toEqual("Window about:newtab"); + expect(renderedComponent.prop("title")).toEqual("Window about:newtab"); }); it("renders expected text in TINY mode with Custom display class", () => { @@ -124,8 +112,6 @@ describe("test Window", () => { }) ); - expect(renderedComponent.text()).toEqual( - "Custom data:text/html;charset=utf-8,stub generation" - ); + expect(renderedComponent.text()).toEqual("Custom about:newtab"); }); }); diff --git a/devtools/client/shared/components/test/node/stubs/reps/stubs.ini b/devtools/client/shared/components/test/node/stubs/reps/stubs.ini index bcb20e9df2ed..4c3ff7d076bd 100644 --- a/devtools/client/shared/components/test/node/stubs/reps/stubs.ini +++ b/devtools/client/shared/components/test/node/stubs/reps/stubs.ini @@ -8,7 +8,6 @@ support-files = null.js number.js undefined.js - window.js [browser_dummy.js] skip-if=true #This is only here so we can expose the support files in other ini files. diff --git a/devtools/client/shared/components/test/node/stubs/reps/window.js b/devtools/client/shared/components/test/node/stubs/reps/window.js index 67e76e5e32c6..d5cbacc0657b 100644 --- a/devtools/client/shared/components/test/node/stubs/reps/window.js +++ b/devtools/client/shared/components/test/node/stubs/reps/window.js @@ -3,27 +3,20 @@ * file, You can obtain one at . */ "use strict"; -/* - * THIS FILE IS AUTOGENERATED. DO NOT MODIFY BY HAND. RUN browser_reps_stubs.js with STUBS_UPDATE=true env TO UPDATE. - */ const stubs = new Map(); -stubs.set(`Window`, { - "_grip": { - "type": "object", - "actor": "server0.conn0.windowGlobal2147483651/obj35", - "class": "Window", - "ownPropertyLength": 806, - "extensible": true, - "frozen": false, - "sealed": false, - "isError": false, - "preview": { - "kind": "ObjectWithURL", - "url": "data:text/html;charset=utf-8,stub generation" - } +stubs.set("Window", { + type: "object", + class: "Window", + actor: "server1.conn3.obj198", + extensible: true, + frozen: false, + sealed: false, + ownPropertyLength: 887, + preview: { + kind: "ObjectWithURL", + url: "about:newtab", }, - "actorID": "server0.conn0.windowGlobal2147483651/obj35" }); module.exports = stubs;