Skip to content
This repository was archived by the owner on Jan 11, 2023. It is now read-only.

Commit 16d51a6

Browse files
committed
Revert "Fix previewing a file w/ no functions (#5390)"
This reverts commit a290b11.
1 parent fd49af5 commit 16d51a6

File tree

7 files changed

+44
-111
lines changed

7 files changed

+44
-111
lines changed

src/test/mochitest/browser.ini

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ support-files =
7676
examples/doc-debugger-statements.html
7777
examples/doc-minified.html
7878
examples/doc-minified2.html
79-
examples/doc-on-load.html
8079
examples/doc-sourcemaps.html
8180
examples/doc-sourcemaps2.html
8281
examples/doc-sourcemaps3.html
@@ -92,7 +91,6 @@ support-files =
9291
examples/long.js
9392
examples/math.min.js
9493
examples/nested/nested-source.js
95-
examples/top-level.js
9694
examples/opts.js
9795
examples/output.js
9896
examples/simple1.js
@@ -145,8 +143,6 @@ skip-if = os == "win"
145143
[browser_dbg-pretty-print-paused.js]
146144
[browser_dbg-preview.js]
147145
skip-if = os == "win"
148-
[browser_dbg-preview-module.js]
149-
skip-if = os == "win"
150146
[browser_dbg-preview-source-maps.js]
151147
skip-if = os == "win"
152148
[browser_dbg-returnvalues.js]

src/test/mochitest/browser_dbg-preview-module.js

Lines changed: 0 additions & 37 deletions
This file was deleted.

src/test/mochitest/browser_dbg-preview-source-maps.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function hoverAtPos(dbg, { line, ch }) {
1818
);
1919
}
2020

21-
function assertPreviewTooltip(dbg, { result, expression }) {
21+
function assertTooltip(dbg, { result, expression }) {
2222
const previewEl = findElement(dbg, "tooltip");
2323
is(previewEl.innerText, result, "Preview text shown to user");
2424

@@ -28,7 +28,7 @@ function assertPreviewTooltip(dbg, { result, expression }) {
2828
is(preview.expression, expression, "Preview.expression");
2929
}
3030

31-
function assertPreviewPopup(dbg, { field, value, expression }) {
31+
function assertPopup(dbg, { field, value, expression }) {
3232
const previewEl = findElement(dbg, "popup");
3333
is(previewEl.innerText, "", "Preview text shown to user");
3434

@@ -59,5 +59,5 @@ add_task(async function() {
5959
hoverAtPos(dbg, { line: 2, ch: 9 });
6060

6161
await tooltipPreviewed;
62-
assertPreviewTooltip(dbg, { result: 4, expression: "x" });
62+
assertTooltip(dbg, { result: 4, expression: "x" });
6363
});

src/test/mochitest/browser_dbg-preview.js

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,46 @@
11
/* Any copyright is dedicated to the Public Domain.
22
* http://creativecommons.org/publicdomain/zero/1.0/ */
33

4-
// Test hovering on an object, which will show a popup and on a
5-
// simple value, which will show a tooltip.
4+
function getCoordsFromPosition(cm, { line, ch }) {
5+
return cm.charCoords({ line: ~~line, ch: ~~ch });
6+
}
7+
8+
function hoverAtPos(dbg, { line, ch }) {
9+
const cm = getCM(dbg);
10+
const coords = getCoordsFromPosition(cm, { line: line - 1, ch });
11+
const tokenEl = dbg.win.document.elementFromPoint(coords.left, coords.top);
12+
tokenEl.dispatchEvent(
13+
new MouseEvent("mouseover", {
14+
bubbles: true,
15+
cancelable: true,
16+
view: dbg.win
17+
})
18+
);
19+
}
20+
21+
async function assertTooltip(dbg, { result, expression }) {
22+
const previewEl = await waitForElement(dbg, "tooltip");
23+
is(previewEl.innerText, result, "Preview text shown to user");
24+
25+
const preview = dbg.selectors.getPreview(dbg.getState());
26+
is(`${preview.result}`, result, "Preview.result");
27+
is(preview.updating, false, "Preview.updating");
28+
is(preview.expression, expression, "Preview.expression");
29+
}
30+
31+
async function assertPreviewPopup(dbg, { field, value, expression }) {
32+
const previewEl = await waitForElement(dbg, "popup");
33+
const preview = dbg.selectors.getPreview(dbg.getState());
34+
35+
is(
36+
`${preview.result.preview.ownProperties[field].value}`,
37+
value,
38+
"Preview.result"
39+
);
40+
is(preview.updating, false, "Preview.updating");
41+
is(preview.expression, expression, "Preview.expression");
42+
}
43+
644
add_task(async function() {
745
const dbg = await initDebugger("doc-scripts.html");
846
const { selectors: { getSelectedSource }, getState } = dbg;
@@ -18,7 +56,7 @@ add_task(async function() {
1856
const tooltipPreviewed = waitForDispatch(dbg, "SET_PREVIEW");
1957
hoverAtPos(dbg, { line: 5, ch: 12 });
2058
await tooltipPreviewed;
21-
await assertPreviewTooltip(dbg, { result: "3", expression: "result" });
59+
await assertTooltip(dbg, { result: "3", expression: "result" });
2260

2361
const popupPreviewed = waitForDispatch(dbg, "SET_PREVIEW");
2462
hoverAtPos(dbg, { line: 2, ch: 10 });

src/test/mochitest/examples/doc-on-load.html

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/test/mochitest/examples/top-level.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/test/mochitest/head.js

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,46 +1084,6 @@ function getCM(dbg) {
10841084
return el.CodeMirror;
10851085
}
10861086

1087-
function getCoordsFromPosition(cm, { line, ch }) {
1088-
return cm.charCoords({ line: ~~line, ch: ~~ch });
1089-
}
1090-
1091-
function hoverAtPos(dbg, { line, ch }) {
1092-
const cm = getCM(dbg);
1093-
const coords = getCoordsFromPosition(cm, { line: line - 1, ch });
1094-
const tokenEl = dbg.win.document.elementFromPoint(coords.left, coords.top);
1095-
tokenEl.dispatchEvent(
1096-
new MouseEvent("mouseover", {
1097-
bubbles: true,
1098-
cancelable: true,
1099-
view: dbg.win
1100-
})
1101-
);
1102-
}
1103-
1104-
async function assertPreviewTooltip(dbg, { result, expression }) {
1105-
const previewEl = await waitForElement(dbg, "tooltip");
1106-
is(previewEl.innerText, result, "Preview text shown to user");
1107-
1108-
const preview = dbg.selectors.getPreview(dbg.getState());
1109-
is(`${preview.result}`, result, "Preview.result");
1110-
is(preview.updating, false, "Preview.updating");
1111-
is(preview.expression, expression, "Preview.expression");
1112-
}
1113-
1114-
async function assertPreviewPopup(dbg, { field, value, expression }) {
1115-
const previewEl = await waitForElement(dbg, "popup");
1116-
const preview = dbg.selectors.getPreview(dbg.getState());
1117-
1118-
is(
1119-
`${preview.result.preview.ownProperties[field].value}`,
1120-
value,
1121-
"Preview.result"
1122-
);
1123-
is(preview.updating, false, "Preview.updating");
1124-
is(preview.expression, expression, "Preview.expression");
1125-
}
1126-
11271087
// NOTE: still experimental, the screenshots might not be exactly correct
11281088
async function takeScreenshot(dbg) {
11291089
let canvas = dbg.win.document.createElementNS(

0 commit comments

Comments
 (0)