From 5562f02a7c59f4f8ffc455db08c3fe5ef8b072f5 Mon Sep 17 00:00:00 2001
From: James Graham <james@hoppipolla.co.uk>
Date: Thu, 30 Mar 2023 15:23:17 +0000
Subject: [PATCH] Bug 1792090 - Move action module to remote/shared/webdriver
 r=webdriver-reviewers,whimboo

Differential Revision: https://phabricator.services.mozilla.com/D157970
---
 remote/jar.mn                                                   | 1 +
 remote/marionette/actors/MarionetteCommandsChild.sys.mjs        | 2 +-
 remote/marionette/jar.mn                                        | 1 -
 remote/marionette/test/xpcshell/xpcshell.ini                    | 1 -
 .../action.sys.mjs => shared/webdriver/Actions.sys.mjs}         | 0
 .../webdriver/test/xpcshell/test_Actions.js}                    | 2 +-
 remote/shared/webdriver/test/xpcshell/xpcshell.ini              | 1 +
 7 files changed, 4 insertions(+), 4 deletions(-)
 rename remote/{marionette/action.sys.mjs => shared/webdriver/Actions.sys.mjs} (100%)
 rename remote/{marionette/test/xpcshell/test_action.js => shared/webdriver/test/xpcshell/test_Actions.js} (99%)

diff --git a/remote/jar.mn b/remote/jar.mn
index 67506b05c281..10ddc9e41d41 100644
--- a/remote/jar.mn
+++ b/remote/jar.mn
@@ -53,6 +53,7 @@ remote.jar:
   content/shared/messagehandler/transports/FrameTransport.sys.mjs (shared/messagehandler/transports/FrameTransport.sys.mjs)
 
   # shared modules (WebDriver HTTP / BiDi only)
+  content/shared/webdriver/Actions.sys.mjs (shared/webdriver/Actions.sys.mjs)
   content/shared/webdriver/Assert.sys.mjs (shared/webdriver/Assert.sys.mjs)
   content/shared/webdriver/Capabilities.sys.mjs (shared/webdriver/Capabilities.sys.mjs)
   content/shared/webdriver/Errors.sys.mjs (shared/webdriver/Errors.sys.mjs)
diff --git a/remote/marionette/actors/MarionetteCommandsChild.sys.mjs b/remote/marionette/actors/MarionetteCommandsChild.sys.mjs
index 6034e463e9b2..85701770db65 100644
--- a/remote/marionette/actors/MarionetteCommandsChild.sys.mjs
+++ b/remote/marionette/actors/MarionetteCommandsChild.sys.mjs
@@ -10,7 +10,7 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   accessibility: "chrome://remote/content/marionette/accessibility.sys.mjs",
-  action: "chrome://remote/content/marionette/action.sys.mjs",
+  action: "chrome://remote/content/shared/webdriver/Actions.sys.mjs",
   atom: "chrome://remote/content/marionette/atom.sys.mjs",
   element: "chrome://remote/content/marionette/element.sys.mjs",
   error: "chrome://remote/content/shared/webdriver/Errors.sys.mjs",
diff --git a/remote/marionette/jar.mn b/remote/marionette/jar.mn
index d59e55a5dd50..0d1478c1ccce 100644
--- a/remote/marionette/jar.mn
+++ b/remote/marionette/jar.mn
@@ -5,7 +5,6 @@
 remote.jar:
 % content remote %content/
   content/marionette/accessibility.sys.mjs (accessibility.sys.mjs)
-  content/marionette/action.sys.mjs (action.sys.mjs)
   content/marionette/actors/MarionetteCommandsChild.sys.mjs (actors/MarionetteCommandsChild.sys.mjs)
   content/marionette/actors/MarionetteCommandsParent.sys.mjs (actors/MarionetteCommandsParent.sys.mjs)
   content/marionette/actors/MarionetteEventsChild.sys.mjs (actors/MarionetteEventsChild.sys.mjs)
diff --git a/remote/marionette/test/xpcshell/xpcshell.ini b/remote/marionette/test/xpcshell/xpcshell.ini
index ff7b528b9e6e..262d57ca39cd 100644
--- a/remote/marionette/test/xpcshell/xpcshell.ini
+++ b/remote/marionette/test/xpcshell/xpcshell.ini
@@ -6,7 +6,6 @@
 head = head.js
 skip-if = appname == "thunderbird"
 
-[test_action.js]
 [test_actors.js]
 [test_browser.js]
 [test_cookie.js]
diff --git a/remote/marionette/action.sys.mjs b/remote/shared/webdriver/Actions.sys.mjs
similarity index 100%
rename from remote/marionette/action.sys.mjs
rename to remote/shared/webdriver/Actions.sys.mjs
diff --git a/remote/marionette/test/xpcshell/test_action.js b/remote/shared/webdriver/test/xpcshell/test_Actions.js
similarity index 99%
rename from remote/marionette/test/xpcshell/test_action.js
rename to remote/shared/webdriver/test/xpcshell/test_Actions.js
index 05f83642737a..01e345e253e1 100644
--- a/remote/marionette/test/xpcshell/test_action.js
+++ b/remote/shared/webdriver/test/xpcshell/test_Actions.js
@@ -5,7 +5,7 @@
 "use strict";
 
 const { action } = ChromeUtils.importESModule(
-  "chrome://remote/content/marionette/action.sys.mjs"
+  "chrome://remote/content/shared/webdriver/Actions.sys.mjs"
 );
 
 const XHTMLNS = "http://www.w3.org/1999/xhtml";
diff --git a/remote/shared/webdriver/test/xpcshell/xpcshell.ini b/remote/shared/webdriver/test/xpcshell/xpcshell.ini
index 6279d133256e..c52f25c605ef 100644
--- a/remote/shared/webdriver/test/xpcshell/xpcshell.ini
+++ b/remote/shared/webdriver/test/xpcshell/xpcshell.ini
@@ -5,6 +5,7 @@
 [DEFAULT]
 head = head.js
 
+[test_Actions.js]
 [test_Assert.js]
 [test_Capabilities.js]
 [test_Errors.js]