зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1691414 - [remote] Share WebDriver session between Marionette and WebDriver BiDi. r=webdriver-reviewers,jdescottes
Differential Revision: https://phabricator.services.mozilla.com/D117127
This commit is contained in:
Родитель
abac1c79bb
Коммит
ff9ce95707
|
@ -17,6 +17,7 @@ remote.jar:
|
||||||
content/shared/Sync.jsm (shared/Sync.jsm)
|
content/shared/Sync.jsm (shared/Sync.jsm)
|
||||||
content/shared/TabManager.jsm (shared/TabManager.jsm)
|
content/shared/TabManager.jsm (shared/TabManager.jsm)
|
||||||
content/shared/WindowManager.jsm (shared/WindowManager.jsm)
|
content/shared/WindowManager.jsm (shared/WindowManager.jsm)
|
||||||
|
content/shared/webdriver/Session.jsm (shared/webdriver/Session.jsm)
|
||||||
|
|
||||||
# imports from external folders
|
# imports from external folders
|
||||||
content/external/EventUtils.js (../testing/mochitest/tests/SimpleTest/EventUtils.js)
|
content/external/EventUtils.js (../testing/mochitest/tests/SimpleTest/EventUtils.js)
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
session module
|
|
||||||
==============
|
|
||||||
|
|
||||||
Capabilities
|
|
||||||
------------
|
|
||||||
.. js:autoclass:: Capabilities
|
|
||||||
:members:
|
|
||||||
|
|
||||||
PageLoadStrategy
|
|
||||||
----------------
|
|
||||||
.. js:autoclass:: PageLoadStrategy
|
|
||||||
:members:
|
|
||||||
|
|
||||||
Proxy
|
|
||||||
-----
|
|
||||||
.. js:autoclass:: Proxy
|
|
||||||
:members:
|
|
||||||
|
|
||||||
Timeouts
|
|
||||||
--------
|
|
||||||
.. js:autoclass:: Timeouts
|
|
||||||
:members:
|
|
||||||
|
|
||||||
WebDriverSession
|
|
||||||
----------------
|
|
||||||
.. js:autoclass:: WebDriverSession
|
|
||||||
:members:
|
|
|
@ -46,15 +46,16 @@ XPCOMUtils.defineLazyModuleGetters(this, {
|
||||||
registerEventsActor:
|
registerEventsActor:
|
||||||
"chrome://remote/content/marionette/actors/MarionetteEventsParent.jsm",
|
"chrome://remote/content/marionette/actors/MarionetteEventsParent.jsm",
|
||||||
TimedPromise: "chrome://remote/content/marionette/sync.js",
|
TimedPromise: "chrome://remote/content/marionette/sync.js",
|
||||||
Timeouts: "chrome://remote/content/marionette/session.js",
|
Timeouts: "chrome://remote/content/shared/webdriver/Session.jsm",
|
||||||
UnhandledPromptBehavior: "chrome://remote/content/marionette/session.js",
|
UnhandledPromptBehavior:
|
||||||
|
"chrome://remote/content/shared/webdriver/Session.jsm",
|
||||||
unregisterCommandsActor:
|
unregisterCommandsActor:
|
||||||
"chrome://remote/content/marionette/actors/MarionetteCommandsParent.jsm",
|
"chrome://remote/content/marionette/actors/MarionetteCommandsParent.jsm",
|
||||||
unregisterEventsActor:
|
unregisterEventsActor:
|
||||||
"chrome://remote/content/marionette/actors/MarionetteEventsParent.jsm",
|
"chrome://remote/content/marionette/actors/MarionetteEventsParent.jsm",
|
||||||
waitForLoadEvent: "chrome://remote/content/marionette/sync.js",
|
waitForLoadEvent: "chrome://remote/content/marionette/sync.js",
|
||||||
waitForObserverTopic: "chrome://remote/content/marionette/sync.js",
|
waitForObserverTopic: "chrome://remote/content/marionette/sync.js",
|
||||||
WebDriverSession: "chrome://remote/content/marionette/session.js",
|
WebDriverSession: "chrome://remote/content/shared/webdriver/Session.jsm",
|
||||||
WebElement: "chrome://remote/content/marionette/element.js",
|
WebElement: "chrome://remote/content/marionette/element.js",
|
||||||
WebElementEventTarget: "chrome://remote/content/marionette/dom.js",
|
WebElementEventTarget: "chrome://remote/content/marionette/dom.js",
|
||||||
windowManager: "chrome://remote/content/marionette/window-manager.js",
|
windowManager: "chrome://remote/content/marionette/window-manager.js",
|
||||||
|
|
|
@ -42,7 +42,6 @@ remote.jar:
|
||||||
content/marionette/reftest.xhtml (chrome/reftest.xhtml)
|
content/marionette/reftest.xhtml (chrome/reftest.xhtml)
|
||||||
content/marionette/reftest-content.js (reftest-content.js)
|
content/marionette/reftest-content.js (reftest-content.js)
|
||||||
content/marionette/server.js (server.js)
|
content/marionette/server.js (server.js)
|
||||||
content/marionette/session.js (session.js)
|
|
||||||
content/marionette/stream-utils.js (stream-utils.js)
|
content/marionette/stream-utils.js (stream-utils.js)
|
||||||
content/marionette/sync.js (sync.js)
|
content/marionette/sync.js (sync.js)
|
||||||
content/marionette/transport.js (transport.js)
|
content/marionette/transport.js (transport.js)
|
||||||
|
|
|
@ -17,7 +17,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
|
||||||
"chrome://remote/content/marionette/actors/MarionetteEventsParent.jsm",
|
"chrome://remote/content/marionette/actors/MarionetteEventsParent.jsm",
|
||||||
Log: "chrome://remote/content/marionette/log.js",
|
Log: "chrome://remote/content/marionette/log.js",
|
||||||
modal: "chrome://remote/content/marionette/modal.js",
|
modal: "chrome://remote/content/marionette/modal.js",
|
||||||
PageLoadStrategy: "chrome://remote/content/marionette/session.js",
|
PageLoadStrategy: "chrome://remote/content/shared/webdriver/Session.jsm",
|
||||||
TimedPromise: "chrome://remote/content/marionette/sync.js",
|
TimedPromise: "chrome://remote/content/marionette/sync.js",
|
||||||
truncate: "chrome://remote/content/marionette/format.js",
|
truncate: "chrome://remote/content/marionette/format.js",
|
||||||
});
|
});
|
||||||
|
|
|
@ -20,6 +20,5 @@ skip-if = appname == "thunderbird"
|
||||||
[test_modal.js]
|
[test_modal.js]
|
||||||
[test_navigate.js]
|
[test_navigate.js]
|
||||||
[test_prefs.js]
|
[test_prefs.js]
|
||||||
[test_session.js]
|
|
||||||
[test_store.js]
|
[test_store.js]
|
||||||
[test_sync.js]
|
[test_sync.js]
|
||||||
|
|
|
@ -2,4 +2,7 @@
|
||||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
# 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/.
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.ini"]
|
XPCSHELL_TESTS_MANIFESTS += [
|
||||||
|
"test/xpcshell/xpcshell.ini",
|
||||||
|
"webdriver/test/xpcshell/xpcshell.ini",
|
||||||
|
]
|
||||||
|
|
|
@ -22,7 +22,7 @@ const {
|
||||||
Timeouts,
|
Timeouts,
|
||||||
UnhandledPromptBehavior,
|
UnhandledPromptBehavior,
|
||||||
WebDriverSession,
|
WebDriverSession,
|
||||||
} = ChromeUtils.import("chrome://remote/content/marionette/session.js");
|
} = ChromeUtils.import("chrome://remote/content/shared/webdriver/Session.jsm");
|
||||||
|
|
||||||
add_test(function test_WebDriverSession_ctor() {
|
add_test(function test_WebDriverSession_ctor() {
|
||||||
const session = new WebDriverSession();
|
const session = new WebDriverSession();
|
|
@ -0,0 +1,5 @@
|
||||||
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
|
[test_Session.js]
|
Загрузка…
Ссылка в новой задаче