Bug 1436187 - Move frame-script-utils.js to shared/test. r=bgrins

Move frame-script-utils.js into shared/test since it is a test only file.  In
addition, it's removed from jar.mn so it won't be part the file we ship.  Test
manifests can use the absolute path syntax to make it accessible in new
directories.

MozReview-Commit-ID: 5sKYvv2rsJs

--HG--
rename : devtools/client/shared/frame-script-utils.js => devtools/client/shared/test/frame-script-utils.js
extra : rebase_source : 8c4d77c37cacdae36d17102b4dbf1222ec1fbd8a
This commit is contained in:
J. Ryan Stinnett 2018-03-06 14:14:55 -06:00
parent c6cf60a39f
commit d56f6a7b1f
21 changed files with 20 additions and 11 deletions

View File

@ -31,7 +31,6 @@ browser/chrome/devtools/content/inspector/fonts/fonts.js
browser/chrome/devtools/content/inspector/inspector.xhtml
browser/chrome/devtools/content/memory/initializer.js
browser/chrome/devtools/content/projecteditor/lib/helpers/readdir.js
browser/chrome/devtools/content/shared/frame-script-utils.js
browser/chrome/devtools/content/shared/theme-switching.js
browser/chrome/devtools/modules/devtools/client/dom/content/dom-view.css
browser/chrome/devtools/modules/devtools/client/dom/dom.html
@ -43,7 +42,6 @@ browser/chrome/devtools/modules/devtools/client/jsonview/css/controls.png
browser/chrome/devtools/modules/devtools/client/jsonview/css/controls@2x.png
browser/chrome/devtools/modules/devtools/client/memory/initializer.js
browser/chrome/devtools/modules/devtools/client/projecteditor/lib/helpers/readdir.js
browser/chrome/devtools/modules/devtools/client/shared/frame-script-utils.js
browser/chrome/devtools/modules/devtools/client/shared/theme-switching.js
browser/chrome/devtools/modules/devtools/client/themes/common.css
browser/chrome/devtools/modules/devtools/client/themes/toolbars.css

View File

@ -22,6 +22,7 @@ support-files =
!/devtools/client/commandline/test/helpers.js
!/devtools/client/inspector/test/head.js
!/devtools/client/inspector/test/shared-head.js
!/devtools/client/shared/test/frame-script-utils.js
!/devtools/client/shared/test/shared-head.js
!/devtools/client/shared/test/test-actor-registry.js
!/devtools/client/shared/test/test-actor.js

View File

@ -15,6 +15,7 @@ support-files =
doc_webgl-drawArrays.html
doc_webgl-drawElements.html
head.js
!/devtools/client/shared/test/frame-script-utils.js
!/devtools/client/shared/test/shared-head.js
[browser_canvas-actor-test-01.js]

View File

@ -5,6 +5,7 @@ support-files =
head.js
page_array.html
page_basic.html
!/devtools/client/shared/test/frame-script-utils.js
!/devtools/client/shared/test/shared-head.js
[browser_dom_array.js]

View File

