Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 23:02:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1714348 - [marionette] Update chrome imports for Marionette modules to /remote/content/marionette r=webdriver-reviewers,Gijs,whimboo

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D116732
This commit is contained in:
Julian Descottes 2021-06-07 10:08:24 +00:00
parent f40fc32ec5
commit 5f47d42219
85 changed files with 346 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
browser/base/content/test/static/browser_all_files_referenced.js
View File

@ -188,10 +188,10 @@ var whitelist = [
platforms: ["linux", "macosx"],
},
// Bug 1344267
{ file: "chrome://marionette/content/test.xhtml" },
{ file: "chrome://marionette/content/test_dialog.properties" },
{ file: "chrome://marionette/content/test_dialog.xhtml" },
{ file: "chrome://marionette/content/test_menupopup.xhtml" },
{ file: "chrome://remote/content/marionette/test.xhtml" },
{ file: "chrome://remote/content/marionette/test_dialog.properties" },
{ file: "chrome://remote/content/marionette/test_dialog.xhtml" },
{ file: "chrome://remote/content/marionette/test_menupopup.xhtml" },
// Bug 1348559
{ file: "chrome://pippki/content/resetpassword.xhtml" },
// Bug 1337345
@ -334,7 +334,7 @@ if (!isDevtools) {
}
if (AppConstants.MOZ_CODE_COVERAGE) {
whitelist.add("chrome://marionette/content/PerTestCoverageUtils.jsm");
whitelist.add("chrome://remote/content/marionette/PerTestCoverageUtils.jsm");
}
const gInterestingCategories = new Set([

2
browser/installer/package-manifest.in
View File

@ -203,8 +203,6 @@
; WebDriver (Marionette, Remote Agent) remote protocols
#ifdef ENABLE_WEBDRIVER
@RESPATH@/chrome/marionette@JAREXT@
@RESPATH@/chrome/marionette.manifest
@RESPATH@/components/marionette.manifest
@RESPATH@/components/marionette.js
@RESPATH@/chrome/remote@JAREXT@

2
browser/modules/test/browser/browser_Telemetry_numberOfSiteOrigins.js
View File

@ -21,7 +21,7 @@ const gTestRoot = getRootDirectory(gTestPath).replace(
);
const { TimedPromise } = ChromeUtils.import(
"chrome://marionette/content/sync.js"
"chrome://remote/content/marionette/sync.js"
);
async function run_test(count) {

2
mobile/android/installer/package-manifest.in
View File

@ -207,8 +207,6 @@
; WebDriver (Marionette, Remote Agent) remote protocols
#ifdef ENABLE_WEBDRIVER
@BINPATH@/chrome/marionette@JAREXT@
@BINPATH@/chrome/marionette.manifest
@BINPATH@/components/marionette.manifest
@BINPATH@/components/marionette.js
@BINPATH@/chrome/remote@JAREXT@

8
remote/components/marionette.js
View File

@ -12,11 +12,11 @@ const { XPCOMUtils } = ChromeUtils.import(
XPCOMUtils.defineLazyModuleGetters(this, {
ComponentUtils: "resource://gre/modules/ComponentUtils.jsm",
EnvironmentPrefs: "chrome://marionette/content/prefs.js",
Log: "chrome://marionette/content/log.js",
MarionettePrefs: "chrome://marionette/content/prefs.js",
EnvironmentPrefs: "chrome://remote/content/marionette/prefs.js",
Log: "chrome://remote/content/marionette/log.js",
MarionettePrefs: "chrome://remote/content/marionette/prefs.js",
Preferences: "resource://gre/modules/Preferences.jsm",
TCPListener: "chrome://marionette/content/server.js",
TCPListener: "chrome://remote/content/marionette/server.js",
});
XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());

4
remote/marionette/accessibility.js
View File

@ -12,8 +12,8 @@ const { XPCOMUtils } = ChromeUtils.import(
);
XPCOMUtils.defineLazyModuleGetters(this, {
error: "chrome://marionette/content/error.js",
Log: "chrome://marionette/content/log.js",
error: "chrome://remote/content/marionette/error.js",
Log: "chrome://remote/content/marionette/log.js",
});
XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());

14
remote/marionette/action.js
View File

@ -14,13 +14,13 @@ const { XPCOMUtils } = ChromeUtils.import(
);
XPCOMUtils.defineLazyModuleGetters(this, {
AppInfo: "chrome://marionette/content/appinfo.js",
assert: "chrome://marionette/content/assert.js",
element: "chrome://marionette/content/element.js",
error: "chrome://marionette/content/error.js",
event: "chrome://marionette/content/event.js",
pprint: "chrome://marionette/content/format.js",
Sleep: "chrome://marionette/content/sync.js",
AppInfo: "chrome://remote/content/marionette/appinfo.js",
assert: "chrome://remote/content/marionette/assert.js",
element: "chrome://remote/content/marionette/element.js",
error: "chrome://remote/content/marionette/error.js",
event: "chrome://remote/content/marionette/event.js",
pprint: "chrome://remote/content/marionette/format.js",
Sleep: "chrome://remote/content/marionette/sync.js",
});
// TODO? With ES 2016 and Symbol you can make a safer approximation

22
remote/marionette/actors/MarionetteCommandsChild.jsm
View File

@ -15,17 +15,17 @@ const { XPCOMUtils } = ChromeUtils.import(
XPCOMUtils.defineLazyModuleGetters(this, {
Services: "resource://gre/modules/Services.jsm",
action: "chrome://marionette/content/action.js",
atom: "chrome://marionette/content/atom.js",
element: "chrome://marionette/content/element.js",
error: "chrome://marionette/content/error.js",
evaluate: "chrome://marionette/content/evaluate.js",
event: "chrome://marionette/content/event.js",
interaction: "chrome://marionette/content/interaction.js",
legacyaction: "chrome://marionette/content/legacyaction.js",
Log: "chrome://marionette/content/log.js",
sandbox: "chrome://marionette/content/evaluate.js",
Sandboxes: "chrome://marionette/content/evaluate.js",
action: "chrome://remote/content/marionette/action.js",
atom: "chrome://remote/content/marionette/atom.js",
element: "chrome://remote/content/marionette/element.js",
error: "chrome://remote/content/marionette/error.js",
evaluate: "chrome://remote/content/marionette/evaluate.js",
event: "chrome://remote/content/marionette/event.js",
interaction: "chrome://remote/content/marionette/interaction.js",
legacyaction: "chrome://remote/content/marionette/legacyaction.js",
Log: "chrome://remote/content/marionette/log.js",
sandbox: "chrome://remote/content/marionette/evaluate.js",
Sandboxes: "chrome://remote/content/marionette/evaluate.js",
});
XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());

14
remote/marionette/actors/MarionetteCommandsParent.jsm
View File

@ -17,11 +17,11 @@ const { XPCOMUtils } = ChromeUtils.import(
);
XPCOMUtils.defineLazyModuleGetters(this, {
capture: "chrome://marionette/content/capture.js",
element: "chrome://marionette/content/element.js",
error: "chrome://marionette/content/error.js",
evaluate: "chrome://marionette/content/evaluate.js",
Log: "chrome://marionette/content/log.js",
capture: "chrome://remote/content/marionette/capture.js",
element: "chrome://remote/content/marionette/element.js",
error: "chrome://remote/content/marionette/error.js",
evaluate: "chrome://remote/content/marionette/evaluate.js",
Log: "chrome://remote/content/marionette/log.js",
});
XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());
@ -365,11 +365,11 @@ function registerCommandsActor() {
kind: "JSWindowActor",
parent: {
moduleURI:
"chrome://marionette/content/actors/MarionetteCommandsParent.jsm",
"chrome://remote/content/marionette/actors/MarionetteCommandsParent.jsm",
},
child: {
moduleURI:
"chrome://marionette/content/actors/MarionetteCommandsChild.jsm",
"chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm",
},
allFrames: true,

6
remote/marionette/actors/MarionetteEventsChild.jsm
View File

@ -13,9 +13,9 @@ const { XPCOMUtils } = ChromeUtils.import(
);
XPCOMUtils.defineLazyModuleGetters(this, {
event: "chrome://marionette/content/event.js",
Log: "chrome://marionette/content/log.js",
MarionettePrefs: "chrome://marionette/content/prefs.js",
event: "chrome://remote/content/marionette/event.js",
Log: "chrome://remote/content/marionette/log.js",
MarionettePrefs: "chrome://remote/content/marionette/prefs.js",
});
XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());

6
remote/marionette/actors/MarionetteEventsParent.jsm
View File

@ -17,7 +17,7 @@ const { XPCOMUtils } = ChromeUtils.import(
XPCOMUtils.defineLazyModuleGetters(this, {
EventEmitter: "resource://gre/modules/EventEmitter.jsm",
Log: "chrome://marionette/content/log.js",
Log: "chrome://remote/content/marionette/log.js",
});
XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());
@ -55,11 +55,11 @@ function registerEventsActor() {
kind: "JSWindowActor",
parent: {
moduleURI:
"chrome://marionette/content/actors/MarionetteEventsParent.jsm",
"chrome://remote/content/marionette/actors/MarionetteEventsParent.jsm",
},
child: {
moduleURI:
"chrome://marionette/content/actors/MarionetteEventsChild.jsm",
"chrome://remote/content/marionette/actors/MarionetteEventsChild.jsm",
events: {
beforeunload: { capture: true },
DOMContentLoaded: { mozSystemGroup: true },

2
remote/marionette/actors/MarionetteReftestChild.jsm
View File

@ -11,7 +11,7 @@ const { XPCOMUtils } = ChromeUtils.import(
);
XPCOMUtils.defineLazyModuleGetters(this, {
Log: "chrome://marionette/content/log.js",
Log: "chrome://remote/content/marionette/log.js",
});
XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());

2
remote/marionette/addon.js
View File

@ -14,7 +14,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
FileUtils: "resource://gre/modules/FileUtils.jsm",
error: "chrome://marionette/content/error.js",
error: "chrome://remote/content/marionette/error.js",
});
// from https://developer.mozilla.org/en-US/Add-ons/Add-on_Manager/AddonManager#AddonInstall_errors

10
remote/marionette/assert.js
View File

@ -14,11 +14,11 @@ const { XPCOMUtils } = ChromeUtils.import(
XPCOMUtils.defineLazyModuleGetters(this, {
AppConstants: "resource://gre/modules/AppConstants.jsm",
AppInfo: "chrome://marionette/content/appinfo.js",
browser: "chrome://marionette/content/browser.js",
error: "chrome://marionette/content/error.js",
evaluate: "chrome://marionette/content/evaluate.js",
pprint: "chrome://marionette/content/format.js",
AppInfo: "chrome://remote/content/marionette/appinfo.js",
browser: "chrome://remote/content/marionette/browser.js",
error: "chrome://remote/content/marionette/error.js",
evaluate: "chrome://remote/content/marionette/evaluate.js",
pprint: "chrome://remote/content/marionette/format.js",
});
/**

16
remote/marionette/browser.js
View File

@ -13,14 +13,14 @@ const { XPCOMUtils } = ChromeUtils.import(
);
XPCOMUtils.defineLazyModuleGetters(this, {
AppInfo: "chrome://marionette/content/appinfo.js",
element: "chrome://marionette/content/element.js",
error: "chrome://marionette/content/error.js",
Log: "chrome://marionette/content/log.js",
MessageManagerDestroyedPromise: "chrome://marionette/content/sync.js",
waitForEvent: "chrome://marionette/content/sync.js",
WebElementEventTarget: "chrome://marionette/content/dom.js",
windowManager: "chrome://marionette/content/window-manager.js",
AppInfo: "chrome://remote/content/marionette/appinfo.js",
element: "chrome://remote/content/marionette/element.js",
error: "chrome://remote/content/marionette/error.js",
Log: "chrome://remote/content/marionette/log.js",
MessageManagerDestroyedPromise: "chrome://remote/content/marionette/sync.js",
waitForEvent: "chrome://remote/content/marionette/sync.js",
WebElementEventTarget: "chrome://remote/content/marionette/dom.js",
windowManager: "chrome://remote/content/marionette/window-manager.js",
});
XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());

2
remote/marionette/capture.js
View File

@ -11,7 +11,7 @@ const { XPCOMUtils } = ChromeUtils.import(
);
XPCOMUtils.defineLazyModuleGetters(this, {
Log: "chrome://marionette/content/log.js",
Log: "chrome://remote/content/marionette/log.js",
});
XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());

6
remote/marionette/chrome/test.xhtml
View File

@ -19,9 +19,9 @@
<input xmlns="http://www.w3.org/1999/xhtml" id="textInput3" class="asdf" size="6" value="test" label="input" />
</vbox>
<iframe id="iframe" name="iframename" src="chrome://marionette/content/test2.xhtml"/>
<iframe id="iframe" name="iframename" src="chrome://marionette/content/test_nested_iframe.xhtml"/>
<iframe id="iframe" name="iframename" src="chrome://remote/content/marionette/test2.xhtml"/>
<iframe id="iframe" name="iframename" src="chrome://remote/content/marionette/test_nested_iframe.xhtml"/>
<hbox id="testXulBox"/>
<browser id='aBrowser' src="chrome://marionette/content/test2.xhtml"/>
<browser id='aBrowser' src="chrome://remote/content/marionette/test2.xhtml"/>
</dialog>
</window>

2
remote/marionette/chrome/test_dialog.xhtml
View File

@ -4,7 +4,7 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!DOCTYPE testdialog [
<!ENTITY % dialogDTD SYSTEM "chrome://marionette/content/test_dialog.dtd" >
<!ENTITY % dialogDTD SYSTEM "chrome://remote/content/marionette/test_dialog.dtd" >
%dialogDTD;
]>

6
remote/marionette/cookie.js
View File

@ -12,9 +12,9 @@ const { XPCOMUtils } = ChromeUtils.import(
);
XPCOMUtils.defineLazyModuleGetters(this, {
assert: "chrome://marionette/content/assert.js",
error: "chrome://marionette/content/error.js",
pprint: "chrome://marionette/content/format.js",
assert: "chrome://remote/content/marionette/assert.js",
error: "chrome://remote/content/marionette/error.js",
pprint: "chrome://remote/content/marionette/format.js",
});
const IPV4_PORT_EXPR = /:\d+$/;

4
remote/marionette/doc/CodeStyle.md
View File

@ -46,13 +46,13 @@ your exported symbols to the shared global `this`:
When importing symbols in Marionette code, try to be specific about
what you need:
const {TimedPromise} = Cu.import("chrome://marionette/content/sync.js", {});
const {TimedPromise} = Cu.import("chrome://remote/content/marionette/sync.js", {});
The [linter] will complain if you import a named symbol that is
not in use. If however you _need_ to import every symbol, you can:
const wait = {};
Cu.import("chrome://marionette/content/sync.js", wait);
Cu.import("chrome://remote/content/marionette/sync.js", wait);
wait.sleep(42);
await wait.TimedPromise(…);

2
remote/marionette/dom.js
View File

@ -14,7 +14,7 @@ const { XPCOMUtils } = ChromeUtils.import(
);
XPCOMUtils.defineLazyModuleGetters(this, {
Log: "chrome://marionette/content/log.js",
Log: "chrome://remote/content/marionette/log.js",
});
XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());

76
remote/marionette/driver.js
View File

@ -15,50 +15,50 @@ XPCOMUtils.defineLazyModuleGetters(this, {
OS: "resource://gre/modules/osfile.jsm",
Services: "resource://gre/modules/Services.jsm",
Addon: "chrome://marionette/content/addon.js",
AppInfo: "chrome://marionette/content/appinfo.js",
assert: "chrome://marionette/content/assert.js",
atom: "chrome://marionette/content/atom.js",
browser: "chrome://marionette/content/browser.js",
capture: "chrome://marionette/content/capture.js",
Addon: "chrome://remote/content/marionette/addon.js",
AppInfo: "chrome://remote/content/marionette/appinfo.js",
assert: "chrome://remote/content/marionette/assert.js",
atom: "chrome://remote/content/marionette/atom.js",
browser: "chrome://remote/content/marionette/browser.js",
capture: "chrome://remote/content/marionette/capture.js",
clearElementIdCache:
"chrome://marionette/content/actors/MarionetteCommandsParent.jsm",
Context: "chrome://marionette/content/browser.js",
cookie: "chrome://marionette/content/cookie.js",
DebounceCallback: "chrome://marionette/content/sync.js",
element: "chrome://marionette/content/element.js",
error: "chrome://marionette/content/error.js",
"chrome://remote/content/marionette/actors/MarionetteCommandsParent.jsm",
Context: "chrome://remote/content/marionette/browser.js",
cookie: "chrome://remote/content/marionette/cookie.js",
DebounceCallback: "chrome://remote/content/marionette/sync.js",
element: "chrome://remote/content/marionette/element.js",
error: "chrome://remote/content/marionette/error.js",
getMarionetteCommandsActorProxy:
"chrome://marionette/content/actors/MarionetteCommandsParent.jsm",
IdlePromise: "chrome://marionette/content/sync.js",
l10n: "chrome://marionette/content/l10n.js",
Log: "chrome://marionette/content/log.js",
MarionettePrefs: "chrome://marionette/content/prefs.js",
modal: "chrome://marionette/content/modal.js",
navigate: "chrome://marionette/content/navigate.js",
permissions: "chrome://marionette/content/permissions.js",
PollPromise: "chrome://marionette/content/sync.js",
pprint: "chrome://marionette/content/format.js",
print: "chrome://marionette/content/print.js",
reftest: "chrome://marionette/content/reftest.js",
"chrome://remote/content/marionette/actors/MarionetteCommandsParent.jsm",
IdlePromise: "chrome://remote/content/marionette/sync.js",
l10n: "chrome://remote/content/marionette/l10n.js",
Log: "chrome://remote/content/marionette/log.js",
MarionettePrefs: "chrome://remote/content/marionette/prefs.js",
modal: "chrome://remote/content/marionette/modal.js",
navigate: "chrome://remote/content/marionette/navigate.js",
permissions: "chrome://remote/content/marionette/permissions.js",
PollPromise: "chrome://remote/content/marionette/sync.js",
pprint: "chrome://remote/content/marionette/format.js",
print: "chrome://remote/content/marionette/print.js",
reftest: "chrome://remote/content/marionette/reftest.js",
registerCommandsActor:
"chrome://marionette/content/actors/MarionetteCommandsParent.jsm",
"chrome://remote/content/marionette/actors/MarionetteCommandsParent.jsm",
registerEventsActor:
"chrome://marionette/content/actors/MarionetteEventsParent.jsm",
TimedPromise: "chrome://marionette/content/sync.js",
Timeouts: "chrome://marionette/content/session.js",
UnhandledPromptBehavior: "chrome://marionette/content/session.js",
"chrome://remote/content/marionette/actors/MarionetteEventsParent.jsm",
TimedPromise: "chrome://remote/content/marionette/sync.js",
Timeouts: "chrome://remote/content/marionette/session.js",
UnhandledPromptBehavior: "chrome://remote/content/marionette/session.js",
unregisterCommandsActor:
"chrome://marionette/content/actors/MarionetteCommandsParent.jsm",
"chrome://remote/content/marionette/actors/MarionetteCommandsParent.jsm",
unregisterEventsActor:
"chrome://marionette/content/actors/MarionetteEventsParent.jsm",
waitForLoadEvent: "chrome://marionette/content/sync.js",
waitForObserverTopic: "chrome://marionette/content/sync.js",
WebDriverSession: "chrome://marionette/content/session.js",
WebElement: "chrome://marionette/content/element.js",
WebElementEventTarget: "chrome://marionette/content/dom.js",
windowManager: "chrome://marionette/content/window-manager.js",
WindowState: "chrome://marionette/content/browser.js",
"chrome://remote/content/marionette/actors/MarionetteEventsParent.jsm",
waitForLoadEvent: "chrome://remote/content/marionette/sync.js",
waitForObserverTopic: "chrome://remote/content/marionette/sync.js",
WebDriverSession: "chrome://remote/content/marionette/session.js",
WebElement: "chrome://remote/content/marionette/element.js",
WebElementEventTarget: "chrome://remote/content/marionette/dom.js",
windowManager: "chrome://remote/content/marionette/window-manager.js",
WindowState: "chrome://remote/content/marionette/browser.js",
});
XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());

10
remote/marionette/element.js
View File

@ -21,11 +21,11 @@ const { XPCOMUtils } = ChromeUtils.import(
XPCOMUtils.defineLazyModuleGetters(this, {
ContentDOMReference: "resource://gre/modules/ContentDOMReference.jsm",
assert: "chrome://marionette/content/assert.js",
atom: "chrome://marionette/content/atom.js",
error: "chrome://marionette/content/error.js",
PollPromise: "chrome://marionette/content/sync.js",
pprint: "chrome://marionette/content/format.js",
assert: "chrome://remote/content/marionette/assert.js",
atom: "chrome://remote/content/marionette/atom.js",
error: "chrome://remote/content/marionette/error.js",
PollPromise: "chrome://remote/content/marionette/sync.js",
pprint: "chrome://remote/content/marionette/format.js",
});
XPCOMUtils.defineLazyServiceGetter(

2
remote/marionette/error.js
View File

@ -11,7 +11,7 @@ const { XPCOMUtils } = ChromeUtils.import(
);
XPCOMUtils.defineLazyModuleGetters(this, {
pprint: "chrome://marionette/content/format.js",
pprint: "chrome://remote/content/marionette/format.js",
});
const ERRORS = new Set([

10
remote/marionette/evaluate.js
View File

@ -14,11 +14,11 @@ const { XPCOMUtils } = ChromeUtils.import(
);
XPCOMUtils.defineLazyModuleGetters(this, {
assert: "chrome://marionette/content/assert.js",
element: "chrome://marionette/content/element.js",
error: "chrome://marionette/content/error.js",
Log: "chrome://marionette/content/log.js",
WebElement: "chrome://marionette/content/element.js",
assert: "chrome://remote/content/marionette/assert.js",
element: "chrome://remote/content/marionette/element.js",
error: "chrome://remote/content/marionette/error.js",
Log: "chrome://remote/content/marionette/log.js",
WebElement: "chrome://remote/content/marionette/element.js",
});
XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());

4
remote/marionette/event.js
View File

@ -13,8 +13,8 @@ const { XPCOMUtils } = ChromeUtils.import(
);
XPCOMUtils.defineLazyModuleGetters(this, {
AppInfo: "chrome://marionette/content/appinfo.js",
element: "chrome://marionette/content/element.js",
AppInfo: "chrome://remote/content/marionette/appinfo.js",
element: "chrome://remote/content/marionette/element.js",
});
/** Provides functionality for creating and sending DOM events. */

6
remote/marionette/format.js
View File

@ -11,8 +11,8 @@ const { XPCOMUtils } = ChromeUtils.import(
);
XPCOMUtils.defineLazyModuleGetters(this, {
Log: "chrome://marionette/content/log.js",
MarionettePrefs: "chrome://marionette/content/prefs.js",
Log: "chrome://remote/content/marionette/log.js",
MarionettePrefs: "chrome://remote/content/marionette/prefs.js",
});
XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());
@ -26,7 +26,7 @@ const MAX_STRING_LENGTH = 250;
* Usage::
*
* const { pprint } = Cu.import(
* "chrome://marionette/content/format.js", {}
* "chrome://remote/content/marionette/format.js", {}
* );
*
* let bool = {value: true};

16
remote/marionette/interaction.js
View File

@ -15,14 +15,14 @@ const { XPCOMUtils } = ChromeUtils.import(
XPCOMUtils.defineLazyModuleGetters(this, {
Preferences: "resource://gre/modules/Preferences.jsm",
accessibility: "chrome://marionette/content/accessibility.js",
atom: "chrome://marionette/content/atom.js",
element: "chrome://marionette/content/element.js",
error: "chrome://marionette/content/error.js",
event: "chrome://marionette/content/event.js",
Log: "chrome://marionette/content/log.js",
pprint: "chrome://marionette/content/format.js",
TimedPromise: "chrome://marionette/content/sync.js",
accessibility: "chrome://remote/content/marionette/accessibility.js",
atom: "chrome://remote/content/marionette/atom.js",
element: "chrome://remote/content/marionette/element.js",
error: "chrome://remote/content/marionette/error.js",
event: "chrome://remote/content/marionette/event.js",
Log: "chrome://remote/content/marionette/log.js",
pprint: "chrome://remote/content/marionette/format.js",
TimedPromise: "chrome://remote/content/marionette/sync.js",
});
XPCOMUtils.defineLazyGlobalGetters(this, ["File"]);

106
remote/marionette/jar.mn
View File

@ -2,60 +2,60 @@
# 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/.
marionette.jar:
% content marionette %content/
content/accessibility.js (accessibility.js)
content/action.js (action.js)
content/actors/MarionetteCommandsChild.jsm (actors/MarionetteCommandsChild.jsm)
content/actors/MarionetteCommandsParent.jsm (actors/MarionetteCommandsParent.jsm)
content/actors/MarionetteEventsChild.jsm (actors/MarionetteEventsChild.jsm)
content/actors/MarionetteEventsParent.jsm (actors/MarionetteEventsParent.jsm)
content/actors/MarionetteReftestChild.jsm (actors/MarionetteReftestChild.jsm)
content/actors/MarionetteReftestParent.jsm (actors/MarionetteReftestParent.jsm)
content/addon.js (addon.js)
content/appinfo.js (appinfo.js)
content/assert.js (assert.js)
content/atom.js (atom.js)
content/browser.js (browser.js)
content/capture.js (capture.js)
content/cert.js (cert.js)
content/cookie.js (cookie.js)
content/dom.js (dom.js)
content/driver.js (driver.js)
content/element.js (element.js)
content/error.js (error.js)
content/evaluate.js (evaluate.js)
content/event.js (event.js)
content/format.js (format.js)
content/interaction.js (interaction.js)
content/l10n.js (l10n.js)
content/legacyaction.js (legacyaction.js)
content/log.js (log.js)
content/message.js (message.js)
content/modal.js (modal.js)
content/navigate.js (navigate.js)
content/packets.js (packets.js)
content/permissions.js (permissions.js)
content/prefs.js (prefs.js)
content/print.js (print.js)
content/reftest.js (reftest.js)
content/reftest.xhtml (chrome/reftest.xhtml)
content/reftest-content.js (reftest-content.js)
content/server.js (server.js)
content/session.js (session.js)
content/stream-utils.js (stream-utils.js)
content/sync.js (sync.js)
content/transport.js (transport.js)
content/window-manager.js (window-manager.js)
remote.jar:
% content remote %content/
content/marionette/accessibility.js (accessibility.js)
content/marionette/action.js (action.js)
content/marionette/actors/MarionetteCommandsChild.jsm (actors/MarionetteCommandsChild.jsm)
content/marionette/actors/MarionetteCommandsParent.jsm (actors/MarionetteCommandsParent.jsm)
content/marionette/actors/MarionetteEventsChild.jsm (actors/MarionetteEventsChild.jsm)
content/marionette/actors/MarionetteEventsParent.jsm (actors/MarionetteEventsParent.jsm)
content/marionette/actors/MarionetteReftestChild.jsm (actors/MarionetteReftestChild.jsm)
content/marionette/actors/MarionetteReftestParent.jsm (actors/MarionetteReftestParent.jsm)
content/marionette/addon.js (addon.js)
content/marionette/appinfo.js (appinfo.js)
content/marionette/assert.js (assert.js)
content/marionette/atom.js (atom.js)
content/marionette/browser.js (browser.js)
content/marionette/capture.js (capture.js)
content/marionette/cert.js (cert.js)
content/marionette/cookie.js (cookie.js)
content/marionette/dom.js (dom.js)
content/marionette/driver.js (driver.js)
content/marionette/element.js (element.js)
content/marionette/error.js (error.js)
content/marionette/evaluate.js (evaluate.js)
content/marionette/event.js (event.js)
content/marionette/format.js (format.js)
content/marionette/interaction.js (interaction.js)
content/marionette/l10n.js (l10n.js)
content/marionette/legacyaction.js (legacyaction.js)
content/marionette/log.js (log.js)
content/marionette/message.js (message.js)
content/marionette/modal.js (modal.js)
content/marionette/navigate.js (navigate.js)
content/marionette/packets.js (packets.js)
content/marionette/permissions.js (permissions.js)
content/marionette/prefs.js (prefs.js)
content/marionette/print.js (print.js)
content/marionette/reftest.js (reftest.js)
content/marionette/reftest.xhtml (chrome/reftest.xhtml)
content/marionette/reftest-content.js (reftest-content.js)
content/marionette/server.js (server.js)
content/marionette/session.js (session.js)
content/marionette/stream-utils.js (stream-utils.js)
content/marionette/sync.js (sync.js)
content/marionette/transport.js (transport.js)
content/marionette/window-manager.js (window-manager.js)
#ifdef ENABLE_TESTS
content/test.xhtml (chrome/test.xhtml)
content/test2.xhtml (chrome/test2.xhtml)
content/test_dialog.dtd (chrome/test_dialog.dtd)
content/test_dialog.properties (chrome/test_dialog.properties)
content/test_dialog.xhtml (chrome/test_dialog.xhtml)
content/test_menupopup.xhtml (chrome/test_menupopup.xhtml)
content/test_nested_iframe.xhtml (chrome/test_nested_iframe.xhtml)
content/marionette/test.xhtml (chrome/test.xhtml)
content/marionette/test2.xhtml (chrome/test2.xhtml)
content/marionette/test_dialog.dtd (chrome/test_dialog.dtd)
content/marionette/test_dialog.properties (chrome/test_dialog.properties)
content/marionette/test_dialog.xhtml (chrome/test_dialog.xhtml)
content/marionette/test_menupopup.xhtml (chrome/test_menupopup.xhtml)
content/marionette/test_nested_iframe.xhtml (chrome/test_nested_iframe.xhtml)
#ifdef MOZ_CODE_COVERAGE
content/PerTestCoverageUtils.jsm (../../tools/code-coverage/PerTestCoverageUtils.jsm)
content/marionette/PerTestCoverageUtils.jsm (../../tools/code-coverage/PerTestCoverageUtils.jsm)
#endif
#endif

2
remote/marionette/l10n.js
View File

@ -23,7 +23,7 @@ const { XPCOMUtils } = ChromeUtils.import(
);
XPCOMUtils.defineLazyModuleGetters(this, {
error: "chrome://marionette/content/error.js",
error: "chrome://remote/content/marionette/error.js",
});
XPCOMUtils.defineLazyGlobalGetters(this, ["DOMParser"]);

14
remote/marionette/legacyaction.js
View File

@ -15,13 +15,13 @@ const { XPCOMUtils } = ChromeUtils.import(
XPCOMUtils.defineLazyModuleGetters(this, {
Preferences: "resource://gre/modules/Preferences.jsm",
accessibility: "chrome://marionette/content/accessibility.js",
element: "chrome://marionette/content/element.js",
error: "chrome://marionette/content/error.js",
evaluate: "chrome://marionette/content/evaluate.js",
event: "chrome://marionette/content/event.js",
Log: "chrome://marionette/content/log.js",
WebElement: "chrome://marionette/content/element.js",
accessibility: "chrome://remote/content/marionette/accessibility.js",
element: "chrome://remote/content/marionette/element.js",
error: "chrome://remote/content/marionette/error.js",
evaluate: "chrome://remote/content/marionette/evaluate.js",
event: "chrome://remote/content/marionette/event.js",
Log: "chrome://remote/content/marionette/log.js",
WebElement: "chrome://remote/content/marionette/element.js",
});
XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());

6
remote/marionette/message.js
View File

@ -11,9 +11,9 @@ const { XPCOMUtils } = ChromeUtils.import(
);
XPCOMUtils.defineLazyModuleGetters(this, {
assert: "chrome://marionette/content/assert.js",
error: "chrome://marionette/content/error.js",
truncate: "chrome://marionette/content/format.js",
assert: "chrome://remote/content/marionette/assert.js",
error: "chrome://remote/content/marionette/error.js",
truncate: "chrome://remote/content/marionette/format.js",
});
/** Representation of the packets transproted over the wire. */

2
remote/marionette/modal.js
View File

@ -13,7 +13,7 @@ const { XPCOMUtils } = ChromeUtils.import(
XPCOMUtils.defineLazyModuleGetters(this, {
Services: "resource://gre/modules/Services.jsm",
Log: "chrome://marionette/content/log.js",
Log: "chrome://remote/content/marionette/log.js",
});
XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());

14
remote/marionette/navigate.js
View File

@ -12,14 +12,14 @@ const { XPCOMUtils } = ChromeUtils.import(
);
XPCOMUtils.defineLazyModuleGetters(this, {
error: "chrome://marionette/content/error.js",
error: "chrome://remote/content/marionette/error.js",
EventDispatcher:
"chrome://marionette/content/actors/MarionetteEventsParent.jsm",
Log: "chrome://marionette/content/log.js",
modal: "chrome://marionette/content/modal.js",
PageLoadStrategy: "chrome://marionette/content/session.js",
TimedPromise: "chrome://marionette/content/sync.js",
truncate: "chrome://marionette/content/format.js",
"chrome://remote/content/marionette/actors/MarionetteEventsParent.jsm",
Log: "chrome://remote/content/marionette/log.js",
modal: "chrome://remote/content/marionette/modal.js",
PageLoadStrategy: "chrome://remote/content/marionette/session.js",
TimedPromise: "chrome://remote/content/marionette/sync.js",
truncate: "chrome://remote/content/marionette/format.js",
});
XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());

2
remote/marionette/packets.js
View File

@ -11,7 +11,7 @@ const { XPCOMUtils } = ChromeUtils.import(
);
XPCOMUtils.defineLazyModuleGetters(this, {
StreamUtils: "chrome://marionette/content/stream-utils.js",
StreamUtils: "chrome://remote/content/marionette/stream-utils.js",
});
XPCOMUtils.defineLazyGetter(this, "unicodeConverter", () => {

4
remote/marionette/permissions.js
View File

@ -12,8 +12,8 @@ const { XPCOMUtils } = ChromeUtils.import(
);
XPCOMUtils.defineLazyModuleGetters(this, {
error: "chrome://marionette/content/error.js",
MarionettePrefs: "chrome://marionette/content/prefs.js",
error: "chrome://remote/content/marionette/error.js",
MarionettePrefs: "chrome://remote/content/marionette/prefs.js",
});
/** @namespace */

6
remote/marionette/print.js
View File

@ -15,9 +15,9 @@ XPCOMUtils.defineLazyModuleGetters(this, {
OS: "resource://gre/modules/osfile.jsm",
setInterval: "resource://gre/modules/Timer.jsm",
assert: "chrome://marionette/content/assert.js",
Log: "chrome://marionette/content/log.js",
pprint: "chrome://marionette/content/format.js",
assert: "chrome://remote/content/marionette/assert.js",
Log: "chrome://remote/content/marionette/log.js",
pprint: "chrome://remote/content/marionette/format.js",
});
XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());

22
remote/marionette/reftest.js
View File

@ -16,14 +16,14 @@ XPCOMUtils.defineLazyModuleGetters(this, {
OS: "resource://gre/modules/osfile.jsm",
Preferences: "resource://gre/modules/Preferences.jsm",
AppInfo: "chrome://marionette/content/appinfo.js",
assert: "chrome://marionette/content/assert.js",
capture: "chrome://marionette/content/capture.js",
error: "chrome://marionette/content/error.js",
Log: "chrome://marionette/content/log.js",
navigate: "chrome://marionette/content/navigate.js",
print: "chrome://marionette/content/print.js",
windowManager: "chrome://marionette/content/window-manager.js",
AppInfo: "chrome://remote/content/marionette/appinfo.js",
assert: "chrome://remote/content/marionette/assert.js",
capture: "chrome://remote/content/marionette/capture.js",
error: "chrome://remote/content/marionette/error.js",
Log: "chrome://remote/content/marionette/log.js",
navigate: "chrome://remote/content/marionette/navigate.js",
print: "chrome://remote/content/marionette/print.js",
windowManager: "chrome://remote/content/marionette/window-manager.js",
});
XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());
@ -114,11 +114,11 @@ reftest.Runner = class {
kind: "JSWindowActor",
parent: {
moduleURI:
"chrome://marionette/content/actors/MarionetteReftestParent.jsm",
"chrome://remote/content/marionette/actors/MarionetteReftestParent.jsm",
},
child: {
moduleURI:
"chrome://marionette/content/actors/MarionetteReftestChild.jsm",
"chrome://remote/content/marionette/actors/MarionetteReftestChild.jsm",
events: {
load: { mozSystemGroup: true, capture: true },
},
@ -187,7 +187,7 @@ reftest.Runner = class {
assert.positiveInteger(height);
let reftestWin = this.parentWindow.open(
"chrome://marionette/content/reftest.xhtml",
"chrome://remote/content/marionette/reftest.xhtml",
"reftest",
`chrome,height=${height},width=${width}`
);

20
remote/marionette/server.js
View File

@ -14,16 +14,16 @@ const { XPCOMUtils } = ChromeUtils.import(
XPCOMUtils.defineLazyModuleGetters(this, {
OS: "resource://gre/modules/osfile.jsm",
assert: "chrome://marionette/content/assert.js",
Command: "chrome://marionette/content/message.js",
DebuggerTransport: "chrome://marionette/content/transport.js",
error: "chrome://marionette/content/error.js",
GeckoDriver: "chrome://marionette/content/driver.js",
Log: "chrome://marionette/content/log.js",
MarionettePrefs: "chrome://marionette/content/prefs.js",
Message: "chrome://marionette/content/message.js",
Response: "chrome://marionette/content/message.js",
WebElement: "chrome://marionette/content/element.js",
assert: "chrome://remote/content/marionette/assert.js",
Command: "chrome://remote/content/marionette/message.js",
DebuggerTransport: "chrome://remote/content/marionette/transport.js",
error: "chrome://remote/content/marionette/error.js",
GeckoDriver: "chrome://remote/content/marionette/driver.js",
Log: "chrome://remote/content/marionette/log.js",
MarionettePrefs: "chrome://remote/content/marionette/prefs.js",
Message: "chrome://remote/content/marionette/message.js",
Response: "chrome://remote/content/marionette/message.js",
WebElement: "chrome://remote/content/marionette/element.js",
});
XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());

16
remote/marionette/session.js
View File

@ -21,15 +21,15 @@ const { XPCOMUtils } = ChromeUtils.import(
XPCOMUtils.defineLazyModuleGetters(this, {
Preferences: "resource://gre/modules/Preferences.jsm",
accessibility: "chrome://marionette/content/accessibility.js",
allowAllCerts: "chrome://marionette/content/cert.js",
AppInfo: "chrome://marionette/content/appinfo.js",
assert: "chrome://marionette/content/assert.js",
accessibility: "chrome://remote/content/marionette/accessibility.js",
allowAllCerts: "chrome://remote/content/marionette/cert.js",
AppInfo: "chrome://remote/content/marionette/appinfo.js",
assert: "chrome://remote/content/marionette/assert.js",
clearActionInputState:
"chrome://marionette/content/actors/MarionetteCommandsChild.jsm",
error: "chrome://marionette/content/error.js",
Log: "chrome://marionette/content/log.js",
pprint: "chrome://marionette/content/format.js",
"chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm",
error: "chrome://remote/content/marionette/error.js",
Log: "chrome://remote/content/marionette/log.js",
pprint: "chrome://remote/content/marionette/format.js",
});
XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);

8
remote/marionette/sync.js
View File

@ -26,11 +26,11 @@ const { XPCOMUtils } = ChromeUtils.import(
XPCOMUtils.defineLazyModuleGetters(this, {
AppConstants: "resource://gre/modules/AppConstants.jsm",
error: "chrome://marionette/content/error.js",
error: "chrome://remote/content/marionette/error.js",
EventDispatcher:
"chrome://marionette/content/actors/MarionetteEventsParent.jsm",
Log: "chrome://marionette/content/log.js",
truncate: "chrome://marionette/content/format.js",
"chrome://remote/content/marionette/actors/MarionetteEventsParent.jsm",
Log: "chrome://remote/content/marionette/log.js",
truncate: "chrome://remote/content/marionette/format.js",
});
XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());

4
remote/marionette/test/xpcshell/test_action.js
View File

@ -4,7 +4,9 @@
"use strict";
const { action } = ChromeUtils.import("chrome://marionette/content/action.js");
const { action } = ChromeUtils.import(
"chrome://remote/content/marionette/action.js"
);
const XHTMLNS = "http://www.w3.org/1999/xhtml";

4
remote/marionette/test/xpcshell/test_actors.js
View File

@ -9,14 +9,14 @@ const {
registerCommandsActor,
unregisterCommandsActor,
} = ChromeUtils.import(
"chrome://marionette/content/actors/MarionetteCommandsParent.jsm"
"chrome://remote/content/marionette/actors/MarionetteCommandsParent.jsm"
);
const {
EventDispatcher,
registerEventsActor,
unregisterEventsActor,
} = ChromeUtils.import(
"chrome://marionette/content/actors/MarionetteEventsParent.jsm"
"chrome://remote/content/marionette/actors/MarionetteEventsParent.jsm"
);
registerCleanupFunction(function() {

2
remote/marionette/test/xpcshell/test_appinfo.js
View File

@ -5,7 +5,7 @@
"use strict";
const { AppInfo } = ChromeUtils.import(
"chrome://marionette/content/appinfo.js"
"chrome://remote/content/marionette/appinfo.js"
);
// Minimal xpcshell tests for AppInfo; Services.appinfo.* is not available

8
remote/marionette/test/xpcshell/test_assert.js
View File

@ -5,8 +5,12 @@
"use strict";
/* eslint-disable no-array-constructor, no-new-object */
const { assert } = ChromeUtils.import("chrome://marionette/content/assert.js");
const { error } = ChromeUtils.import("chrome://marionette/content/error.js");
const { assert } = ChromeUtils.import(
"chrome://remote/content/marionette/assert.js"
);
const { error } = ChromeUtils.import(
"chrome://remote/content/marionette/error.js"
);
add_test(function test_acyclic() {
assert.acyclic({});

2
remote/marionette/test/xpcshell/test_browser.js
View File

@ -1,5 +1,5 @@
const { Context } = ChromeUtils.import(
"chrome://marionette/content/browser.js"
"chrome://remote/content/marionette/browser.js"
);
add_test(function test_Context() {

4
remote/marionette/test/xpcshell/test_cookie.js
View File

@ -2,7 +2,9 @@
* 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/. */
const { cookie } = ChromeUtils.import("chrome://marionette/content/cookie.js");
const { cookie } = ChromeUtils.import(
"chrome://remote/content/marionette/cookie.js"
);
/* eslint-disable mozilla/use-chromeutils-generateqi */

2
remote/marionette/test/xpcshell/test_dom.js
View File

@ -1,7 +1,7 @@
const {
ContentEventObserverService,
WebElementEventTarget,
} = ChromeUtils.import("chrome://marionette/content/dom.js");
} = ChromeUtils.import("chrome://remote/content/marionette/dom.js");
class MessageSender {
constructor() {

4
remote/marionette/test/xpcshell/test_element.js
View File

@ -9,9 +9,9 @@ const {
ContentWebWindow,
element,
WebElement,
} = ChromeUtils.import("chrome://marionette/content/element.js");
} = ChromeUtils.import("chrome://remote/content/marionette/element.js");
const { InvalidArgumentError } = ChromeUtils.import(
"chrome://marionette/content/error.js"
"chrome://remote/content/marionette/error.js"
);
const SVG_NS = "http://www.w3.org/2000/svg";

4
remote/marionette/test/xpcshell/test_error.js
View File

@ -2,7 +2,9 @@
* 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/. */
const { error } = ChromeUtils.import("chrome://marionette/content/error.js");
const { error } = ChromeUtils.import(
"chrome://remote/content/marionette/error.js"
);
function notok(condition) {
ok(!condition);

4
remote/marionette/test/xpcshell/test_evaluate.js
View File

@ -1,8 +1,8 @@
const { element, ReferenceStore, WebElement } = ChromeUtils.import(
"chrome://marionette/content/element.js"
"chrome://remote/content/marionette/element.js"
);
const { evaluate } = ChromeUtils.import(
"chrome://marionette/content/evaluate.js"
"chrome://remote/content/marionette/evaluate.js"
);
const SVG_NS = "http://www.w3.org/2000/svg";

2
remote/marionette/test/xpcshell/test_format.js
View File

@ -3,7 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
const { pprint, truncate } = ChromeUtils.import(
"chrome://marionette/content/format.js"
"chrome://remote/content/marionette/format.js"
);
const MAX_STRING_LENGTH = 250;

6
remote/marionette/test/xpcshell/test_message.js
View File

@ -2,9 +2,11 @@
* 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/. */
const { error } = ChromeUtils.import("chrome://marionette/content/error.js");
const { error } = ChromeUtils.import(
"chrome://remote/content/marionette/error.js"
);
const { Command, Message, Response } = ChromeUtils.import(
"chrome://marionette/content/message.js"
"chrome://remote/content/marionette/message.js"
);
add_test(function test_Message_Origin() {

4
remote/marionette/test/xpcshell/test_modal.js
View File

@ -5,7 +5,9 @@
"use strict";
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { modal } = ChromeUtils.import("chrome://marionette/content/modal.js");
const { modal } = ChromeUtils.import(
"chrome://remote/content/marionette/modal.js"
);
const chromeWindow = {};

2
remote/marionette/test/xpcshell/test_navigate.js
View File

@ -8,7 +8,7 @@ const { XPCOMUtils } = ChromeUtils.import(
XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
const { navigate } = ChromeUtils.import(
"chrome://marionette/content/navigate.js"
"chrome://remote/content/marionette/navigate.js"
);
const topContext = {

2
remote/marionette/test/xpcshell/test_prefs.js
View File

@ -19,7 +19,7 @@ XPCOMUtils.defineLazyServiceGetter(
);
const { Branch, EnvironmentPrefs, MarionettePrefs } = ChromeUtils.import(
"chrome://marionette/content/prefs.js"
"chrome://remote/content/marionette/prefs.js"
);
function reset() {

8
remote/marionette/test/xpcshell/test_session.js
View File

@ -10,9 +10,11 @@ const { Preferences } = ChromeUtils.import(
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppInfo } = ChromeUtils.import(
"chrome://marionette/content/appinfo.js"
"chrome://remote/content/marionette/appinfo.js"
);
const { error } = ChromeUtils.import(
"chrome://remote/content/marionette/error.js"
);
const { error } = ChromeUtils.import("chrome://marionette/content/error.js");
const {
Capabilities,
PageLoadStrategy,
@ -20,7 +22,7 @@ const {
Timeouts,
UnhandledPromptBehavior,
WebDriverSession,
} = ChromeUtils.import("chrome://marionette/content/session.js");
} = ChromeUtils.import("chrome://remote/content/marionette/session.js");
add_test(function test_WebDriverSession_ctor() {
const session = new WebDriverSession();

2
remote/marionette/test/xpcshell/test_store.js
View File

@ -1,5 +1,5 @@
const { element, ReferenceStore, WebElement } = ChromeUtils.import(
"chrome://marionette/content/element.js"
"chrome://remote/content/marionette/element.js"
);
const SVG_NS = "http://www.w3.org/2000/svg";

6
remote/marionette/test/xpcshell/test_sync.js
View File

@ -14,10 +14,10 @@ const {
waitForLoadEvent,
waitForMessage,
waitForObserverTopic,
} = ChromeUtils.import("chrome://marionette/content/sync.js");
} = ChromeUtils.import("chrome://remote/content/marionette/sync.js");
const { EventDispatcher } = ChromeUtils.import(
"chrome://marionette/content/actors/MarionetteEventsParent.jsm"
"chrome://remote/content/marionette/actors/MarionetteEventsParent.jsm"
);
/**
@ -119,7 +119,7 @@ add_test(function test_executeSoon_callback() {
// executeSoon() is already defined for xpcshell in head.js. As such import
// our implementation into a custom namespace.
let sync = {};
ChromeUtils.import("chrome://marionette/content/sync.js", sync);
ChromeUtils.import("chrome://remote/content/marionette/sync.js", sync);
for (let func of ["foo", null, true, [], {}]) {
Assert.throws(() => sync.executeSoon(func), /TypeError/);

10
remote/marionette/transport.js
View File

@ -13,11 +13,11 @@ const { XPCOMUtils } = ChromeUtils.import(
XPCOMUtils.defineLazyModuleGetters(this, {
EventEmitter: "resource://gre/modules/EventEmitter.jsm",
BulkPacket: "chrome://marionette/content/packets.js",
executeSoon: "chrome://marionette/content/sync.js",
JSONPacket: "chrome://marionette/content/packets.js",
Packet: "chrome://marionette/content/packets.js",
StreamUtils: "chrome://marionette/content/stream-utils.js",
BulkPacket: "chrome://remote/content/marionette/packets.js",
executeSoon: "chrome://remote/content/marionette/sync.js",
JSONPacket: "chrome://remote/content/marionette/packets.js",
Packet: "chrome://remote/content/marionette/packets.js",
StreamUtils: "chrome://remote/content/marionette/stream-utils.js",
});
XPCOMUtils.defineLazyGetter(this, "Pipe", () => {

12
remote/marionette/window-manager.js
View File

@ -12,12 +12,12 @@ const { XPCOMUtils } = ChromeUtils.import(
XPCOMUtils.defineLazyModuleGetters(this, {
Services: "resource://gre/modules/Services.jsm",
AppInfo: "chrome://marionette/content/appinfo.js",
browser: "chrome://marionette/content/browser.js",
error: "chrome://marionette/content/error.js",
Log: "chrome://marionette/content/log.js",
waitForEvent: "chrome://marionette/content/sync.js",
waitForObserverTopic: "chrome://marionette/content/sync.js",
AppInfo: "chrome://remote/content/marionette/appinfo.js",
browser: "chrome://remote/content/marionette/browser.js",
error: "chrome://remote/content/marionette/error.js",
Log: "chrome://remote/content/marionette/log.js",
waitForEvent: "chrome://remote/content/marionette/sync.js",
waitForObserverTopic: "chrome://remote/content/marionette/sync.js",
});
XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());

2
testing/marionette/harness/marionette_harness/runner/mixins/window_manager.py
View File

@ -97,7 +97,7 @@ class WindowManagerMixin(object):
return self.marionette.execute_script(
"""
Components.utils.import("resource://gre/modules/Services.jsm");
const { windowManager } = ChromeUtils.import("chrome://marionette/content/window-manager.js");
const { windowManager } = ChromeUtils.import("chrome://remote/content/marionette/window-manager.js");
const win = windowManager.findWindowByHandle(arguments[0]).win;
return win.document.readyState == "complete";
""",

4
testing/marionette/harness/marionette_harness/tests/unit/test_checkbox_chrome.py
View File

@ -15,7 +15,9 @@ class TestSelectedChrome(WindowManagerMixin, MarionetteTestCase):
self.marionette.set_context("chrome")
new_window = self.open_chrome_window("chrome://marionette/content/test.xhtml")
new_window = self.open_chrome_window(
"chrome://remote/content/marionette/test.xhtml"
)
self.marionette.switch_to_window(new_window)
def tearDown(self):

4
testing/marionette/harness/marionette_harness/tests/unit/test_chrome_action.py
View File

@ -26,7 +26,9 @@ class TestPointerActions(WindowManagerMixin, MarionetteTestCase):
self.marionette.set_context("chrome")
self.win = self.open_chrome_window("chrome://marionette/content/test.xhtml")
self.win = self.open_chrome_window(
"chrome://remote/content/marionette/test.xhtml"
)
self.marionette.switch_to_window(self.win)
def tearDown(self):

2
testing/marionette/harness/marionette_harness/tests/unit/test_click_chrome.py
View File

@ -21,7 +21,7 @@ class TestClickChrome(WindowManagerMixin, MarionetteTestCase):
super(TestClickChrome, self).tearDown()
def test_click(self):
win = self.open_chrome_window("chrome://marionette/content/test.xhtml")
win = self.open_chrome_window("chrome://remote/content/marionette/test.xhtml")
self.marionette.switch_to_window(win)
def checked():

4
testing/marionette/harness/marionette_harness/tests/unit/test_element_rect_chrome.py
View File

@ -15,7 +15,9 @@ class TestElementSizeChrome(WindowManagerMixin, MarionetteTestCase):
self.marionette.set_context("chrome")
new_window = self.open_chrome_window("chrome://marionette/content/test2.xhtml")
new_window = self.open_chrome_window(
"chrome://remote/content/marionette/test2.xhtml"
)
self.marionette.switch_to_window(new_window)
def tearDown(self):

4
testing/marionette/harness/marionette_harness/tests/unit/test_element_state_chrome.py
View File

@ -15,7 +15,9 @@ class TestElementState(WindowManagerMixin, MarionetteTestCase):
self.marionette.set_context("chrome")
self.win = self.open_chrome_window("chrome://marionette/content/test.xhtml")
self.win = self.open_chrome_window(
"chrome://remote/content/marionette/test.xhtml"
)
self.marionette.switch_to_window(self.win)
def tearDown(self):

4
testing/marionette/harness/marionette_harness/tests/unit/test_execute_script.py
View File

@ -448,7 +448,9 @@ class TestExecuteChrome(WindowManagerMixin, TestExecuteContent):
def test_unmarshal_element_collection(self):
try:
win = self.open_chrome_window("chrome://marionette/content/test.xhtml")
win = self.open_chrome_window(
"chrome://remote/content/marionette/test.xhtml"
)
self.marionette.switch_to_window(win)
expected = self.marionette.find_elements(By.TAG_NAME, "input")

2
testing/marionette/harness/marionette_harness/tests/unit/test_findelement_chrome.py
View File

@ -17,7 +17,7 @@ class TestElementsChrome(WindowManagerMixin, MarionetteTestCase):
self.marionette.set_context("chrome")
win = self.open_chrome_window("chrome://marionette/content/test.xhtml")
win = self.open_chrome_window("chrome://remote/content/marionette/test.xhtml")
self.marionette.switch_to_window(win)
def tearDown(self):

2
testing/marionette/harness/marionette_harness/tests/unit/test_get_current_url_chrome.py
View File

@ -29,7 +29,7 @@ class TestGetCurrentUrlChrome(WindowManagerMixin, MarionetteTestCase):
self.assertEqual(self.marionette.get_url(), chrome_url)
def test_no_browser_window(self):
win = self.open_chrome_window("chrome://marionette/content/test.xhtml")
win = self.open_chrome_window("chrome://remote/content/marionette/test.xhtml")
self.marionette.switch_to_window(win)
chrome_url = self.marionette.execute_script("return window.location.href;")

6
testing/marionette/harness/marionette_harness/tests/unit/test_localization.py
View File

@ -22,13 +22,13 @@ class TestL10n(MarionetteTestCase):
self.l10n = L10n(self.marionette)
def test_localize_entity(self):
dtds = ["chrome://marionette/content/test_dialog.dtd"]
dtds = ["chrome://remote/content/marionette/test_dialog.dtd"]
value = self.l10n.localize_entity(dtds, "testDialog.title")
self.assertEqual(value, "Test Dialog")
def test_localize_entity_invalid_arguments(self):
dtds = ["chrome://marionette/content/test_dialog.dtd"]
dtds = ["chrome://remote/content/marionette/test_dialog.dtd"]
self.assertRaises(
NoSuchElementException, self.l10n.localize_entity, dtds, "notExistent"
@ -41,7 +41,7 @@ class TestL10n(MarionetteTestCase):
)
def test_localize_property(self):
properties = ["chrome://marionette/content/test_dialog.properties"]
properties = ["chrome://remote/content/marionette/test_dialog.properties"]
value = self.l10n.localize_property(properties, "testDialog.title")
self.assertEqual(value, "Test Dialog")

4
testing/marionette/harness/marionette_harness/tests/unit/test_pagesource_chrome.py
View File

@ -12,7 +12,9 @@ class TestPageSourceChrome(WindowManagerMixin, MarionetteTestCase):
super(TestPageSourceChrome, self).setUp()
self.marionette.set_context("chrome")
new_window = self.open_chrome_window("chrome://marionette/content/test.xhtml")
new_window = self.open_chrome_window(
"chrome://remote/content/marionette/test.xhtml"
)
self.marionette.switch_to_window(new_window)
def tearDown(self):

4
testing/marionette/harness/marionette_harness/tests/unit/test_screenshot.py
View File

@ -166,7 +166,9 @@ class TestScreenCaptureChrome(WindowManagerMixin, ScreenCaptureTestCase):
)
def open_dialog(self):
return self.open_chrome_window("chrome://marionette/content/test_dialog.xhtml")
return self.open_chrome_window(
"chrome://remote/content/marionette/test_dialog.xhtml"
)
def test_capture_different_context(self):
"""Check that screenshots in content and chrome are different."""

2
testing/marionette/harness/marionette_harness/tests/unit/test_sendkeys_menupopup_chrome.py
View File

@ -21,7 +21,7 @@ class TestSendkeysMenupopup(WindowManagerMixin, MarionetteTestCase):
self.marionette.set_context("chrome")
new_window = self.open_chrome_window(
"chrome://marionette/content/test_menupopup.xhtml"
"chrome://remote/content/marionette/test_menupopup.xhtml"
)
self.marionette.switch_to_window(new_window)

4
testing/marionette/harness/marionette_harness/tests/unit/test_switch_frame_chrome.py
View File

@ -15,7 +15,9 @@ class TestSwitchFrameChrome(WindowManagerMixin, MarionetteTestCase):
super(TestSwitchFrameChrome, self).setUp()
self.marionette.set_context("chrome")
new_window = self.open_chrome_window("chrome://marionette/content/test.xhtml")
new_window = self.open_chrome_window(
"chrome://remote/content/marionette/test.xhtml"
)
self.marionette.switch_to_window(new_window)
self.assertNotEqual(
self.start_window, self.marionette.current_chrome_window_handle

2
testing/marionette/harness/marionette_harness/tests/unit/test_text_chrome.py
View File

@ -11,7 +11,7 @@ from marionette_harness import MarionetteTestCase, WindowManagerMixin
class TestTextChrome(WindowManagerMixin, MarionetteTestCase):
def setUp(self):
super(TestTextChrome, self).setUp()
win = self.open_chrome_window("chrome://marionette/content/test.xhtml")
win = self.open_chrome_window("chrome://remote/content/marionette/test.xhtml")
self.marionette.switch_to_window(win)
self.marionette.set_context("chrome")

2
testing/marionette/harness/marionette_harness/tests/unit/test_title_chrome.py
View File

@ -19,7 +19,7 @@ class TestTitleChrome(WindowManagerMixin, MarionetteTestCase):
super(TestTitleChrome, self).tearDown()
def test_get_chrome_title(self):
win = self.open_chrome_window("chrome://marionette/content/test.xhtml")
win = self.open_chrome_window("chrome://remote/content/marionette/test.xhtml")
self.marionette.switch_to_window(win)
expected_title = self.marionette.execute_script(

2
testing/marionette/harness/marionette_harness/tests/unit/test_window_close_chrome.py
View File

@ -30,7 +30,7 @@ class TestCloseWindow(WindowManagerMixin, MarionetteTestCase):
self.assertNotIn(new_window, self.marionette.window_handles)
def test_close_chrome_window_for_non_browser_window(self):
win = self.open_chrome_window("chrome://marionette/content/test.xhtml")
win = self.open_chrome_window("chrome://remote/content/marionette/test.xhtml")
self.marionette.switch_to_window(win)
self.assertIn(win, self.marionette.chrome_window_handles)

4
testing/marionette/harness/marionette_harness/tests/unit/test_window_close_content.py
View File

@ -33,7 +33,9 @@ class TestCloseWindow(WindowManagerMixin, MarionetteTestCase):
self.assertNotIn(new_window, self.marionette.window_handles)
def test_close_chrome_window_for_non_browser_window(self):
new_window = self.open_chrome_window("chrome://marionette/content/test.xhtml")
new_window = self.open_chrome_window(
"chrome://remote/content/marionette/test.xhtml"
)
self.marionette.switch_to_window(new_window)
self.assertIn(new_window, self.marionette.chrome_window_handles)

2
testing/marionette/harness/marionette_harness/tests/unit/test_window_handles_chrome.py
View File

@ -14,7 +14,7 @@ class TestWindowHandles(WindowManagerMixin, MarionetteTestCase):
def setUp(self):
super(TestWindowHandles, self).setUp()
self.chrome_dialog = "chrome://marionette/content/test_dialog.xhtml"
self.chrome_dialog = "chrome://remote/content/marionette/test_dialog.xhtml"
self.marionette.set_context("chrome")

2
testing/marionette/harness/marionette_harness/tests/unit/test_window_handles_content.py
View File

@ -19,7 +19,7 @@ class TestWindowHandles(WindowManagerMixin, MarionetteTestCase):
def setUp(self):
super(TestWindowHandles, self).setUp()
self.chrome_dialog = "chrome://marionette/content/test_dialog.xhtml"
self.chrome_dialog = "chrome://remote/content/marionette/test_dialog.xhtml"
def tearDown(self):
self.close_all_windows()

4
testing/marionette/harness/marionette_harness/tests/unit/test_window_management.py
View File

@ -38,7 +38,9 @@ class TestNoSuchWindowContent(WindowManagerMixin, MarionetteTestCase):
self.marionette.switch_to_window(new_window)
def test_closed_chrome_window_while_in_frame(self):
new_window = self.open_chrome_window("chrome://marionette/content/test.xhtml")
new_window = self.open_chrome_window(
"chrome://remote/content/marionette/test.xhtml"
)
self.marionette.switch_to_window(new_window)
with self.marionette.using_context("chrome"):
self.marionette.switch_to_frame(0)

4
testing/marionette/harness/marionette_harness/tests/unit/test_window_status_content.py
View File

@ -39,7 +39,9 @@ class TestNoSuchWindowContent(WindowManagerMixin, MarionetteTestCase):
self.marionette.switch_to_window(new_window)
def test_closed_chrome_window_while_in_frame(self):
new_window = self.open_chrome_window("chrome://marionette/content/test.xhtml")
new_window = self.open_chrome_window(
"chrome://remote/content/marionette/test.xhtml"
)
self.marionette.switch_to_window(new_window)
with self.marionette.using_context("chrome"):

2
testing/marionette/harness/marionette_harness/tests/unit/test_window_type_chrome.py
View File

@ -19,7 +19,7 @@ class TestWindowTypeChrome(WindowManagerMixin, MarionetteTestCase):
super(TestWindowTypeChrome, self).tearDown()
def test_get_window_type(self):
win = self.open_chrome_window("chrome://marionette/content/test.xhtml")
win = self.open_chrome_window("chrome://remote/content/marionette/test.xhtml")
self.marionette.switch_to_window(win)
window_type = self.marionette.execute_script(

6
testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
View File

@ -494,7 +494,7 @@ class MarionetteCoverageProtocolPart(CoverageProtocolPart):
return
script = """
const {PerTestCoverageUtils} = ChromeUtils.import("chrome://marionette/content/PerTestCoverageUtils.jsm");
const {PerTestCoverageUtils} = ChromeUtils.import("chrome://remote/content/marionette/PerTestCoverageUtils.jsm");
return PerTestCoverageUtils.enabled;
"""
with self.marionette.using_context(self.marionette.CONTEXT_CHROME):
@ -504,7 +504,7 @@ class MarionetteCoverageProtocolPart(CoverageProtocolPart):
script = """
var callback = arguments[arguments.length - 1];
const {PerTestCoverageUtils} = ChromeUtils.import("chrome://marionette/content/PerTestCoverageUtils.jsm");
const {PerTestCoverageUtils} = ChromeUtils.import("chrome://remote/content/marionette/PerTestCoverageUtils.jsm");
PerTestCoverageUtils.beforeTest().then(callback, callback);
"""
with self.marionette.using_context(self.marionette.CONTEXT_CHROME):
@ -524,7 +524,7 @@ class MarionetteCoverageProtocolPart(CoverageProtocolPart):
script = """
var callback = arguments[arguments.length - 1];
const {PerTestCoverageUtils} = ChromeUtils.import("chrome://marionette/content/PerTestCoverageUtils.jsm");
const {PerTestCoverageUtils} = ChromeUtils.import("chrome://remote/content/marionette/PerTestCoverageUtils.jsm");
PerTestCoverageUtils.afterTest().then(callback, callback);
"""
with self.marionette.using_context(self.marionette.CONTEXT_CHROME):