tor-browser

commit 880a9e5969b3ebcdc339e876dcce4b915aa4537b
parent 6966bec93a6372a80677178d405c4abc82eaa293
Author: Edgar Chen <echen@mozilla.com>
Date:   Fri, 21 Nov 2025 19:31:13 +0000

Bug 1773681 - Cleanup clipboard browser tests; r=smaug

Move common code into head.js

Differential Revision: https://phabricator.services.mozilla.com/D159895

Diffstat:
M
dom/events/test/clipboard/browser_navigator_clipboard_clickjacking.js
 | 
15
++-------------
M
dom/events/test/clipboard/browser_navigator_clipboard_contextmenu_suppression.js
 | 
7
+------
M
dom/events/test/clipboard/browser_navigator_clipboard_contextmenu_suppression_ext.js
 | 
7
+------
M
dom/events/test/clipboard/browser_navigator_clipboard_read.js
 | 
15
++-------------
M
dom/events/test/clipboard/browser_navigator_clipboard_readText.js
 | 
15
++-------------
M
dom/events/test/clipboard/browser_navigator_clipboard_readText_multiple.js
 | 
7
+------
M
dom/events/test/clipboard/browser_navigator_clipboard_touch.js
 | 
9
---------
M
dom/events/test/clipboard/head.js
 | 
10
++++++++++

8 files changed, 19 insertions(+), 66 deletions(-)
diff --git a/dom/events/test/clipboard/browser_navigator_clipboard_clickjacking.js b/dom/events/test/clipboard/browser_navigator_clipboard_clickjacking.js
@@ -6,19 +6,8 @@
 
 "use strict";
 
-const kBaseUrlForContent = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content",
-  "https://example.com"
-);
-
-const kContentFileName = "simple_navigator_clipboard_keydown.html";
-
-const kContentFileUrl = kBaseUrlForContent + kContentFileName;
-
-const kApzTestNativeEventUtilsUrl =
-  "chrome://mochitests/content/browser/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js";
-
-Services.scriptloader.loadSubScript(kApzTestNativeEventUtilsUrl, this);
+const kContentFileUrl =
+  kBaseUrlForContent + "simple_navigator_clipboard_keydown.html";
 
 add_task(async function test_paste_button_clickjacking() {
   await BrowserTestUtils.withNewTab(kContentFileUrl, async function (browser) {
diff --git a/dom/events/test/clipboard/browser_navigator_clipboard_contextmenu_suppression.js b/dom/events/test/clipboard/browser_navigator_clipboard_contextmenu_suppression.js
@@ -7,12 +7,7 @@
 "use strict";
 requestLongerTimeout(2);
 
-const kBaseUrlForContent = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content",
-  "https://example.com"
-);
-const kContentFileName = "file_toplevel.html";
-const kContentFileUrl = kBaseUrlForContent + kContentFileName;
+const kContentFileUrl = kBaseUrlForContent + "file_toplevel.html";
 const kIsMac = navigator.platform.indexOf("Mac") > -1;
 
 async function waitForPasteContextMenu() {
diff --git a/dom/events/test/clipboard/browser_navigator_clipboard_contextmenu_suppression_ext.js b/dom/events/test/clipboard/browser_navigator_clipboard_contextmenu_suppression_ext.js
@@ -7,12 +7,7 @@
 "use strict";
 requestLongerTimeout(2);
 
-const kBaseUrlForContent = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content",
-  "https://example.com"
-);
-const kContentFileName = "file_toplevel.html";
-const kContentFileUrl = kBaseUrlForContent + kContentFileName;
+const kContentFileUrl = kBaseUrlForContent + "file_toplevel.html";
 const kIsMac = navigator.platform.indexOf("Mac") > -1;
 
 async function waitForPasteContextMenu() {
diff --git a/dom/events/test/clipboard/browser_navigator_clipboard_read.js b/dom/events/test/clipboard/browser_navigator_clipboard_read.js
@@ -6,19 +6,8 @@
 
 "use strict";
 
-const kBaseUrlForContent = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content",
-  "https://example.com"
-);
-
-const kContentFileName = "simple_navigator_clipboard_read.html";
-
-const kContentFileUrl = kBaseUrlForContent + kContentFileName;
-
-const kApzTestNativeEventUtilsUrl =
-  "chrome://mochitests/content/browser/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js";
-
-Services.scriptloader.loadSubScript(kApzTestNativeEventUtilsUrl, this);
+const kContentFileUrl =
+  kBaseUrlForContent + "simple_navigator_clipboard_read.html";
 
 // @param aBrowser browser object of the content tab.
 // @param aMultipleReadTextCalls if false, exactly one call is made, two
diff --git a/dom/events/test/clipboard/browser_navigator_clipboard_readText.js b/dom/events/test/clipboard/browser_navigator_clipboard_readText.js
@@ -6,19 +6,8 @@
 
 "use strict";
 
-const kBaseUrlForContent = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content",
-  "https://example.com"
-);
-
-const kContentFileName = "simple_navigator_clipboard_readText.html";
-
-const kContentFileUrl = kBaseUrlForContent + kContentFileName;
-
-const kApzTestNativeEventUtilsUrl =
-  "chrome://mochitests/content/browser/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js";
-
-Services.scriptloader.loadSubScript(kApzTestNativeEventUtilsUrl, this);
+const kContentFileUrl =
+  kBaseUrlForContent + "simple_navigator_clipboard_readText.html";
 
 // @param aBrowser browser object of the content tab.
 // @param aMultipleReadTextCalls if false, exactly one call is made, two
diff --git a/dom/events/test/clipboard/browser_navigator_clipboard_readText_multiple.js b/dom/events/test/clipboard/browser_navigator_clipboard_readText_multiple.js
@@ -6,12 +6,7 @@
 
 "use strict";
 
-const kBaseUrlForContent = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content",
-  "https://example.com"
-);
-const kContentFileName = "file_toplevel.html";
-const kContentFileUrl = kBaseUrlForContent + kContentFileName;
+const kContentFileUrl = kBaseUrlForContent + "file_toplevel.html";
 
 async function waitForPasteContextMenu() {
   await waitForPasteMenuPopupEvent("shown");
diff --git a/dom/events/test/clipboard/browser_navigator_clipboard_touch.js b/dom/events/test/clipboard/browser_navigator_clipboard_touch.js
@@ -6,18 +6,9 @@
 
 "use strict";
 
-const kBaseUrlForContent = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content",
-  "https://example.com"
-);
 const kContentFileUrl =
   kBaseUrlForContent + "simple_navigator_clipboard_readText.html";
 
-Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js",
-  this
-);
-
 // @param aBrowser browser object of the content tab.
 // @param aContentElementId the ID of the element to be tapped.
 function promiseTouchTapContent(aBrowser, aContentElementId) {
diff --git a/dom/events/test/clipboard/head.js b/dom/events/test/clipboard/head.js
@@ -8,6 +8,16 @@
 const kPasteMenuPopupId = "clipboardReadPasteMenuPopup";
 const kPasteMenuItemId = "clipboardReadPasteMenuItem";
 
+const kBaseUrlForContent = getRootDirectory(gTestPath).replace(
+  "chrome://mochitests/content",
+  "https://example.com"
+);
+
+Services.scriptloader.loadSubScript(
+  "chrome://mochitests/content/browser/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js",
+  this
+);
+
 function promiseWritingRandomTextToClipboard() {
   const clipboardText = "X" + Math.random();
   return navigator.clipboard.writeText(clipboardText).then(() => {