@ -37,7 +37,7 @@ function addTestTab(url) {
return new Promise(resolve => {
addTab(url).then(tab => {
// Load devtools/shared/frame-script-utils.js
// Load devtools/shared/test/frame-script-utils.js
loadFrameScriptUtils();
// Select the DOM panel and wait till it's initialized.

View File

@ -44,6 +44,7 @@ support-files =
sjs_code_bundle_reload_map.sjs
test_browser_toolbox_debugger.js
!/devtools/client/debugger/new/test/mochitest/head.js
!/devtools/client/shared/test/frame-script-utils.js
!/devtools/client/shared/test/shared-head.js
!/devtools/client/shared/test/shared-redux-head.js

View File

@ -9,6 +9,7 @@ support-files =
head.js
!/devtools/client/inspector/test/head.js
!/devtools/client/inspector/test/shared-head.js
!/devtools/client/shared/test/frame-script-utils.js
!/devtools/client/shared/test/shared-head.js
!/devtools/client/shared/test/test-actor-registry.js
!/devtools/client/shared/test/test-actor.js

View File

@ -15,7 +15,6 @@ devtools.jar:
content/scratchpad/scratchpad.js (scratchpad/scratchpad.js)
content/shared/splitview.css (shared/splitview.css)
content/shared/theme-switching.js (shared/theme-switching.js)
content/shared/frame-script-utils.js (shared/frame-script-utils.js)
* content/styleeditor/styleeditor.xul (styleeditor/styleeditor.xul)
* content/storage/storage.xul (storage/storage.xul)
content/inspector/inspector.js (inspector/inspector.js)

View File

@ -20,6 +20,7 @@ support-files =
valid_json.json^headers^
!/devtools/client/commandline/test/head.js
!/devtools/client/framework/test/head.js
!/devtools/client/shared/test/frame-script-utils.js
!/devtools/client/shared/test/shared-head.js
[browser_json_refresh.js]

View File

@ -65,7 +65,7 @@ async function addJsonViewTab(url, {
}, Ci.nsIWebProgress.NOTIFY_LOCATION);
})]);
// Load devtools/shared/frame-script-utils.js
// Load devtools/shared/test/frame-script-utils.js
loadFrameScriptUtils();
let rootDir = getRootDirectory(gTestPath);

View File

@ -52,10 +52,11 @@ support-files =
test-image.png
service-workers/status-codes.html
service-workers/status-codes-service-worker.js
!/devtools/client/shared/test/shared-head.js
xhr_bundle.js
xhr_bundle.js.map
xhr_original.js
!/devtools/client/shared/test/frame-script-utils.js
!/devtools/client/shared/test/shared-head.js
[browser_net_accessibility-01.js]
[browser_net_accessibility-02.js]

View File

@ -621,7 +621,7 @@ function testFilterButtonsCustom(monitor, isChecked) {
*
* @param Array requests
* An array of objects specifying the requests to perform. See
* shared/frame-script-utils.js for more information.
* shared/test/frame-script-utils.js for more information.
*
* @return A promise that resolves once the requests complete.
*/
@ -636,7 +636,7 @@ function performRequestsInContent(requests) {
*
* @param String name
* The message name. Should be one of the messages defined
* shared/frame-script-utils.js
* shared/test/frame-script-utils.js
* @param Object data
* Optional data to send along
* @param Object objects

View File

@ -10,6 +10,7 @@ support-files =
doc_worker.html
js_simpleWorker.js
head.js
!/devtools/client/shared/test/frame-script-utils.js
[browser_aaa-run-first-leaktest.js]
[browser_perf-button-states.js]

View File

@ -12,7 +12,7 @@
const { Cc, Ci } = require("chrome");
const { Task } = require("devtools/shared/task");
const FRAME_SCRIPT_UTILS_URL = "chrome://devtools/content/shared/frame-script-utils.js";
const FRAME_SCRIPT_UTILS_URL = "chrome://mochitests/content/browser/devtools/client/shared/test/frame-script-utils.js";
let gMM = null;

View File

@ -8,6 +8,7 @@ support-files =
doc_shader-order.html
doc_simple-canvas.html
head.js
!/devtools/client/shared/test/frame-script-utils.js
!/devtools/client/shared/test/shared-head.js
[browser_se_aaa_run_first_leaktest.js]

View File

@ -27,6 +27,7 @@ support-files =
doc_toolbar_basic.html
doc_toolbar_webconsole_errors_count.html
dummy.html
frame-script-utils.js
head.js
helper_color_data.js
helper_html_tooltip.js

View File

@ -119,7 +119,7 @@ var waitForTime = DevToolsUtils.waitForTime;
function loadFrameScriptUtils(browser = gBrowser.selectedBrowser) {
let mm = browser.messageManager;
let frameURL = "chrome://devtools/content/shared/frame-script-utils.js";
let frameURL = "chrome://mochitests/content/browser/devtools/client/shared/test/frame-script-utils.js";
info("Loading the helper frame script " + frameURL);
mm.loadFrameScript(frameURL, false);
SimpleTest.registerCleanupFunction(() => {

View File

@ -18,6 +18,7 @@ support-files =
doc_bug_1141261.html
440hz_sine.ogg
head.js
!/devtools/client/shared/test/frame-script-utils.js
!/devtools/client/shared/test/shared-head.js
[browser_audionode-actor-get-param-flags.js]

View File

@ -11,6 +11,7 @@ support-files =
test.txt
test.xml
test.xml^headers^
!/devtools/client/shared/test/frame-script-utils.js
!/devtools/client/shared/test/shared-head.js
!/devtools/client/webconsole/test/head.js

View File

@ -40,7 +40,7 @@ function addTestTab(url) {
return Task.spawn(function* () {
let tab = yield addTab(url);
// Load devtools/shared/frame-script-utils.js
// Load devtools/shared/test/frame-script-utils.js
loadFrameScriptUtils(tab.linkedBrowser);
// Open the Console panel