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
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -26,29 +26,27 @@ browser/chrome/browser/skin/classic/brow
browser/chrome/devtools/content/dom/content/dom-view.css
browser/chrome/devtools/content/dom/dom.html
browser/chrome/devtools/content/dom/main.js
browser/chrome/devtools/content/framework/toolbox-options.js
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
browser/chrome/devtools/modules/devtools/client/dom/main.js
browser/chrome/devtools/modules/devtools/client/framework/toolbox-options.js
browser/chrome/devtools/modules/devtools/client/inspector/fonts/fonts.js
browser/chrome/devtools/modules/devtools/client/inspector/inspector.xhtml
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
browser/chrome/devtools/modules/devtools/client/themes/variables.css
browser/chrome/devtools/skin/common.css
browser/chrome/devtools/skin/toolbars.css
browser/chrome/devtools/skin/images/command-scratchpad.svg
browser/chrome/devtools/skin/images/controls.png
--- a/devtools/client/animationinspector/test/browser.ini
+++ b/devtools/client/animationinspector/test/browser.ini
@@ -17,16 +17,17 @@ support-files =
doc_multiple_animation_types.html
doc_multiple_easings.html
doc_multiple_property_types.html
doc_timing_combination_animation.html
head.js
!/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
[browser_animation_animated_properties_displayed.js]
[browser_animation_animated_properties_for_delayed_starttime_animations.js]
[browser_animation_animated_properties_path.js]
[browser_animation_animated_properties_progress_indicator.js]
--- a/devtools/client/canvasdebugger/test/browser.ini
+++ b/devtools/client/canvasdebugger/test/browser.ini
@@ -10,16 +10,17 @@ support-files =
doc_simple-canvas-bitmasks.html
doc_simple-canvas-deep-stack.html
doc_simple-canvas-transparent.html
doc_webgl-bindings.html
doc_webgl-enum.html
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]
[browser_canvas-actor-test-02.js]
[browser_canvas-actor-test-03.js]
[browser_canvas-actor-test-04.js]
[browser_canvas-actor-test-05.js]
[browser_canvas-actor-test-06.js]
--- a/devtools/client/dom/test/browser.ini
+++ b/devtools/client/dom/test/browser.ini
@@ -1,12 +1,13 @@
[DEFAULT]
tags = devtools
subsuite = devtools
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]
[browser_dom_basic.js]
[browser_dom_refresh.js]
--- a/devtools/client/dom/test/head.js
+++ b/devtools/client/dom/test/head.js
@@ -32,17 +32,17 @@ registerCleanupFunction(() => {
* @return a promise that resolves to the tab object when
* the url is loaded
*/
function addTestTab(url) {
info("Adding a new test tab with URL: '" + 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.
initDOMPanel(tab).then(panel => {
waitForDispatch(panel, "FETCH_PROPERTIES").then(() => {
resolve({
tab: tab,
browser: tab.linkedBrowser,
--- a/devtools/client/framework/test/browser.ini
+++ b/devtools/client/framework/test/browser.ini
@@ -39,16 +39,17 @@ support-files =
doc_viewsource.html
browser_toolbox_options_enable_serviceworkers_testing_frame_script.js
browser_toolbox_options_enable_serviceworkers_testing.html
serviceworker.js
sjs_code_reload.sjs
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
[browser_browser_toolbox.js]
skip-if = coverage # Bug 1387827
[browser_browser_toolbox_debugger.js]
skip-if = debug # Bug 1282269
[browser_devtools_api.js]
--- a/devtools/client/inspector/animation/test/browser.ini
+++ b/devtools/client/inspector/animation/test/browser.ini
@@ -4,16 +4,17 @@ subsuite = devtools
support-files =
doc_multi_easings.html
doc_multi_keyframes.html
doc_multi_timings.html
doc_simple_animation.html
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
[browser_animation_animated-property-list.js]
[browser_animation_animated-property-name.js]
[browser_animation_animation-detail_close-button.js]
[browser_animation_animation-detail_title.js]
--- a/devtools/client/jar.mn
+++ b/devtools/client/jar.mn
@@ -10,17 +10,16 @@ devtools.jar:
content/shared/widgets/VariablesView.xul (shared/widgets/VariablesView.xul)
content/webconsole/webconsole.html (webconsole/webconsole.html)
content/webconsole/browserconsole.xul (webconsole/browserconsole.xul)
* content/webconsole/webconsole.xul (webconsole/webconsole.xul)
* content/scratchpad/scratchpad.xul (scratchpad/scratchpad.xul)
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)
content/inspector/markup/markup.xhtml (inspector/markup/markup.xhtml)
content/animationinspector/animation-controller.js (animationinspector/animation-controller.js)
content/animationinspector/animation-panel.js (animationinspector/animation-panel.js)
content/animationinspector/animation-inspector.xhtml (animationinspector/animation-inspector.xhtml)
content/sourceeditor/codemirror/addon/dialog/dialog.css (sourceeditor/codemirror/addon/dialog/dialog.css)
--- a/devtools/client/jsonview/test/browser.ini
+++ b/devtools/client/jsonview/test/browser.ini
@@ -15,16 +15,17 @@ support-files =
manifest_json.json^headers^
passthrough-sw.js
simple_json.json
simple_json.json^headers^
valid_json.json
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]
[browser_jsonview_bug_1380828.js]
[browser_jsonview_chunked_json.js]
support-files =
chunked_json.sjs
[browser_jsonview_content_type.js]
--- a/devtools/client/jsonview/test/head.js
+++ b/devtools/client/jsonview/test/head.js
@@ -60,17 +60,17 @@ async function addJsonViewTab(url, {
onLocationChange(webProgress) {
// Fires when the tab is ready but before completely loaded.
webProgress.removeProgressListener(this);
resolve();
},
}, Ci.nsIWebProgress.NOTIFY_LOCATION);
})]);
- // Load devtools/shared/frame-script-utils.js
+ // Load devtools/shared/test/frame-script-utils.js
loadFrameScriptUtils();
let rootDir = getRootDirectory(gTestPath);
// Catch RequireJS errors (usually timeouts)
let error = tabLoaded.then(() => new Promise((resolve, reject) => {
let {requirejs} = content.wrappedJSObject;
if (requirejs) {
requirejs.onError = err => {
--- a/devtools/client/netmonitor/test/browser.ini
+++ b/devtools/client/netmonitor/test/browser.ini
@@ -47,20 +47,21 @@ support-files =
sjs_simple-test-server.sjs
sjs_simple-unsorted-cookies-test-server.sjs
sjs_sorting-test-server.sjs
sjs_status-codes-test-server.sjs
sjs_truncate-test-server.sjs
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]
[browser_net_api-calls.js]
[browser_net_background_update.js]
[browser_net_autoscroll.js]
[browser_net_cached-status.js]
[browser_net_cause.js]
--- a/devtools/client/netmonitor/test/head.js
+++ b/devtools/client/netmonitor/test/head.js
@@ -616,32 +616,32 @@ function testFilterButtonsCustom(monitor
}
}
/**
* Perform the specified requests in the context of the page content.
*
* @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.
*/
function performRequestsInContent(requests) {
info("Performing requests in the context of the content.");
return executeInContent("devtools:test:xhr", requests);
}
/**
* Send an async message to the frame script (chrome -> content) and wait for a
* response message with the same name (content -> chrome).
*
* @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
* Optional CPOW objects to send along
* @param Boolean expectResponse
* If set to false, don't wait for a response with the same name from the
* content script. Defaults to true.
*
--- a/devtools/client/performance/test/browser.ini
+++ b/devtools/client/performance/test/browser.ini
@@ -5,16 +5,17 @@ skip-if = os == 'linux' && e10s && (asan
support-files =
doc_allocs.html
doc_innerHTML.html
doc_markers.html
doc_simple-test.html
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]
[browser_perf-calltree-js-categories.js]
[browser_perf-calltree-js-columns.js]
[browser_perf-calltree-js-events.js]
[browser_perf-calltree-memory-columns.js]
[browser_perf-console-record-01.js]
--- a/devtools/client/performance/test/helpers/profiler-mm-utils.js
+++ b/devtools/client/performance/test/helpers/profiler-mm-utils.js
@@ -7,17 +7,17 @@
* The following functions are used in testing to control and inspect
* the nsIProfiler in child process content. These should be called from
* the parent process.
*/
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;
/**
* Loads the relevant frame scripts into the provided browser's message manager.
*/
exports.pmmLoadFrameScripts = (gBrowser) => {
gMM = gBrowser.selectedBrowser.messageManager;
--- a/devtools/client/shadereditor/test/browser.ini
+++ b/devtools/client/shadereditor/test/browser.ini
@@ -3,16 +3,17 @@ tags = devtools
subsuite = devtools
support-files =
doc_blended-geometry.html
doc_multiple-contexts.html
doc_overlapping-geometry.html
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]
[browser_se_bfcache.js]
skip-if = true # Bug 942473, caused by Bug 940541
[browser_se_editors-contents.js]
[browser_se_editors-error-gutter.js]
[browser_se_editors-error-tooltip.js]
--- a/devtools/client/shared/test/browser.ini
+++ b/devtools/client/shared/test/browser.ini
@@ -22,16 +22,17 @@ support-files =
doc_spectrum.html
doc_tableWidget_basic.html
doc_tableWidget_keyboard_interaction.xul
doc_tableWidget_mouse_interaction.xul
doc_templater_basic.html
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
helper_inplace_editor.js
leakhunt.js
shared-head.js
shared-redux-head.js
test-actor-registry.js
rename from devtools/client/shared/frame-script-utils.js
rename to devtools/client/shared/test/frame-script-utils.js
--- a/devtools/client/shared/test/shared-head.js
+++ b/devtools/client/shared/test/shared-head.js
@@ -114,17 +114,17 @@ if (DEBUG_ALLOCATIONS) {
tracker.stop();
});
}
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(() => {
mm = null;
});
return mm;
}
--- a/devtools/client/webaudioeditor/test/browser.ini
+++ b/devtools/client/webaudioeditor/test/browser.ini
@@ -13,16 +13,17 @@ support-files =
doc_iframe-context.html
doc_automation.html
doc_bug_1112378.html
doc_bug_1125817.html
doc_bug_1130901.html
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]
[browser_audionode-actor-get-params-01.js]
[browser_audionode-actor-get-params-02.js]
[browser_audionode-actor-get-set-param.js]
[browser_audionode-actor-type.js]
[browser_audionode-actor-source.js]
--- a/devtools/client/webconsole/net/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/net/test/mochitest/browser.ini
@@ -6,16 +6,17 @@ support-files =
page_basic.html
test.json
test.json^headers^
test-cookies.json
test-cookies.json^headers^
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
[browser_net_basic.js]
[browser_net_cookies.js]
[browser_net_headers.js]
[browser_net_params.js]
[browser_net_post.js]
--- a/devtools/client/webconsole/net/test/mochitest/head.js
+++ b/devtools/client/webconsole/net/test/mochitest/head.js
@@ -35,17 +35,17 @@ registerCleanupFunction(function* () {
* @return a promise that resolves to the tab object when the url is loaded
*/
function addTestTab(url) {
info("Adding a new JSON tab with URL: '" + 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
let hud = yield openConsole();
return {
tab: tab,
browser: tab.linkedBrowser,