From 2c6099421a69864e9e5d67da803d54bc005067c9 Mon Sep 17 00:00:00 2001 From: Henrik Skupin Date: Mon, 31 May 2021 17:36:06 +0000 Subject: [PATCH] Bug 1693993 - [marionette] Move Marionette server code to /remote/marionette. r=remote-protocol-reviewers,marionette-reviewers,jdescottes,webdriver-reviewers Differential Revision: https://phabricator.services.mozilla.com/D106311 --- .eslintignore | 2 +- docs/conf.py | 2 +- .../components/marionette.js | 0 .../components/marionette.manifest | 0 remote/components/moz.build | 16 +++++++++++++- .../components/nsIMarionette.idl | 0 {testing => remote}/marionette/.eslintrc.js | 0 {testing => remote}/marionette/README | 4 ++-- .../marionette/accessibility.js | 0 {testing => remote}/marionette/action.js | 0 .../actors/MarionetteCommandsChild.jsm | 0 .../actors/MarionetteCommandsParent.jsm | 0 .../actors/MarionetteEventsChild.jsm | 0 .../actors/MarionetteEventsParent.jsm | 0 .../actors/MarionetteReftestChild.jsm | 0 .../actors/MarionetteReftestParent.jsm | 0 {testing => remote}/marionette/addon.js | 0 {testing => remote}/marionette/appinfo.js | 0 {testing => remote}/marionette/assert.js | 0 {testing => remote}/marionette/atom.js | 0 {testing => remote}/marionette/browser.js | 0 {testing => remote}/marionette/capture.js | 0 {testing => remote}/marionette/cert.js | 0 .../marionette/chrome}/reftest.xhtml | 0 .../marionette/chrome/test.xhtml | 0 .../marionette/chrome/test2.xhtml | 0 .../marionette/chrome/test_dialog.dtd | 0 .../marionette/chrome/test_dialog.properties | 0 .../marionette/chrome/test_dialog.xhtml | 0 .../marionette/chrome/test_menupopup.xhtml | 0 .../chrome/test_nested_iframe.xhtml | 0 {testing => remote}/marionette/cookie.js | 0 .../marionette/doc/Building.md | 0 .../marionette/doc/CodeStyle.md | 21 ++++++++++--------- .../marionette/doc/Contributing.md | 2 +- .../marionette/doc/Debugging.md | 0 {testing => remote}/marionette/doc/Intro.md | 0 .../marionette/doc/NewContributors.md | 6 ++++-- {testing => remote}/marionette/doc/Patches.md | 0 {testing => remote}/marionette/doc/Prefs.md | 0 .../marionette/doc/Protocol.md | 0 .../marionette/doc/PythonTests.md | 0 .../marionette/doc/SeleniumAtoms.md | 2 +- .../marionette/doc/Taskcluster.md | 0 {testing => remote}/marionette/doc/Testing.md | 6 +++--- {testing => remote}/marionette/doc/index.rst | 0 .../marionette/doc/internals/action.rst | 0 .../marionette/doc/internals/addon.rst | 0 .../marionette/doc/internals/appinfo.rst | 0 .../marionette/doc/internals/assert.rst | 0 .../marionette/doc/internals/browser.rst | 0 .../marionette/doc/internals/capture.rst | 0 .../marionette/doc/internals/cert.rst | 0 .../marionette/doc/internals/cookie.rst | 0 .../marionette/doc/internals/dom.rst | 0 .../marionette/doc/internals/driver.rst | 0 .../marionette/doc/internals/element.rst | 0 .../marionette/doc/internals/error.rst | 0 .../marionette/doc/internals/evaluate.rst | 0 .../marionette/doc/internals/event.rst | 0 .../marionette/doc/internals/format.rst | 0 .../marionette/doc/internals/index.rst | 0 .../marionette/doc/internals/interaction.rst | 0 .../marionette/doc/internals/log.rst | 0 .../marionette/doc/internals/message.rst | 0 .../marionette/doc/internals/modal.rst | 0 .../marionette/doc/internals/navigate.rst | 0 .../marionette/doc/internals/packets.rst | 0 .../marionette/doc/internals/prefs.rst | 0 .../marionette/doc/internals/reftest.rst | 0 .../marionette/doc/internals/server.rst | 0 .../marionette/doc/internals/session.rst | 0 .../marionette/doc/internals/sync.rst | 0 .../doc/internals/window-manager.rst | 0 {testing => remote}/marionette/dom.js | 0 {testing => remote}/marionette/driver.js | 0 {testing => remote}/marionette/element.js | 0 {testing => remote}/marionette/error.js | 0 {testing => remote}/marionette/evaluate.js | 0 {testing => remote}/marionette/event.js | 0 {testing => remote}/marionette/format.js | 0 {testing => remote}/marionette/interaction.js | 0 {testing => remote}/marionette/jar.mn | 2 +- {testing => remote}/marionette/l10n.js | 0 .../marionette/legacyaction.js | 0 {testing => remote}/marionette/log.js | 0 {testing => remote}/marionette/message.js | 0 {testing => remote}/marionette/modal.js | 0 remote/marionette/moz.build | 15 +++++++++++++ {testing => remote}/marionette/navigate.js | 0 {testing => remote}/marionette/packets.js | 0 {testing => remote}/marionette/permissions.js | 0 {testing => remote}/marionette/prefs.js | 0 {testing => remote}/marionette/print.js | 0 .../marionette/reftest-content.js | 0 {testing => remote}/marionette/reftest.js | 0 {testing => remote}/marionette/server.js | 0 {testing => remote}/marionette/session.js | 0 .../marionette/stream-utils.js | 0 {testing => remote}/marionette/sync.js | 0 {testing => remote}/marionette/test/README | 0 .../marionette/test/xpcshell}/.eslintrc.js | 0 .../marionette/test/xpcshell}/README | 4 ++-- .../marionette/test/xpcshell}/test_action.js | 0 .../marionette/test/xpcshell}/test_actors.js | 0 .../marionette/test/xpcshell}/test_appinfo.js | 0 .../marionette/test/xpcshell}/test_assert.js | 0 .../marionette/test/xpcshell}/test_browser.js | 0 .../marionette/test/xpcshell}/test_cookie.js | 0 .../marionette/test/xpcshell}/test_dom.js | 0 .../marionette/test/xpcshell}/test_element.js | 0 .../marionette/test/xpcshell}/test_error.js | 0 .../test/xpcshell}/test_evaluate.js | 0 .../marionette/test/xpcshell}/test_format.js | 0 .../marionette/test/xpcshell}/test_message.js | 0 .../marionette/test/xpcshell}/test_modal.js | 0 .../test/xpcshell}/test_navigate.js | 0 .../marionette/test/xpcshell}/test_prefs.js | 0 .../marionette/test/xpcshell}/test_session.js | 0 .../marionette/test/xpcshell}/test_store.js | 0 .../marionette/test/xpcshell}/test_sync.js | 0 .../marionette/test/xpcshell}/xpcshell.ini | 0 {testing => remote}/marionette/transport.js | 0 .../marionette/window-manager.js | 0 remote/moz.build | 1 + testing/geckodriver/doc/Profiles.md | 2 +- testing/marionette/components/moz.build | 11 ---------- testing/marionette/moz.build | 9 -------- toolkit/moz.configure | 2 +- tools/lint/codespell.yml | 2 +- 130 files changed, 61 insertions(+), 48 deletions(-) rename {testing/marionette => remote}/components/marionette.js (100%) rename {testing/marionette => remote}/components/marionette.manifest (100%) rename {testing/marionette => remote}/components/nsIMarionette.idl (100%) rename {testing => remote}/marionette/.eslintrc.js (100%) rename {testing => remote}/marionette/README (82%) rename {testing => remote}/marionette/accessibility.js (100%) rename {testing => remote}/marionette/action.js (100%) rename {testing => remote}/marionette/actors/MarionetteCommandsChild.jsm (100%) rename {testing => remote}/marionette/actors/MarionetteCommandsParent.jsm (100%) rename {testing => remote}/marionette/actors/MarionetteEventsChild.jsm (100%) rename {testing => remote}/marionette/actors/MarionetteEventsParent.jsm (100%) rename {testing => remote}/marionette/actors/MarionetteReftestChild.jsm (100%) rename {testing => remote}/marionette/actors/MarionetteReftestParent.jsm (100%) rename {testing => remote}/marionette/addon.js (100%) rename {testing => remote}/marionette/appinfo.js (100%) rename {testing => remote}/marionette/assert.js (100%) rename {testing => remote}/marionette/atom.js (100%) rename {testing => remote}/marionette/browser.js (100%) rename {testing => remote}/marionette/capture.js (100%) rename {testing => remote}/marionette/cert.js (100%) rename {testing/marionette => remote/marionette/chrome}/reftest.xhtml (100%) rename {testing => remote}/marionette/chrome/test.xhtml (100%) rename {testing => remote}/marionette/chrome/test2.xhtml (100%) rename {testing => remote}/marionette/chrome/test_dialog.dtd (100%) rename {testing => remote}/marionette/chrome/test_dialog.properties (100%) rename {testing => remote}/marionette/chrome/test_dialog.xhtml (100%) rename {testing => remote}/marionette/chrome/test_menupopup.xhtml (100%) rename {testing => remote}/marionette/chrome/test_nested_iframe.xhtml (100%) rename {testing => remote}/marionette/cookie.js (100%) rename {testing => remote}/marionette/doc/Building.md (100%) rename {testing => remote}/marionette/doc/CodeStyle.md (92%) rename {testing => remote}/marionette/doc/Contributing.md (99%) rename {testing => remote}/marionette/doc/Debugging.md (100%) rename {testing => remote}/marionette/doc/Intro.md (100%) rename {testing => remote}/marionette/doc/NewContributors.md (92%) rename {testing => remote}/marionette/doc/Patches.md (100%) rename {testing => remote}/marionette/doc/Prefs.md (100%) rename {testing => remote}/marionette/doc/Protocol.md (100%) rename {testing => remote}/marionette/doc/PythonTests.md (100%) rename {testing => remote}/marionette/doc/SeleniumAtoms.md (97%) rename {testing => remote}/marionette/doc/Taskcluster.md (100%) rename {testing => remote}/marionette/doc/Testing.md (97%) rename {testing => remote}/marionette/doc/index.rst (100%) rename {testing => remote}/marionette/doc/internals/action.rst (100%) rename {testing => remote}/marionette/doc/internals/addon.rst (100%) rename {testing => remote}/marionette/doc/internals/appinfo.rst (100%) rename {testing => remote}/marionette/doc/internals/assert.rst (100%) rename {testing => remote}/marionette/doc/internals/browser.rst (100%) rename {testing => remote}/marionette/doc/internals/capture.rst (100%) rename {testing => remote}/marionette/doc/internals/cert.rst (100%) rename {testing => remote}/marionette/doc/internals/cookie.rst (100%) rename {testing => remote}/marionette/doc/internals/dom.rst (100%) rename {testing => remote}/marionette/doc/internals/driver.rst (100%) rename {testing => remote}/marionette/doc/internals/element.rst (100%) rename {testing => remote}/marionette/doc/internals/error.rst (100%) rename {testing => remote}/marionette/doc/internals/evaluate.rst (100%) rename {testing => remote}/marionette/doc/internals/event.rst (100%) rename {testing => remote}/marionette/doc/internals/format.rst (100%) rename {testing => remote}/marionette/doc/internals/index.rst (100%) rename {testing => remote}/marionette/doc/internals/interaction.rst (100%) rename {testing => remote}/marionette/doc/internals/log.rst (100%) rename {testing => remote}/marionette/doc/internals/message.rst (100%) rename {testing => remote}/marionette/doc/internals/modal.rst (100%) rename {testing => remote}/marionette/doc/internals/navigate.rst (100%) rename {testing => remote}/marionette/doc/internals/packets.rst (100%) rename {testing => remote}/marionette/doc/internals/prefs.rst (100%) rename {testing => remote}/marionette/doc/internals/reftest.rst (100%) rename {testing => remote}/marionette/doc/internals/server.rst (100%) rename {testing => remote}/marionette/doc/internals/session.rst (100%) rename {testing => remote}/marionette/doc/internals/sync.rst (100%) rename {testing => remote}/marionette/doc/internals/window-manager.rst (100%) rename {testing => remote}/marionette/dom.js (100%) rename {testing => remote}/marionette/driver.js (100%) rename {testing => remote}/marionette/element.js (100%) rename {testing => remote}/marionette/error.js (100%) rename {testing => remote}/marionette/evaluate.js (100%) rename {testing => remote}/marionette/event.js (100%) rename {testing => remote}/marionette/format.js (100%) rename {testing => remote}/marionette/interaction.js (100%) rename {testing => remote}/marionette/jar.mn (98%) rename {testing => remote}/marionette/l10n.js (100%) rename {testing => remote}/marionette/legacyaction.js (100%) rename {testing => remote}/marionette/log.js (100%) rename {testing => remote}/marionette/message.js (100%) rename {testing => remote}/marionette/modal.js (100%) create mode 100644 remote/marionette/moz.build rename {testing => remote}/marionette/navigate.js (100%) rename {testing => remote}/marionette/packets.js (100%) rename {testing => remote}/marionette/permissions.js (100%) rename {testing => remote}/marionette/prefs.js (100%) rename {testing => remote}/marionette/print.js (100%) rename {testing => remote}/marionette/reftest-content.js (100%) rename {testing => remote}/marionette/reftest.js (100%) rename {testing => remote}/marionette/server.js (100%) rename {testing => remote}/marionette/session.js (100%) rename {testing => remote}/marionette/stream-utils.js (100%) rename {testing => remote}/marionette/sync.js (100%) rename {testing => remote}/marionette/test/README (100%) rename {testing/marionette/test/unit => remote/marionette/test/xpcshell}/.eslintrc.js (100%) rename {testing/marionette/test/unit => remote/marionette/test/xpcshell}/README (81%) rename {testing/marionette/test/unit => remote/marionette/test/xpcshell}/test_action.js (100%) rename {testing/marionette/test/unit => remote/marionette/test/xpcshell}/test_actors.js (100%) rename {testing/marionette/test/unit => remote/marionette/test/xpcshell}/test_appinfo.js (100%) rename {testing/marionette/test/unit => remote/marionette/test/xpcshell}/test_assert.js (100%) rename {testing/marionette/test/unit => remote/marionette/test/xpcshell}/test_browser.js (100%) rename {testing/marionette/test/unit => remote/marionette/test/xpcshell}/test_cookie.js (100%) rename {testing/marionette/test/unit => remote/marionette/test/xpcshell}/test_dom.js (100%) rename {testing/marionette/test/unit => remote/marionette/test/xpcshell}/test_element.js (100%) rename {testing/marionette/test/unit => remote/marionette/test/xpcshell}/test_error.js (100%) rename {testing/marionette/test/unit => remote/marionette/test/xpcshell}/test_evaluate.js (100%) rename {testing/marionette/test/unit => remote/marionette/test/xpcshell}/test_format.js (100%) rename {testing/marionette/test/unit => remote/marionette/test/xpcshell}/test_message.js (100%) rename {testing/marionette/test/unit => remote/marionette/test/xpcshell}/test_modal.js (100%) rename {testing/marionette/test/unit => remote/marionette/test/xpcshell}/test_navigate.js (100%) rename {testing/marionette/test/unit => remote/marionette/test/xpcshell}/test_prefs.js (100%) rename {testing/marionette/test/unit => remote/marionette/test/xpcshell}/test_session.js (100%) rename {testing/marionette/test/unit => remote/marionette/test/xpcshell}/test_store.js (100%) rename {testing/marionette/test/unit => remote/marionette/test/xpcshell}/test_sync.js (100%) rename {testing/marionette/test/unit => remote/marionette/test/xpcshell}/xpcshell.ini (100%) rename {testing => remote}/marionette/transport.js (100%) rename {testing => remote}/marionette/window-manager.js (100%) delete mode 100644 testing/marionette/components/moz.build diff --git a/.eslintignore b/.eslintignore index 3d076b89b3fe..12ed20999a0c 100644 --- a/.eslintignore +++ b/.eslintignore @@ -155,6 +155,7 @@ python/ # These are (mainly) imported code that we don't want to lint to make imports easier. remote/cdp/Protocol.jsm remote/cdp/test/browser/chrome-remote-interface.js +remote/marionette/atom.js # services/ exclusions @@ -170,7 +171,6 @@ servo/ # Test files that we don't want to lint (preprocessed, minified etc) testing/condprofile/condprof/tests/profile -testing/marionette/atom.js testing/mozbase/mozprofile/tests/files/prefs_with_comments.js testing/talos/talos/scripts/jszip.min.js testing/talos/talos/startup_test/sessionrestore/profile/sessionstore.js diff --git a/docs/conf.py b/docs/conf.py index d5783571d82d..97ec6f532283 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -55,7 +55,7 @@ extensions = [ js_source_path = [ "../browser/components/extensions", "../browser/components/uitour", - "../testing/marionette", + "../remote/marionette", "../toolkit/components/extensions", "../toolkit/components/extensions/parent", "../toolkit/components/featuregates", diff --git a/testing/marionette/components/marionette.js b/remote/components/marionette.js similarity index 100% rename from testing/marionette/components/marionette.js rename to remote/components/marionette.js diff --git a/testing/marionette/components/marionette.manifest b/remote/components/marionette.manifest similarity index 100% rename from testing/marionette/components/marionette.manifest rename to remote/components/marionette.manifest diff --git a/remote/components/moz.build b/remote/components/moz.build index c278b0398a46..e09e5ade4371 100644 --- a/remote/components/moz.build +++ b/remote/components/moz.build @@ -6,7 +6,21 @@ DIRS += [ "rust", ] +EXTRA_COMPONENTS += [ + "marionette.js", + "marionette.manifest", +] + XPIDL_MODULE = "remote" -XPIDL_SOURCES += ["nsIRemoteAgent.idl"] + +XPIDL_SOURCES += [ + "nsIMarionette.idl", + "nsIRemoteAgent.idl", +] XPCOM_MANIFESTS += ["components.conf"] + +with Files("marionette.*"): + BUG_COMPONENT = ("Testing", "Marionette") +with Files("nsIMarionette.idl"): + BUG_COMPONENT = ("Testing", "Marionette") diff --git a/testing/marionette/components/nsIMarionette.idl b/remote/components/nsIMarionette.idl similarity index 100% rename from testing/marionette/components/nsIMarionette.idl rename to remote/components/nsIMarionette.idl diff --git a/testing/marionette/.eslintrc.js b/remote/marionette/.eslintrc.js similarity index 100% rename from testing/marionette/.eslintrc.js rename to remote/marionette/.eslintrc.js diff --git a/testing/marionette/README b/remote/marionette/README similarity index 82% rename from testing/marionette/README rename to remote/marionette/README index 6dd268afec28..d077a5136c40 100644 --- a/testing/marionette/README +++ b/remote/marionette/README @@ -11,10 +11,10 @@ Marionette [ ˌmarɪəˈnɛt] is Marionette provides interfaces for interacting with both the internal JavaScript runtime and UI elements of Gecko-based browsers, such -as Firefox and Fennec. It can control both the chrome- and content +as Firefox on desktop and mobile. It can control both the chrome- and content documents, giving a high level of control and ability to replicate, or emulate, user interaction. Head on to the Marionette documentation to find out more: - https://firefox-source-docs.mozilla.org/testing/marionette/marionette/ + https://firefox-source-docs.mozilla.org/testing/marionette/ diff --git a/testing/marionette/accessibility.js b/remote/marionette/accessibility.js similarity index 100% rename from testing/marionette/accessibility.js rename to remote/marionette/accessibility.js diff --git a/testing/marionette/action.js b/remote/marionette/action.js similarity index 100% rename from testing/marionette/action.js rename to remote/marionette/action.js diff --git a/testing/marionette/actors/MarionetteCommandsChild.jsm b/remote/marionette/actors/MarionetteCommandsChild.jsm similarity index 100% rename from testing/marionette/actors/MarionetteCommandsChild.jsm rename to remote/marionette/actors/MarionetteCommandsChild.jsm diff --git a/testing/marionette/actors/MarionetteCommandsParent.jsm b/remote/marionette/actors/MarionetteCommandsParent.jsm similarity index 100% rename from testing/marionette/actors/MarionetteCommandsParent.jsm rename to remote/marionette/actors/MarionetteCommandsParent.jsm diff --git a/testing/marionette/actors/MarionetteEventsChild.jsm b/remote/marionette/actors/MarionetteEventsChild.jsm similarity index 100% rename from testing/marionette/actors/MarionetteEventsChild.jsm rename to remote/marionette/actors/MarionetteEventsChild.jsm diff --git a/testing/marionette/actors/MarionetteEventsParent.jsm b/remote/marionette/actors/MarionetteEventsParent.jsm similarity index 100% rename from testing/marionette/actors/MarionetteEventsParent.jsm rename to remote/marionette/actors/MarionetteEventsParent.jsm diff --git a/testing/marionette/actors/MarionetteReftestChild.jsm b/remote/marionette/actors/MarionetteReftestChild.jsm similarity index 100% rename from testing/marionette/actors/MarionetteReftestChild.jsm rename to remote/marionette/actors/MarionetteReftestChild.jsm diff --git a/testing/marionette/actors/MarionetteReftestParent.jsm b/remote/marionette/actors/MarionetteReftestParent.jsm similarity index 100% rename from testing/marionette/actors/MarionetteReftestParent.jsm rename to remote/marionette/actors/MarionetteReftestParent.jsm diff --git a/testing/marionette/addon.js b/remote/marionette/addon.js similarity index 100% rename from testing/marionette/addon.js rename to remote/marionette/addon.js diff --git a/testing/marionette/appinfo.js b/remote/marionette/appinfo.js similarity index 100% rename from testing/marionette/appinfo.js rename to remote/marionette/appinfo.js diff --git a/testing/marionette/assert.js b/remote/marionette/assert.js similarity index 100% rename from testing/marionette/assert.js rename to remote/marionette/assert.js diff --git a/testing/marionette/atom.js b/remote/marionette/atom.js similarity index 100% rename from testing/marionette/atom.js rename to remote/marionette/atom.js diff --git a/testing/marionette/browser.js b/remote/marionette/browser.js similarity index 100% rename from testing/marionette/browser.js rename to remote/marionette/browser.js diff --git a/testing/marionette/capture.js b/remote/marionette/capture.js similarity index 100% rename from testing/marionette/capture.js rename to remote/marionette/capture.js diff --git a/testing/marionette/cert.js b/remote/marionette/cert.js similarity index 100% rename from testing/marionette/cert.js rename to remote/marionette/cert.js diff --git a/testing/marionette/reftest.xhtml b/remote/marionette/chrome/reftest.xhtml similarity index 100% rename from testing/marionette/reftest.xhtml rename to remote/marionette/chrome/reftest.xhtml diff --git a/testing/marionette/chrome/test.xhtml b/remote/marionette/chrome/test.xhtml similarity index 100% rename from testing/marionette/chrome/test.xhtml rename to remote/marionette/chrome/test.xhtml diff --git a/testing/marionette/chrome/test2.xhtml b/remote/marionette/chrome/test2.xhtml similarity index 100% rename from testing/marionette/chrome/test2.xhtml rename to remote/marionette/chrome/test2.xhtml diff --git a/testing/marionette/chrome/test_dialog.dtd b/remote/marionette/chrome/test_dialog.dtd similarity index 100% rename from testing/marionette/chrome/test_dialog.dtd rename to remote/marionette/chrome/test_dialog.dtd diff --git a/testing/marionette/chrome/test_dialog.properties b/remote/marionette/chrome/test_dialog.properties similarity index 100% rename from testing/marionette/chrome/test_dialog.properties rename to remote/marionette/chrome/test_dialog.properties diff --git a/testing/marionette/chrome/test_dialog.xhtml b/remote/marionette/chrome/test_dialog.xhtml similarity index 100% rename from testing/marionette/chrome/test_dialog.xhtml rename to remote/marionette/chrome/test_dialog.xhtml diff --git a/testing/marionette/chrome/test_menupopup.xhtml b/remote/marionette/chrome/test_menupopup.xhtml similarity index 100% rename from testing/marionette/chrome/test_menupopup.xhtml rename to remote/marionette/chrome/test_menupopup.xhtml diff --git a/testing/marionette/chrome/test_nested_iframe.xhtml b/remote/marionette/chrome/test_nested_iframe.xhtml similarity index 100% rename from testing/marionette/chrome/test_nested_iframe.xhtml rename to remote/marionette/chrome/test_nested_iframe.xhtml diff --git a/testing/marionette/cookie.js b/remote/marionette/cookie.js similarity index 100% rename from testing/marionette/cookie.js rename to remote/marionette/cookie.js diff --git a/testing/marionette/doc/Building.md b/remote/marionette/doc/Building.md similarity index 100% rename from testing/marionette/doc/Building.md rename to remote/marionette/doc/Building.md diff --git a/testing/marionette/doc/CodeStyle.md b/remote/marionette/doc/CodeStyle.md similarity index 92% rename from testing/marionette/doc/CodeStyle.md rename to remote/marionette/doc/CodeStyle.md index bc332fb17a44..5e1895e1a306 100644 --- a/testing/marionette/doc/CodeStyle.md +++ b/remote/marionette/doc/CodeStyle.md @@ -14,7 +14,7 @@ For the overall Marionette project, a few rough rules are: * Code is mutable and not written in stone. Nothing that is checked in is sacred and we encourage change to make - testing/marionette a pleasant ecosystem to work in. + remote/marionette a pleasant ecosystem to work in. JavaScript @@ -166,14 +166,14 @@ to make this happen! The practical details of working on the Marionette code is outlined in [CONTRIBUTING.md], but generally you do not have to re-build -Firefox when changing code. Any change to testing/marionette/*.js +Firefox when changing code. Any change to remote/marionette/*.js will be picked up on restarting Firefox. The only notable exception -is testing/marionette/components/marionette.js, which does require +is remote/components/marionette.js, which does require a re-build. [XPCOM]: https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM [strict mode]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode -[our own specialisations]: https://searchfox.org/mozilla-central/source/testing/marionette/.eslintrc.js +[our own specialisations]: https://searchfox.org/mozilla-central/source/remote/marionette/.eslintrc.js [linter]: #linting [copying header]: https://www.mozilla.org/en-US/MPL/headers/ [public domain]: https://creativecommons.org/publicdomain/zero/1.0/ @@ -190,7 +190,7 @@ TODO Documentation ------------- -We keep our documentation in-tree under [testing/marionette/doc] +We keep our documentation in-tree under [remote/marionette/doc] and [testing/geckodriver/doc]. Updates and minor changes to documentation should ideally not be scrutinised to the same degree as code changes to encourage frequent updates so that the documentation @@ -207,16 +207,17 @@ These include public functions—or command implementations—on the `GeckoDriver` class, as well as all exported symbols from other modules. Documentation for non-exported symbols is not required. -The API documentation can be regenerated to [testing/marionette/doc/api] +The API documentation can be regenerated to [remote/marionette/doc/internals] so: -The API documentation uses [jsdoc] and is generated to on Taskcluster. You may also build the documentation locally: +The API documentation uses [jsdoc] and is generated to on Taskcluster. You may also build the documentation locally: % ./mach doc [Mozilla eslint rules]: https://searchfox.org/mozilla-central/source/.eslintrc.js +[remote/marionette/doc]: https://searchfox.org/mozilla-central/source/remote/marionette/doc +[remote/marionette/doc/internals]: https://searchfox.org/mozilla-central/source/remote/marionette/doc/internals [testing/geckodriver/doc]: https://searchfox.org/mozilla-central/source/testing/geckodriver/doc -[testing/marionette/doc]: https://searchfox.org/mozilla-central/source/testing/marionette/doc [jsdoc]: http://usejsdoc.org/ @@ -229,13 +230,13 @@ which harmonises the output from [eslint] and [flake8]. To run the linter with a sensible output: - % ./mach lint -funix testing/marionette + % ./mach lint -funix remote/marionette For certain classes of style violations the eslint linter has an automatic mode for fixing and formatting your code. This is particularly useful to keep to whitespace and indentation rules: - % ./mach eslint --fix testing/marionette + % ./mach eslint --fix remote/marionette The linter is also run as a try job (shorthand `ES`) which means any style violations will automatically block a patch from landing diff --git a/testing/marionette/doc/Contributing.md b/remote/marionette/doc/Contributing.md similarity index 99% rename from testing/marionette/doc/Contributing.md rename to remote/marionette/doc/Contributing.md index e325b1a95263..f146568d9499 100644 --- a/testing/marionette/doc/Contributing.md +++ b/remote/marionette/doc/Contributing.md @@ -56,7 +56,7 @@ code in our [code style document], which we highly recommend you read. [ask questions]: ./index.html#communication [reach out to us]: ./index.html#communication -[mozilla-central]: https://searchfox.org/mozilla-central/source/testing/marionette/ +[mozilla-central]: https://searchfox.org/mozilla-central/source/remote/marionette/ [good first bugs]: https://codetribute.mozilla.org/projects/automation [code style document]: CodeStyle.html diff --git a/testing/marionette/doc/Debugging.md b/remote/marionette/doc/Debugging.md similarity index 100% rename from testing/marionette/doc/Debugging.md rename to remote/marionette/doc/Debugging.md diff --git a/testing/marionette/doc/Intro.md b/remote/marionette/doc/Intro.md similarity index 100% rename from testing/marionette/doc/Intro.md rename to remote/marionette/doc/Intro.md diff --git a/testing/marionette/doc/NewContributors.md b/remote/marionette/doc/NewContributors.md similarity index 92% rename from testing/marionette/doc/NewContributors.md rename to remote/marionette/doc/NewContributors.md index 5411b32862ba..d01937c02d4a 100644 --- a/testing/marionette/doc/NewContributors.md +++ b/remote/marionette/doc/NewContributors.md @@ -64,7 +64,8 @@ your patches are laid out in [Patches.md](Patches.html). Resources --------- - * Search Mozilla's code repositories with [searchfox]. + * Search Mozilla's code repository with searchfox to find the [code for + Marionette] and the [Marionette client/harness]. * Another [guide for new contributors]. It has not been updated in a long time but it's a good general resource if you ever get stuck on something. @@ -81,7 +82,8 @@ Resources * If you'd rather use git instead of hg, see [git workflow for Gecko development] and/or [this blog post by :ato]. -[searchfox]: https://searchfox.org/mozilla-central/source/testing/marionette/ +[code for Marionette]: https://searchfox.org/mozilla-central/source/remote/marionette/ +[Marionette client/harness]: https://searchfox.org/mozilla-central/source/testing/marionette/ [guide for new contributors]: https://ateam-bootcamp.readthedocs.org/en/latest/guide/index.html#new-contributor-guide [Mercurial for Mozillians]: https://mozilla-version-control-tools.readthedocs.org/en/latest/hgmozilla/index.html [guide]: https://gist.github.com/mjzffr/d2adef328a416081f543 diff --git a/testing/marionette/doc/Patches.md b/remote/marionette/doc/Patches.md similarity index 100% rename from testing/marionette/doc/Patches.md rename to remote/marionette/doc/Patches.md diff --git a/testing/marionette/doc/Prefs.md b/remote/marionette/doc/Prefs.md similarity index 100% rename from testing/marionette/doc/Prefs.md rename to remote/marionette/doc/Prefs.md diff --git a/testing/marionette/doc/Protocol.md b/remote/marionette/doc/Protocol.md similarity index 100% rename from testing/marionette/doc/Protocol.md rename to remote/marionette/doc/Protocol.md diff --git a/testing/marionette/doc/PythonTests.md b/remote/marionette/doc/PythonTests.md similarity index 100% rename from testing/marionette/doc/PythonTests.md rename to remote/marionette/doc/PythonTests.md diff --git a/testing/marionette/doc/SeleniumAtoms.md b/remote/marionette/doc/SeleniumAtoms.md similarity index 97% rename from testing/marionette/doc/SeleniumAtoms.md rename to remote/marionette/doc/SeleniumAtoms.md index 9f5a73f36c5c..ef114595ff8c 100644 --- a/testing/marionette/doc/SeleniumAtoms.md +++ b/remote/marionette/doc/SeleniumAtoms.md @@ -17,7 +17,7 @@ To use one of those atoms Javascript modules will have to import [Selenium atoms]: https://github.com/SeleniumHQ/selenium/tree/master/javascript/webdriver/atoms [WebDriver specification]: https://w3c.github.io/webdriver/webdriver-spec.html -[atom.js]: https://searchfox.org/mozilla-central/source/testing/marionette/atom.js +[atom.js]: https://searchfox.org/mozilla-central/source/remote/marionette/atom.js Update required Selenium atoms diff --git a/testing/marionette/doc/Taskcluster.md b/remote/marionette/doc/Taskcluster.md similarity index 100% rename from testing/marionette/doc/Taskcluster.md rename to remote/marionette/doc/Taskcluster.md diff --git a/testing/marionette/doc/Testing.md b/remote/marionette/doc/Testing.md similarity index 97% rename from testing/marionette/doc/Testing.md rename to remote/marionette/doc/Testing.md index f95b9d100c72..2b3fb87e723e 100644 --- a/testing/marionette/doc/Testing.md +++ b/remote/marionette/doc/Testing.md @@ -23,14 +23,14 @@ xpcshell unit tests ------------------- Marionette has a set of [xpcshell] unit tests located in -_testing/marionette/test/unit. These can be run this way: +_remote/marionette/test/xpcshell. These can be run this way: - % ./mach test testing/marionette/test/unit + % ./mach test remote/marionette/test/unit Because tests are run in parallel and xpcshell itself is quite chatty, it can sometimes be useful to run the tests sequentially: - % ./mach test --sequential testing/marionette/test/unit/test_error.js + % ./mach test --sequential remote/marionette/test/xpcshell/test_error.js These unit tests run as part of the `X` jobs on Treeherder. diff --git a/testing/marionette/doc/index.rst b/remote/marionette/doc/index.rst similarity index 100% rename from testing/marionette/doc/index.rst rename to remote/marionette/doc/index.rst diff --git a/testing/marionette/doc/internals/action.rst b/remote/marionette/doc/internals/action.rst similarity index 100% rename from testing/marionette/doc/internals/action.rst rename to remote/marionette/doc/internals/action.rst diff --git a/testing/marionette/doc/internals/addon.rst b/remote/marionette/doc/internals/addon.rst similarity index 100% rename from testing/marionette/doc/internals/addon.rst rename to remote/marionette/doc/internals/addon.rst diff --git a/testing/marionette/doc/internals/appinfo.rst b/remote/marionette/doc/internals/appinfo.rst similarity index 100% rename from testing/marionette/doc/internals/appinfo.rst rename to remote/marionette/doc/internals/appinfo.rst diff --git a/testing/marionette/doc/internals/assert.rst b/remote/marionette/doc/internals/assert.rst similarity index 100% rename from testing/marionette/doc/internals/assert.rst rename to remote/marionette/doc/internals/assert.rst diff --git a/testing/marionette/doc/internals/browser.rst b/remote/marionette/doc/internals/browser.rst similarity index 100% rename from testing/marionette/doc/internals/browser.rst rename to remote/marionette/doc/internals/browser.rst diff --git a/testing/marionette/doc/internals/capture.rst b/remote/marionette/doc/internals/capture.rst similarity index 100% rename from testing/marionette/doc/internals/capture.rst rename to remote/marionette/doc/internals/capture.rst diff --git a/testing/marionette/doc/internals/cert.rst b/remote/marionette/doc/internals/cert.rst similarity index 100% rename from testing/marionette/doc/internals/cert.rst rename to remote/marionette/doc/internals/cert.rst diff --git a/testing/marionette/doc/internals/cookie.rst b/remote/marionette/doc/internals/cookie.rst similarity index 100% rename from testing/marionette/doc/internals/cookie.rst rename to remote/marionette/doc/internals/cookie.rst diff --git a/testing/marionette/doc/internals/dom.rst b/remote/marionette/doc/internals/dom.rst similarity index 100% rename from testing/marionette/doc/internals/dom.rst rename to remote/marionette/doc/internals/dom.rst diff --git a/testing/marionette/doc/internals/driver.rst b/remote/marionette/doc/internals/driver.rst similarity index 100% rename from testing/marionette/doc/internals/driver.rst rename to remote/marionette/doc/internals/driver.rst diff --git a/testing/marionette/doc/internals/element.rst b/remote/marionette/doc/internals/element.rst similarity index 100% rename from testing/marionette/doc/internals/element.rst rename to remote/marionette/doc/internals/element.rst diff --git a/testing/marionette/doc/internals/error.rst b/remote/marionette/doc/internals/error.rst similarity index 100% rename from testing/marionette/doc/internals/error.rst rename to remote/marionette/doc/internals/error.rst diff --git a/testing/marionette/doc/internals/evaluate.rst b/remote/marionette/doc/internals/evaluate.rst similarity index 100% rename from testing/marionette/doc/internals/evaluate.rst rename to remote/marionette/doc/internals/evaluate.rst diff --git a/testing/marionette/doc/internals/event.rst b/remote/marionette/doc/internals/event.rst similarity index 100% rename from testing/marionette/doc/internals/event.rst rename to remote/marionette/doc/internals/event.rst diff --git a/testing/marionette/doc/internals/format.rst b/remote/marionette/doc/internals/format.rst similarity index 100% rename from testing/marionette/doc/internals/format.rst rename to remote/marionette/doc/internals/format.rst diff --git a/testing/marionette/doc/internals/index.rst b/remote/marionette/doc/internals/index.rst similarity index 100% rename from testing/marionette/doc/internals/index.rst rename to remote/marionette/doc/internals/index.rst diff --git a/testing/marionette/doc/internals/interaction.rst b/remote/marionette/doc/internals/interaction.rst similarity index 100% rename from testing/marionette/doc/internals/interaction.rst rename to remote/marionette/doc/internals/interaction.rst diff --git a/testing/marionette/doc/internals/log.rst b/remote/marionette/doc/internals/log.rst similarity index 100% rename from testing/marionette/doc/internals/log.rst rename to remote/marionette/doc/internals/log.rst diff --git a/testing/marionette/doc/internals/message.rst b/remote/marionette/doc/internals/message.rst similarity index 100% rename from testing/marionette/doc/internals/message.rst rename to remote/marionette/doc/internals/message.rst diff --git a/testing/marionette/doc/internals/modal.rst b/remote/marionette/doc/internals/modal.rst similarity index 100% rename from testing/marionette/doc/internals/modal.rst rename to remote/marionette/doc/internals/modal.rst diff --git a/testing/marionette/doc/internals/navigate.rst b/remote/marionette/doc/internals/navigate.rst similarity index 100% rename from testing/marionette/doc/internals/navigate.rst rename to remote/marionette/doc/internals/navigate.rst diff --git a/testing/marionette/doc/internals/packets.rst b/remote/marionette/doc/internals/packets.rst similarity index 100% rename from testing/marionette/doc/internals/packets.rst rename to remote/marionette/doc/internals/packets.rst diff --git a/testing/marionette/doc/internals/prefs.rst b/remote/marionette/doc/internals/prefs.rst similarity index 100% rename from testing/marionette/doc/internals/prefs.rst rename to remote/marionette/doc/internals/prefs.rst diff --git a/testing/marionette/doc/internals/reftest.rst b/remote/marionette/doc/internals/reftest.rst similarity index 100% rename from testing/marionette/doc/internals/reftest.rst rename to remote/marionette/doc/internals/reftest.rst diff --git a/testing/marionette/doc/internals/server.rst b/remote/marionette/doc/internals/server.rst similarity index 100% rename from testing/marionette/doc/internals/server.rst rename to remote/marionette/doc/internals/server.rst diff --git a/testing/marionette/doc/internals/session.rst b/remote/marionette/doc/internals/session.rst similarity index 100% rename from testing/marionette/doc/internals/session.rst rename to remote/marionette/doc/internals/session.rst diff --git a/testing/marionette/doc/internals/sync.rst b/remote/marionette/doc/internals/sync.rst similarity index 100% rename from testing/marionette/doc/internals/sync.rst rename to remote/marionette/doc/internals/sync.rst diff --git a/testing/marionette/doc/internals/window-manager.rst b/remote/marionette/doc/internals/window-manager.rst similarity index 100% rename from testing/marionette/doc/internals/window-manager.rst rename to remote/marionette/doc/internals/window-manager.rst diff --git a/testing/marionette/dom.js b/remote/marionette/dom.js similarity index 100% rename from testing/marionette/dom.js rename to remote/marionette/dom.js diff --git a/testing/marionette/driver.js b/remote/marionette/driver.js similarity index 100% rename from testing/marionette/driver.js rename to remote/marionette/driver.js diff --git a/testing/marionette/element.js b/remote/marionette/element.js similarity index 100% rename from testing/marionette/element.js rename to remote/marionette/element.js diff --git a/testing/marionette/error.js b/remote/marionette/error.js similarity index 100% rename from testing/marionette/error.js rename to remote/marionette/error.js diff --git a/testing/marionette/evaluate.js b/remote/marionette/evaluate.js similarity index 100% rename from testing/marionette/evaluate.js rename to remote/marionette/evaluate.js diff --git a/testing/marionette/event.js b/remote/marionette/event.js similarity index 100% rename from testing/marionette/event.js rename to remote/marionette/event.js diff --git a/testing/marionette/format.js b/remote/marionette/format.js similarity index 100% rename from testing/marionette/format.js rename to remote/marionette/format.js diff --git a/testing/marionette/interaction.js b/remote/marionette/interaction.js similarity index 100% rename from testing/marionette/interaction.js rename to remote/marionette/interaction.js diff --git a/testing/marionette/jar.mn b/remote/marionette/jar.mn similarity index 98% rename from testing/marionette/jar.mn rename to remote/marionette/jar.mn index e814b230eded..110e99b8c50a 100644 --- a/testing/marionette/jar.mn +++ b/remote/marionette/jar.mn @@ -39,7 +39,7 @@ marionette.jar: content/prefs.js (prefs.js) content/print.js (print.js) content/reftest.js (reftest.js) - content/reftest.xhtml (reftest.xhtml) + content/reftest.xhtml (chrome/reftest.xhtml) content/reftest-content.js (reftest-content.js) content/server.js (server.js) content/session.js (session.js) diff --git a/testing/marionette/l10n.js b/remote/marionette/l10n.js similarity index 100% rename from testing/marionette/l10n.js rename to remote/marionette/l10n.js diff --git a/testing/marionette/legacyaction.js b/remote/marionette/legacyaction.js similarity index 100% rename from testing/marionette/legacyaction.js rename to remote/marionette/legacyaction.js diff --git a/testing/marionette/log.js b/remote/marionette/log.js similarity index 100% rename from testing/marionette/log.js rename to remote/marionette/log.js diff --git a/testing/marionette/message.js b/remote/marionette/message.js similarity index 100% rename from testing/marionette/message.js rename to remote/marionette/message.js diff --git a/testing/marionette/modal.js b/remote/marionette/modal.js similarity index 100% rename from testing/marionette/modal.js rename to remote/marionette/modal.js diff --git a/remote/marionette/moz.build b/remote/marionette/moz.build new file mode 100644 index 000000000000..1fad2197de72 --- /dev/null +++ b/remote/marionette/moz.build @@ -0,0 +1,15 @@ +# 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/. + +JAR_MANIFESTS += ["jar.mn"] + +XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.ini"] + +with Files("**"): + BUG_COMPONENT = ("Testing", "Marionette") + +SPHINX_TREES["/testing/marionette"] = "doc" + +with Files("doc/**"): + SCHEDULES.exclusive = ["docs"] diff --git a/testing/marionette/navigate.js b/remote/marionette/navigate.js similarity index 100% rename from testing/marionette/navigate.js rename to remote/marionette/navigate.js diff --git a/testing/marionette/packets.js b/remote/marionette/packets.js similarity index 100% rename from testing/marionette/packets.js rename to remote/marionette/packets.js diff --git a/testing/marionette/permissions.js b/remote/marionette/permissions.js similarity index 100% rename from testing/marionette/permissions.js rename to remote/marionette/permissions.js diff --git a/testing/marionette/prefs.js b/remote/marionette/prefs.js similarity index 100% rename from testing/marionette/prefs.js rename to remote/marionette/prefs.js diff --git a/testing/marionette/print.js b/remote/marionette/print.js similarity index 100% rename from testing/marionette/print.js rename to remote/marionette/print.js diff --git a/testing/marionette/reftest-content.js b/remote/marionette/reftest-content.js similarity index 100% rename from testing/marionette/reftest-content.js rename to remote/marionette/reftest-content.js diff --git a/testing/marionette/reftest.js b/remote/marionette/reftest.js similarity index 100% rename from testing/marionette/reftest.js rename to remote/marionette/reftest.js diff --git a/testing/marionette/server.js b/remote/marionette/server.js similarity index 100% rename from testing/marionette/server.js rename to remote/marionette/server.js diff --git a/testing/marionette/session.js b/remote/marionette/session.js similarity index 100% rename from testing/marionette/session.js rename to remote/marionette/session.js diff --git a/testing/marionette/stream-utils.js b/remote/marionette/stream-utils.js similarity index 100% rename from testing/marionette/stream-utils.js rename to remote/marionette/stream-utils.js diff --git a/testing/marionette/sync.js b/remote/marionette/sync.js similarity index 100% rename from testing/marionette/sync.js rename to remote/marionette/sync.js diff --git a/testing/marionette/test/README b/remote/marionette/test/README similarity index 100% rename from testing/marionette/test/README rename to remote/marionette/test/README diff --git a/testing/marionette/test/unit/.eslintrc.js b/remote/marionette/test/xpcshell/.eslintrc.js similarity index 100% rename from testing/marionette/test/unit/.eslintrc.js rename to remote/marionette/test/xpcshell/.eslintrc.js diff --git a/testing/marionette/test/unit/README b/remote/marionette/test/xpcshell/README similarity index 81% rename from testing/marionette/test/unit/README rename to remote/marionette/test/xpcshell/README index 06eca782e766..ce516d17ca4f 100644 --- a/testing/marionette/test/unit/README +++ b/remote/marionette/test/xpcshell/README @@ -1,11 +1,11 @@ To run the tests in this directory, from the top source directory, either invoke the test despatcher in mach: - % ./mach test testing/marionette/test/unit + % ./mach test remote/marionette/test/xpcshell Or call out the harness specifically: - % ./mach xpcshell-test testing/marionette/test/unit + % ./mach xpcshell-test remote/marionette/test/xpcshell The latter gives you the --sequential option which can be useful when debugging to prevent tests from running in parallel. diff --git a/testing/marionette/test/unit/test_action.js b/remote/marionette/test/xpcshell/test_action.js similarity index 100% rename from testing/marionette/test/unit/test_action.js rename to remote/marionette/test/xpcshell/test_action.js diff --git a/testing/marionette/test/unit/test_actors.js b/remote/marionette/test/xpcshell/test_actors.js similarity index 100% rename from testing/marionette/test/unit/test_actors.js rename to remote/marionette/test/xpcshell/test_actors.js diff --git a/testing/marionette/test/unit/test_appinfo.js b/remote/marionette/test/xpcshell/test_appinfo.js similarity index 100% rename from testing/marionette/test/unit/test_appinfo.js rename to remote/marionette/test/xpcshell/test_appinfo.js diff --git a/testing/marionette/test/unit/test_assert.js b/remote/marionette/test/xpcshell/test_assert.js similarity index 100% rename from testing/marionette/test/unit/test_assert.js rename to remote/marionette/test/xpcshell/test_assert.js diff --git a/testing/marionette/test/unit/test_browser.js b/remote/marionette/test/xpcshell/test_browser.js similarity index 100% rename from testing/marionette/test/unit/test_browser.js rename to remote/marionette/test/xpcshell/test_browser.js diff --git a/testing/marionette/test/unit/test_cookie.js b/remote/marionette/test/xpcshell/test_cookie.js similarity index 100% rename from testing/marionette/test/unit/test_cookie.js rename to remote/marionette/test/xpcshell/test_cookie.js diff --git a/testing/marionette/test/unit/test_dom.js b/remote/marionette/test/xpcshell/test_dom.js similarity index 100% rename from testing/marionette/test/unit/test_dom.js rename to remote/marionette/test/xpcshell/test_dom.js diff --git a/testing/marionette/test/unit/test_element.js b/remote/marionette/test/xpcshell/test_element.js similarity index 100% rename from testing/marionette/test/unit/test_element.js rename to remote/marionette/test/xpcshell/test_element.js diff --git a/testing/marionette/test/unit/test_error.js b/remote/marionette/test/xpcshell/test_error.js similarity index 100% rename from testing/marionette/test/unit/test_error.js rename to remote/marionette/test/xpcshell/test_error.js diff --git a/testing/marionette/test/unit/test_evaluate.js b/remote/marionette/test/xpcshell/test_evaluate.js similarity index 100% rename from testing/marionette/test/unit/test_evaluate.js rename to remote/marionette/test/xpcshell/test_evaluate.js diff --git a/testing/marionette/test/unit/test_format.js b/remote/marionette/test/xpcshell/test_format.js similarity index 100% rename from testing/marionette/test/unit/test_format.js rename to remote/marionette/test/xpcshell/test_format.js diff --git a/testing/marionette/test/unit/test_message.js b/remote/marionette/test/xpcshell/test_message.js similarity index 100% rename from testing/marionette/test/unit/test_message.js rename to remote/marionette/test/xpcshell/test_message.js diff --git a/testing/marionette/test/unit/test_modal.js b/remote/marionette/test/xpcshell/test_modal.js similarity index 100% rename from testing/marionette/test/unit/test_modal.js rename to remote/marionette/test/xpcshell/test_modal.js diff --git a/testing/marionette/test/unit/test_navigate.js b/remote/marionette/test/xpcshell/test_navigate.js similarity index 100% rename from testing/marionette/test/unit/test_navigate.js rename to remote/marionette/test/xpcshell/test_navigate.js diff --git a/testing/marionette/test/unit/test_prefs.js b/remote/marionette/test/xpcshell/test_prefs.js similarity index 100% rename from testing/marionette/test/unit/test_prefs.js rename to remote/marionette/test/xpcshell/test_prefs.js diff --git a/testing/marionette/test/unit/test_session.js b/remote/marionette/test/xpcshell/test_session.js similarity index 100% rename from testing/marionette/test/unit/test_session.js rename to remote/marionette/test/xpcshell/test_session.js diff --git a/testing/marionette/test/unit/test_store.js b/remote/marionette/test/xpcshell/test_store.js similarity index 100% rename from testing/marionette/test/unit/test_store.js rename to remote/marionette/test/xpcshell/test_store.js diff --git a/testing/marionette/test/unit/test_sync.js b/remote/marionette/test/xpcshell/test_sync.js similarity index 100% rename from testing/marionette/test/unit/test_sync.js rename to remote/marionette/test/xpcshell/test_sync.js diff --git a/testing/marionette/test/unit/xpcshell.ini b/remote/marionette/test/xpcshell/xpcshell.ini similarity index 100% rename from testing/marionette/test/unit/xpcshell.ini rename to remote/marionette/test/xpcshell/xpcshell.ini diff --git a/testing/marionette/transport.js b/remote/marionette/transport.js similarity index 100% rename from testing/marionette/transport.js rename to remote/marionette/transport.js diff --git a/testing/marionette/window-manager.js b/remote/marionette/window-manager.js similarity index 100% rename from testing/marionette/window-manager.js rename to remote/marionette/window-manager.js diff --git a/remote/moz.build b/remote/moz.build index 0c661790253e..c971370bb6fc 100644 --- a/remote/moz.build +++ b/remote/moz.build @@ -5,6 +5,7 @@ DIRS += [ "cdp", "components", + "marionette", "shared", ] diff --git a/testing/geckodriver/doc/Profiles.md b/testing/geckodriver/doc/Profiles.md index c7ff656ac8fa..27840780d467 100644 --- a/testing/geckodriver/doc/Profiles.md +++ b/testing/geckodriver/doc/Profiles.md @@ -75,7 +75,7 @@ Firefox (1), and a set of recommended preferences set on startup (2). These can be perused here: 1. [testing/geckodriver/src/prefs.rs](https://searchfox.org/mozilla-central/source/testing/geckodriver/src/prefs.rs) - 2. [testing/marionette/components/marionette/marionette.js](https://searchfox.org/mozilla-central/source/testing/marionette/components/marionette.js) + 2. [remote/components/marionette.js](https://searchfox.org/mozilla-central/source/remote/components/marionette.js) As mentioned, these are _recommended_ preferences, and any user-defined preferences in the [user.js file] or as part of the [`prefs` capability] diff --git a/testing/marionette/components/moz.build b/testing/marionette/components/moz.build deleted file mode 100644 index 1771ec39d652..000000000000 --- a/testing/marionette/components/moz.build +++ /dev/null @@ -1,11 +0,0 @@ -# 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/. - -EXTRA_COMPONENTS += [ - "marionette.js", - "marionette.manifest", -] - -XPIDL_MODULE = "remote" -XPIDL_SOURCES += ["nsIMarionette.idl"] diff --git a/testing/marionette/moz.build b/testing/marionette/moz.build index c7d091102086..b66a3abdd542 100644 --- a/testing/marionette/moz.build +++ b/testing/marionette/moz.build @@ -2,12 +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/. -DIRS += ["components"] - -JAR_MANIFESTS += ["jar.mn"] - MARIONETTE_UNIT_MANIFESTS += ["harness/marionette_harness/tests/unit/unit-tests.ini"] -XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"] with Files("**"): BUG_COMPONENT = ("Testing", "Marionette") @@ -15,8 +10,4 @@ with Files("**"): with Files("harness/**"): SCHEDULES.exclusive = ["marionette", "firefox-ui"] -SPHINX_TREES["/testing/marionette"] = "doc" SPHINX_PYTHON_PACKAGE_DIRS += ["client/marionette_driver"] - -with Files("doc/**"): - SCHEDULES.exclusive = ["docs"] diff --git a/toolkit/moz.configure b/toolkit/moz.configure index ac7ab6c2efe5..81d09848f25d 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -1075,7 +1075,7 @@ add_old_configure_assignment("FT2_CFLAGS", ft2_info.cflags) # It also backs ../testing/geckodriver, which is Mozilla's WebDriver # implementation. # -# The source of Marionette lives in ../testing/marionette. +# The source of Marionette lives in ../remote/marionette. # # For more information, see: # https://firefox-source-docs.mozilla.org/testing/marionette/index.html diff --git a/tools/lint/codespell.yml b/tools/lint/codespell.yml index 9c097084c4f1..ec753c5ff18a 100644 --- a/tools/lint/codespell.yml +++ b/tools/lint/codespell.yml @@ -35,11 +35,11 @@ codespell: - python/mach/docs/ - python/mozlint/ - remote/doc/ + - remote/marionette/doc/ - security/manager/locales/en-US/ - services/sync/locales/en-US/ - taskcluster/docs/ - testing/geckodriver/doc/ - - testing/marionette/doc/ - testing/mozbase/docs/ - toolkit/components/extensions/docs/ - toolkit/components/normandy/docs/