Backed out changeset f8beb72039b2 (bug 1419326) because eslint broke r=backout on a CLOSED TREE

--HG--
extra : amend_source : 76f75cc5c0aef8a07847829b3f34f1cccf145c48
extra : histedit_source : c53279a1c08a7170b681a2a7d8ad405ecdc8376c
This commit is contained in:
Dorel Luca 2018-01-10 20:25:03 +02:00
Родитель 3413738ba5
Коммит 2ad2bd905c
6 изменённых файлов: 32 добавлений и 205 удалений

Просмотреть файл

@ -1,5 +1,5 @@
<html>
<head>
<head>
<meta charset="UTF-8"/>
<title>DAMP - Devtools At Maximum Performance</title>
@ -29,7 +29,6 @@ var defaultConfig = {
"complicated.saveAndReadHeapSnapshot": true,
"custom.inspector": true,
"custom.debugger": true,
"console.bulklog": true,
"console.streamlog": true,

Просмотреть файл

@ -37,148 +37,6 @@ function getActiveTab(window) {
return window.gBrowser.selectedTab;
}
/************** Debugger Helper ***************/
/*
* These methods are used for working with debugger state changes in order
* to make it easier to manipulate the ui and test different behavior. These
* methods roughly reflect those found in debugger/new/test/mochi/head.js with
* a few exceptions. The `dbg` object is not exactly the same, and the methods
* have been simplified. We may want to consider unifying them in the future
*/
const DEBUGGER_POLLING_INTERVAL = 50;
const debuggerHelper = {
waitForState(dbg, predicate, msg) {
return new Promise(resolve => {
dump(`Waiting for state change: ${msg}\n`);
if (predicate(dbg.store.getState())) {
dump(`Finished waiting for state change: ${msg}\n`);
return resolve();
}
const unsubscribe = dbg.store.subscribe(() => {
if (predicate(dbg.store.getState())) {
dump(`Finished waiting for state change: ${msg}\n`);
unsubscribe();
resolve();
}
});
});
},
waitForDispatch(dbg, type) {
return new Promise(resolve => {
dbg.store.dispatch({
type: "@@service/waitUntil",
predicate: action => {
if (action.type === type) {
return action.status
? action.status === "done" || action.status === "error"
: true;
}
},
run: (dispatch, getState, action) => {
resolve(action);
}
});
});
},
async waitUntil(predicate, msg) {
dump(`Waiting until: ${msg}\n`);
return new Promise(resolve => {
const timer = setInterval(() => {
if (predicate()) {
clearInterval(timer);
dump(`Finished Waiting until: ${msg}\n`);
resolve();
}
}, DEBUGGER_POLLING_INTERVAL);
});
},
findSource(dbg, url) {
const sources = dbg.selectors.getSources(dbg.getState());
return sources.find(s => (s.get("url") || "").includes(url));
},
getCM(dbg) {
const el = dbg.win.document.querySelector(".CodeMirror");
return el.CodeMirror;
},
waitForText(dbg, url, text) {
return this.waitUntil(() => {
// the welcome box is removed once text is displayed
const welcomebox = dbg.win.document.querySelector(".welcomebox");
if (welcomebox) {
return false;
}
const cm = this.getCM(dbg);
const editorText = cm.doc.getValue();
return editorText.includes(text);
}, "text is visible");
},
waitForMetaData(dbg) {
return this.waitUntil(
() => {
const state = dbg.store.getState();
const source = dbg.selectors.getSelectedSource(state);
// wait for metadata -- this involves parsing the file to determine its type.
// if the object is empty, the data has not yet loaded
const metaData = dbg.selectors.getSourceMetaData(state, source.get("id"));
return !!Object.keys(metaData).length;
},
"has file metadata"
);
},
waitForSources(dbg, expectedSources) {
const { selectors, store } = dbg;
function countSources(state) {
const sources = selectors.getSources(state);
return sources.size >= expectedSources;
}
return this.waitForState(dbg, countSources, "count sources");
},
async createContext(panel) {
const { store, client, selectors, actions } = panel.getVarsForTests();
return {
actions,
selectors,
getState: store.getState,
win: panel.panelWin,
store
};
},
selectSource(dbg, url) {
dump(`Selecting source: ${url}\n`);
const line = 1;
const source = this.findSource(dbg, url);
dbg.actions.selectLocation({ sourceId: source.get("id"), line });
return this.waitForState(
dbg,
state => {
const source = dbg.selectors.getSelectedSource(state);
const isLoaded = source && source.get("loadedState") === "loaded";
if (!isLoaded) {
return false;
}
// wait for symbols -- a flat map of all named variables in a file -- to be calculated.
// this is a slow process and becomes slower the larger the file is
return dbg.selectors.hasSymbols(state, source.toJS());
},
"selected source"
);
}
}
async function garbageCollect() {
dump("Garbage collect\n");
@ -733,44 +591,7 @@ async _consoleOpenWithCachedMessagesTest() {
await this.testTeardown();
},
async openDebuggerAndLog(label, expectedSources, selectedFile, expectedText) {
const onLoad = async (toolbox, panel) => {
const dbg = await debuggerHelper.createContext(panel);
await debuggerHelper.waitForSources(dbg, expectedSources);
await debuggerHelper.selectSource(dbg, selectedFile);
await debuggerHelper.waitForText(dbg, selectedFile, expectedText);
await debuggerHelper.waitForMetaData(dbg);
};
const toolbox = await this.openToolboxAndLog(label + ".jsdebugger", "jsdebugger", onLoad);
return toolbox;
},
async reloadDebuggerAndLog(label, toolbox, expectedSources, selectedFile, expectedText) {
const onReload = async () => {
const panel = await toolbox.getPanelWhenReady("jsdebugger")
const dbg = await debuggerHelper.createContext(panel);
await debuggerHelper.waitForDispatch(dbg, "NAVIGATE");
await debuggerHelper.waitForSources(dbg, expectedSources);
await debuggerHelper.waitForText(dbg, selectedFile, expectedText);
await debuggerHelper.waitForMetaData(dbg);
}
await this.reloadPageAndLog(`${label}.jsdebugger`, toolbox, onReload);
},
async customDebugger() {
const label = "custom";
const expectedSources = 7;
let url = CUSTOM_URL.replace(/\$TOOL/, "debugger/index");
await this.testSetup(url);
const selectedFile = "App.js";
const expectedText = "import React, { Component } from 'react';";
const toolbox = await this.openDebuggerAndLog(label, expectedSources, selectedFile, expectedText);
await this.reloadDebuggerAndLog(label, toolbox, expectedSources, selectedFile, expectedText);
await this.closeToolboxAndLog("custom.jsdebugger", toolbox);
await this.testTeardown();
},
_getToolLoadingTests(url, label, { expectedMessages, expectedSources, selectedFile, expectedText }) {
_getToolLoadingTests(url, label, { expectedMessages, expectedSources }) {
let tests = {
async inspector() {
await this.testSetup(url);
@ -803,8 +624,36 @@ async _consoleOpenWithCachedMessagesTest() {
async debugger() {
await this.testSetup(url);
let toolbox = await this.openDebuggerAndLog(label, expectedSources, selectedFile, expectedText);
await this.reloadDebuggerAndLog(label, toolbox, expectedSources, selectedFile, expectedText);
let onLoad = async function(toolbox, dbg) {
await new Promise(done => {
let { selectors, store } = dbg.panelWin.getGlobalsForTesting();
let unsubscribe;
function countSources() {
const sources = selectors.getSources(store.getState());
if (sources.size >= expectedSources) {
unsubscribe();
done();
}
}
unsubscribe = store.subscribe(countSources);
countSources();
});
};
let toolbox = await this.openToolboxAndLog(label + ".jsdebugger", "jsdebugger", onLoad);
let onReload = async function() {
await new Promise(done => {
let count = 0;
let { client } = toolbox.target;
let onSource = async (_, actor) => {
if (++count >= expectedSources) {
client.removeListener("newSource", onSource);
done();
}
};
client.addListener("newSource", onSource);
});
};
await this.reloadPageAndLog(label + ".jsdebugger", toolbox, onReload);
await this.closeToolboxAndLog(label + ".jsdebugger", toolbox);
await this.testTeardown();
},
@ -1027,21 +876,16 @@ async _consoleOpenWithCachedMessagesTest() {
Object.assign(tests, this._getToolLoadingTests(SIMPLE_URL, "simple", {
expectedMessages: 1,
expectedSources: 1,
selectedFile: "simple.html",
expectedText: "This is a simple page"
}));
// Run all tests against "complicated" document
Object.assign(tests, this._getToolLoadingTests(COMPLICATED_URL, "complicated", {
expectedMessages: 7,
expectedSources: 14,
selectedFile: "ga.js",
expectedText: "Math;function ga(a,b){return a.name=b}"
}));
// Run all tests against a document specific to each tool
tests["custom.inspector"] = this.customInspector;
tests["custom.debugger"] = this.customDebugger;
// Run individual tests covering a very precise tool feature
tests["console.bulklog"] = this._consoleBulkLoggingTest;

Просмотреть файл

@ -1,12 +0,0 @@
This is a fork of [Create React App](https://github.com/facebookincubator/create-react-app) that is
being used as part of the DAMP test tool suite. Files in `src` can be modified freely.
The URL for this repository is https://www.github.com/codehag/debugger-talos-example. Changes can be
added there
This package assumes yarn is installed.
To build and copy:
- ensure your firefox directory is listed in package.json under `firefox`.
- run `yarn copy-assets`

Просмотреть файл

@ -1 +0,0 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="./manifest.json"><title>React App</title></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="./static/js/main.447c224f.js"></script></body></html>

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

Различия файлов скрыты, потому что одна или несколько строк слишком длинны