Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 07:45:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset da168cc5c08f (bug 1630742) for dt failures on browser_dbg-continue-to-here-click.js CLOSED TREE

Browse Source
This commit is contained in:
Cosmin Sabou 2020-04-22 06:46:32 +03:00
parent fe242fb84b
commit b6b5d23f63
7 changed files with 9 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devtools/client/debugger/src/actions/utils/middleware/log.js
View File

@ -21,7 +21,6 @@ const blacklist = [
"SET_FOCUSED_SOURCE_ITEM",
"NODE_EXPAND",
"IN_SCOPE_LINES",
"SET_PREVIEW",
];
function cloneAction(action: any) {

6
devtools/client/debugger/src/components/Editor/index.js
View File

@ -482,11 +482,7 @@ class Editor extends PureComponent<Props, State> {
}
if (ev.metaKey) {
return continueToHere(cx, {
line: sourceLine,
column: undefined,
sourceId: selectedSource.id,
});
return continueToHere(cx, sourceLine);
}
return addBreakpointAtLine(cx, sourceLine, ev.altKey, ev.shiftKey);

2
devtools/client/debugger/test/mochitest/browser.ini
View File

@ -44,8 +44,6 @@ skip-if = debug # Window leaks: bug 1575332
[browser_dbg-browser-content-toolbox.js]
skip-if = !e10s || verify # This test is only valid in e10s
[browser_dbg-continue-to-here.js]
[browser_dbg-continue-to-here-click.js]
skip-if = debug
[browser_dbg-breakpoints-reloading.js]
[browser_dbg-breakpoint-skipping.js]
[browser_dbg-breakpoint-skipping-console.js]

28
devtools/client/debugger/test/mochitest/browser_dbg-continue-to-here-click.js
View File

@ -1,28 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */
async function cmdClickLine(dbg, line) {
await cmdClickGutter(dbg, line);
return waitForPause(dbg);
}
async function waitForPause(dbg) {
await waitForDispatch(dbg, "RESUME");
await waitForPaused(dbg);
await waitForInlinePreviews(dbg);
}
add_task(async function() {
const dbg = await initDebugger("doc-pause-points.html", "pause-points.js");
await selectSource(dbg, "pause-points.js");
await waitForSelectedSource(dbg, "pause-points.js");
info("Test cmd+click continueing to a line");
clickElementInTab("#sequences");
await waitForPaused(dbg);
await waitForInlinePreviews(dbg);
await cmdClickLine(dbg, 31);
assertDebugLine(dbg, 31, 4);
await resume(dbg);
});

6
devtools/client/debugger/test/mochitest/browser_dbg-continue-to-here.js
View File

@ -6,8 +6,7 @@ async function continueToLine(dbg, line) {
rightClickElement(dbg, "gutter", line);
selectContextMenuItem(dbg, selectors.editorContextMenu.continueToHere);
await waitForDispatch(dbg, "RESUME");
await waitForPaused(dbg);
await waitForInlinePreviews(dbg);
return waitForPaused(dbg);
}
async function continueToColumn(dbg, pos) {
@ -29,7 +28,7 @@ add_task(async function() {
await waitForPaused(dbg);
await waitForInlinePreviews(dbg);
await continueToLine(dbg, 31);
await continueToColumn(dbg, { line: 31, ch: 7 });
assertDebugLine(dbg, 31, 4);
await resume(dbg);
@ -39,6 +38,7 @@ add_task(async function() {
await waitForInlinePreviews(dbg);
await continueToColumn(dbg, { line: 31, ch: 7 });
assertDebugLine(dbg, 31, 4);
await resume(dbg);
});

1
devtools/client/debugger/test/mochitest/head.js
View File

@ -44,6 +44,7 @@ Services.scriptloader.loadSubScript(
const EXAMPLE_URL =
"http://example.com/browser/devtools/client/debugger/test/mochitest/examples/";
// NOTE: still experimental, the screenshots might not be exactly correct
async function takeScreenshot(dbg) {
let canvas = dbg.win.document.createElementNS(

14
devtools/client/debugger/test/mochitest/helpers.js
View File

@ -390,7 +390,6 @@ function assertDebugLine(dbg, line, column) {
ok(classMatch, "expression is highlighted as paused");
}
info(`Paused on line ${line}`);
}
/**
@ -1129,8 +1128,8 @@ const startKey = isMac
const keyMappings = {
close: { code: "w", modifiers: cmdOrCtrl },
commandKeyDown: { code: "VK_META", modifiers: { type: "keydown" } },
commandKeyUp: { code: "VK_META", modifiers: { type: "keyup" } },
commandKeyDown: {code: "VK_META", modifiers: {type: "keydown"}},
commandKeyUp: {code: "VK_META", modifiers: {type: "keyup"}},
debugger: { code: "s", modifiers: shiftOrAlt },
// test conditional panel shortcut
toggleCondPanel: { code: "b", modifiers: cmdShift },
@ -1445,8 +1444,8 @@ function clickElementWithSelector(dbg, selector) {
clickDOMElement(dbg, findElementWithSelector(dbg, selector));
}
function clickDOMElement(dbg, element, options = {}) {
EventUtils.synthesizeMouseAtCenter(element, options, dbg.win);
function clickDOMElement(dbg, element) {
EventUtils.synthesizeMouseAtCenter(element, {}, dbg.win);
}
function dblClickElement(dbg, elementName, ...args) {
@ -1492,11 +1491,6 @@ async function clickGutter(dbg, line) {
clickDOMElement(dbg, el);
}
async function cmdClickGutter(dbg, line) {
const el = await codeMirrorGutterElement(dbg, line);
clickDOMElement(dbg, el, cmdOrCtrl);
}
function findContextMenu(dbg, selector) {
// the context menu is in the toolbox window
const doc = dbg.toolbox.topDoc;