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:
Henrik Skupin 2021-06-09 08:19:00 +00:00
Родитель abac1c79bb
Коммит ff9ce95707
10 изменённых файлов: 16 добавлений и 35 удалений

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

@ -17,6 +17,7 @@ remote.jar:
content/shared/Sync.jsm (shared/Sync.jsm)
content/shared/TabManager.jsm (shared/TabManager.jsm)
content/shared/WindowManager.jsm (shared/WindowManager.jsm)
content/shared/webdriver/Session.jsm (shared/webdriver/Session.jsm)
# imports from external folders
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:
"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",
Timeouts: "chrome://remote/content/shared/webdriver/Session.jsm",
UnhandledPromptBehavior:
"chrome://remote/content/shared/webdriver/Session.jsm",
unregisterCommandsActor:
"chrome://remote/content/marionette/actors/MarionetteCommandsParent.jsm",
unregisterEventsActor:
"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",
WebDriverSession: "chrome://remote/content/shared/webdriver/Session.jsm",
WebElement: "chrome://remote/content/marionette/element.js",
WebElementEventTarget: "chrome://remote/content/marionette/dom.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-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)

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

@ -17,7 +17,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
"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",
PageLoadStrategy: "chrome://remote/content/shared/webdriver/Session.jsm",
TimedPromise: "chrome://remote/content/marionette/sync.js",
truncate: "chrome://remote/content/marionette/format.js",
});

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

@ -20,6 +20,5 @@ skip-if = appname == "thunderbird"
[test_modal.js]
[test_navigate.js]
[test_prefs.js]
[test_session.js]
[test_store.js]
[test_sync.js]

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

@ -2,4 +2,7 @@
# 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/.
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,
UnhandledPromptBehavior,
WebDriverSession,
} = ChromeUtils.import("chrome://remote/content/marionette/session.js");
} = ChromeUtils.import("chrome://remote/content/shared/webdriver/Session.jsm");
add_test(function test_WebDriverSession_ctor() {
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]