From 8f8bf8ee6aad93943766ef1487f84022a393f200 Mon Sep 17 00:00:00 2001
From: Alex Rodionov <p0deje@gmail.com>
Date: Fri, 15 Mar 2024 13:56:54 -0700
Subject: [PATCH] [java] Remove firefox-dev tests

Per #11305
---
 .skipped-tests                 |  1 -
 common/browsers.bzl            | 11 -----------
 common/repositories.bzl        | 24 ------------------------
 java/browsers.bzl              | 18 ------------------
 java/private/selenium_test.bzl |  8 --------
 scripts/pinned_browsers.py     |  8 +-------
 6 files changed, 1 insertion(+), 69 deletions(-)

diff --git a/.skipped-tests b/.skipped-tests
index 2c35c12a796c2..874fac602aaf9 100644
--- a/.skipped-tests
+++ b/.skipped-tests
@@ -32,7 +32,6 @@
 -//javascript/atoms:test-chrome
 -//javascript/atoms:test-edge
 -//javascript/atoms:test-firefox-beta
--//javascript/atoms:test-firefox-dev
 -//py:common-chrome-test/selenium/webdriver/common/virtual_authenticator_tests.py
 -//py:test-chrome-test/selenium/webdriver/chrome/chrome_launcher_tests.py
 -//py:test-chrome-test/selenium/webdriver/chrome/chrome_service_tests.py
diff --git a/common/browsers.bzl b/common/browsers.bzl
index e617d4c3f0baf..7be9d79fbf267 100644
--- a/common/browsers.bzl
+++ b/common/browsers.bzl
@@ -83,14 +83,3 @@ firefox_beta_data = select({
     ],
     "//conditions:default": [],
 }) + geckodriver_data
-
-firefox_dev_data = select({
-    "@selenium//common:use_pinned_linux_firefox": [
-        "@linux_dev_firefox//:files",
-        "@linux_dev_firefox//:firefox/firefox",
-    ],
-    "@selenium//common:use_pinned_macos_firefox": [
-        "@mac_dev_firefox//:Firefox.app",
-    ],
-    "//conditions:default": [],
-}) + geckodriver_data
diff --git a/common/repositories.bzl b/common/repositories.bzl
index 85237656af2a3..da0fefa587363 100644
--- a/common/repositories.bzl
+++ b/common/repositories.bzl
@@ -57,30 +57,6 @@ exports_files(
         build_file_content = "exports_files([\"Firefox.app\"])",
     )
 
-    http_archive(
-        name = "linux_dev_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/en-US/firefox-124.0b9.tar.bz2",
-        sha256 = "80208d269dc8d251a7f9f292a7a6ea9ad217189a01075ff6d77326cb0352c1db",
-        build_file_content = """
-filegroup(
-    name = "files",
-    srcs = glob(["**/*"]),
-    visibility = ["//visibility:public"],
-)
-
-exports_files(
-    ["firefox/firefox"],
-)
-""",
-    )
-
-    dmg_archive(
-        name = "mac_dev_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/124.0b9/mac/en-US/Firefox%20124.0b9.dmg",
-        sha256 = "c716240f5fd76937cccbe93e9ffdb681782fbacb9af1face7416351a6e71a1a3",
-        build_file_content = "exports_files([\"Firefox.app\"])",
-    )
-
     http_archive(
         name = "linux_geckodriver",
         url = "https://github.com/mozilla/geckodriver/releases/download/v0.34.0/geckodriver-v0.34.0-linux64.tar.gz",
diff --git a/java/browsers.bzl b/java/browsers.bzl
index cd6d97b52c3d0..1fdc07c3412dc 100644
--- a/java/browsers.bzl
+++ b/java/browsers.bzl
@@ -99,21 +99,3 @@ firefox_beta_jvm_flags = select({
     ],
     "//conditions:default": [],
 }) + geckodriver_jvm_flags
-
-firefox_dev_jvm_flags = select({
-    "@selenium//common:use_pinned_linux_firefox": [
-        "-Dwebdriver.firefox.bin=$(location @linux_dev_firefox//:firefox/firefox)",
-    ],
-    "@selenium//common:use_pinned_macos_firefox": [
-        "-Dwebdriver.firefox.bin=$(location @mac_dev_firefox//:Firefox.app)/Contents/MacOS/firefox",
-    ],
-    "@selenium//common:use_local_geckodriver": [],
-    "//conditions:default": [
-        "-Dselenium.skiptest=false",
-    ],
-}) + select({
-    "@selenium//common:use_headless_browser": [
-        "-Dwebdriver.headless=true",
-    ],
-    "//conditions:default": [],
-}) + geckodriver_jvm_flags
diff --git a/java/private/selenium_test.bzl b/java/private/selenium_test.bzl
index 95dd8b7bcd4b1..82644567e3599 100644
--- a/java/private/selenium_test.bzl
+++ b/java/private/selenium_test.bzl
@@ -5,14 +5,12 @@ load(
     "edge_data",
     "firefox_beta_data",
     "firefox_data",
-    "firefox_dev_data",
 )
 load(
     "//java:browsers.bzl",
     "chrome_jvm_flags",
     "edge_jvm_flags",
     "firefox_beta_jvm_flags",
-    "firefox_dev_jvm_flags",
     "firefox_jvm_flags",
 )
 load(":junit5_test.bzl", "junit5_test")
@@ -44,12 +42,6 @@ BROWSERS = {
         "data": firefox_beta_data,
         "tags": COMMON_TAGS + ["firefox", "firefox-beta"],
     },
-    "firefox-dev": {
-        "deps": ["//java/src/org/openqa/selenium/firefox"],
-        "jvm_flags": ["-Dselenium.browser=ff"] + firefox_dev_jvm_flags,
-        "data": firefox_dev_data,
-        "tags": COMMON_TAGS + ["firefox", "firefox-dev"],
-    },
     "ie": {
         "deps": ["//java/src/org/openqa/selenium/ie"],
         "jvm_flags": ["-Dselenium.browser=ie"] +
diff --git a/scripts/pinned_browsers.py b/scripts/pinned_browsers.py
index 39f6c305fb560..39aad6a4c6617 100755
--- a/scripts/pinned_browsers.py
+++ b/scripts/pinned_browsers.py
@@ -298,13 +298,7 @@ def firefox():
     if latest_firefox != beta_firefox:
         sha_linux = calculate_hash(firefox_linux(beta_firefox))
         sha_mac = calculate_hash(firefox_mac(beta_firefox))
-    content = content + print_firefox(beta_firefox, "beta_", sha_linux, sha_mac)
-
-    dev_firefox = firefox_versions["FIREFOX_DEVEDITION"]
-    if beta_firefox != dev_firefox:
-        sha_linux = calculate_hash(firefox_linux(dev_firefox))
-        sha_mac = calculate_hash(firefox_mac(dev_firefox))
-    return content + print_firefox(dev_firefox, "dev_", sha_linux, sha_mac)
+    return content + print_firefox(beta_firefox, "beta_", sha_linux, sha_mac)
 
 
 def firefox_version_data():