Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions common/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ def pin_browsers():

http_archive(
name = "linux_firefox",
url = "https://ftp.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/en-US/firefox-151.0.4.tar.xz",
sha256 = "5fa872cb4845a52829fa58568c2901edcbda4b79ce466b4b9b09afe41cffcd9b",
url = "https://ftp.mozilla.org/pub/firefox/releases/152.0.1/linux-x86_64/en-US/firefox-152.0.1.tar.xz",
sha256 = "04efc89d4127bc4c9c56e471532be46606cb3776f2fd6252d459a83bc11c9b2d",
build_file_content = """
load("@aspect_rules_js//js:defs.bzl", "js_library")
package(default_visibility = ["//visibility:public"])
Expand All @@ -33,8 +33,8 @@ js_library(

dmg_archive(
name = "mac_firefox",
url = "https://ftp.mozilla.org/pub/firefox/releases/151.0.4/mac/en-US/Firefox%20151.0.4.dmg",
sha256 = "bc2e72f6abf31aa854b30a3e2841d3f2b8b8e153eaa0a5c3ab285728b7f9b160",
url = "https://ftp.mozilla.org/pub/firefox/releases/152.0.1/mac/en-US/Firefox%20152.0.1.dmg",
sha256 = "3398cb6c17077f536bd534af3a98b66ef850689532f82ddc3df05533b8018ede",
build_file_content = """
load("@aspect_rules_js//js:defs.bzl", "js_library")
package(default_visibility = ["//visibility:public"])
Expand All @@ -50,8 +50,8 @@ js_library(

http_archive(
name = "linux_beta_firefox",
url = "https://ftp.mozilla.org/pub/firefox/releases/152.0b10/linux-x86_64/en-US/firefox-152.0b10.tar.xz",
sha256 = "7230c8ff442b694c806bedc4bb6ca3d4cd1111a2f0aa9bbe071e69473b4e3cb0",
url = "https://ftp.mozilla.org/pub/firefox/releases/153.0b1/linux-x86_64/en-US/firefox-153.0b1.tar.xz",
sha256 = "d8d1a671b28103d3562e6e097757eb1fecbd06d4b779070bac7d741a016a7241",
build_file_content = """
load("@aspect_rules_js//js:defs.bzl", "js_library")
package(default_visibility = ["//visibility:public"])
Expand All @@ -72,8 +72,8 @@ js_library(

dmg_archive(
name = "mac_beta_firefox",
url = "https://ftp.mozilla.org/pub/firefox/releases/152.0b10/mac/en-US/Firefox%20152.0b10.dmg",
sha256 = "d8305fbf6419af3ddcd073b14ed827fc1fd75d7f61ed0cbd4d99ad538d3a3ed3",
url = "https://ftp.mozilla.org/pub/firefox/releases/153.0b1/mac/en-US/Firefox%20153.0b1.dmg",
sha256 = "fb14887e4d707d2dab11f2ac025072bed558bd4e4ee7a3f89b229a78d1dce32a",
build_file_content = """
load("@aspect_rules_js//js:defs.bzl", "js_library")
package(default_visibility = ["//visibility:public"])
Expand Down Expand Up @@ -123,10 +123,10 @@ js_library(

pkg_archive(
name = "mac_edge",
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/0be72a65-0973-4687-a2ed-f6e188f98928/MicrosoftEdge-149.0.4022.69.pkg",
sha256 = "f48920fa84a849cae1219eee944a6b33d1a7da08050c29833834e11444c55d85",
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/55631108-6777-48aa-8117-6b852614c3ae/MicrosoftEdge-149.0.4022.80.pkg",
sha256 = "dc58bd28d1112984c7195aea7d52add3652c7e257545d2fb82f623bddff31ba0",
move = {
"MicrosoftEdge-149.0.4022.69.pkg/Payload/Microsoft Edge.app": "Edge.app",
"MicrosoftEdge-149.0.4022.80.pkg/Payload/Microsoft Edge.app": "Edge.app",
},
build_file_content = """
load("@aspect_rules_js//js:defs.bzl", "js_library")
Expand All @@ -143,8 +143,8 @@ js_library(

deb_archive(
name = "linux_edge",
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_149.0.4022.69-1_amd64.deb",
sha256 = "d14afed0a28943b553afb20c6b1e41220c127fa8cd86bd008b3f92a3b1e3fce1",
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_149.0.4022.80-1_amd64.deb",
sha256 = "e6b1d2317f47771bd0390d370e72c917b3531d8e586edeec494e4cadc1b34676",
build_file_content = """
load("@aspect_rules_js//js:defs.bzl", "js_library")
package(default_visibility = ["//visibility:public"])
Expand Down Expand Up @@ -182,8 +182,8 @@ js_library(

http_archive(
name = "mac_edgedriver",
url = "https://msedgedriver.microsoft.com/149.0.4022.69/edgedriver_mac64_m1.zip",
sha256 = "c81ff3281dd05216c9da21b01b718d0aad541215593c03689bf85f99262502c5",
url = "https://msedgedriver.microsoft.com/149.0.4022.80/edgedriver_mac64_m1.zip",
sha256 = "6bbce5e1792611e383ba92e8b68f990ee00da4044ad445d31d62e84697c60739",
build_file_content = """
load("@aspect_rules_js//js:defs.bzl", "js_library")
package(default_visibility = ["//visibility:public"])
Expand All @@ -199,8 +199,8 @@ js_library(

http_archive(
name = "linux_chrome",
url = "https://storage.googleapis.com/chrome-for-testing-public/149.0.7827.115/linux64/chrome-linux64.zip",
sha256 = "4adece5eeaaf9ca95bd2c87792163e34652097c29a253e8bf9e4c58fcab28884",
url = "https://storage.googleapis.com/chrome-for-testing-public/149.0.7827.155/linux64/chrome-linux64.zip",
sha256 = "a2f5d96421757d864145bcf3e699c0a70df891ff35ac3f3f67e7d0e1d5eca01a",
build_file_content = """
load("@aspect_rules_js//js:defs.bzl", "js_library")
package(default_visibility = ["//visibility:public"])
Expand All @@ -220,8 +220,8 @@ js_library(
)
http_archive(
name = "mac_chrome",
url = "https://storage.googleapis.com/chrome-for-testing-public/149.0.7827.115/mac-arm64/chrome-mac-arm64.zip",
sha256 = "562af577e8a8ae69f91bba8440a6806f4e54c2e8d4caa384b610b55007386d79",
url = "https://storage.googleapis.com/chrome-for-testing-public/149.0.7827.155/mac-arm64/chrome-mac-arm64.zip",
sha256 = "135b697c49a375025ba6540a9d963d803d0b80b01f497c77ef5fd8296e4f36c7",
strip_prefix = "chrome-mac-arm64",
patch_cmds = [
"mv 'Google Chrome for Testing.app' Chrome.app",
Expand All @@ -241,8 +241,8 @@ js_library(
)
http_archive(
name = "linux_chromedriver",
url = "https://storage.googleapis.com/chrome-for-testing-public/149.0.7827.115/linux64/chromedriver-linux64.zip",
sha256 = "fa88a66c496d5396e472464222265901c1e4b5bfe1e50905256277c35c14c7ad",
url = "https://storage.googleapis.com/chrome-for-testing-public/149.0.7827.155/linux64/chromedriver-linux64.zip",
sha256 = "55d58aa22dcc4eea90897fc58dd12fcb50788f0cefa1295d79117c48b2bf0707",
strip_prefix = "chromedriver-linux64",
build_file_content = """
load("@aspect_rules_js//js:defs.bzl", "js_library")
Expand All @@ -259,8 +259,8 @@ js_library(

http_archive(
name = "mac_chromedriver",
url = "https://storage.googleapis.com/chrome-for-testing-public/149.0.7827.115/mac-arm64/chromedriver-mac-arm64.zip",
sha256 = "33b3acac9e97dc1e61eb5563d4fc316fd9b359e4dd964e689fe847b72f23582a",
url = "https://storage.googleapis.com/chrome-for-testing-public/149.0.7827.155/mac-arm64/chromedriver-mac-arm64.zip",
sha256 = "f38fb75589ed57d94ecf8cf1e58a378d2e9cebc62045a3e30f2a4319a9ea8a5b",
strip_prefix = "chromedriver-mac-arm64",
build_file_content = """
load("@aspect_rules_js//js:defs.bzl", "js_library")
Expand All @@ -277,8 +277,8 @@ js_library(

http_archive(
name = "linux_beta_chrome",
url = "https://storage.googleapis.com/chrome-for-testing-public/150.0.7871.13/linux64/chrome-linux64.zip",
sha256 = "d9d5e6746530d888e74d5cacc43b508de388c25ebd91925c13fa2ebea306cd95",
url = "https://storage.googleapis.com/chrome-for-testing-public/150.0.7871.24/linux64/chrome-linux64.zip",
sha256 = "e0dd5721ae87fc74322b370e74f815c146357ebe42af176f8eee3f788b2ec01d",
build_file_content = """
load("@aspect_rules_js//js:defs.bzl", "js_library")
package(default_visibility = ["//visibility:public"])
Expand All @@ -298,8 +298,8 @@ js_library(
)
http_archive(
name = "mac_beta_chrome",
url = "https://storage.googleapis.com/chrome-for-testing-public/150.0.7871.13/mac-arm64/chrome-mac-arm64.zip",
sha256 = "34c0955d81e08520cb8d8baf896863ea64c09233c5b083ff7b96fcaaac8e049d",
url = "https://storage.googleapis.com/chrome-for-testing-public/150.0.7871.24/mac-arm64/chrome-mac-arm64.zip",
sha256 = "1d0c9b2867cc30bead7bd4468eca550bf826052679c5f7bff91ad527aa757fcb",
strip_prefix = "chrome-mac-arm64",
patch_cmds = [
"mv 'Google Chrome for Testing.app' Chrome.app",
Expand All @@ -319,8 +319,8 @@ js_library(
)
http_archive(
name = "linux_beta_chromedriver",
url = "https://storage.googleapis.com/chrome-for-testing-public/150.0.7871.13/linux64/chromedriver-linux64.zip",
sha256 = "13efe788d32e1ed935d8ca8e389b33d3fec4fc25bb97e42d80082a337ed87a19",
url = "https://storage.googleapis.com/chrome-for-testing-public/150.0.7871.24/linux64/chromedriver-linux64.zip",
sha256 = "47d1ccd914fe37806f42cddf34e423575c68ac6d072d9a5d1cf19bdc1035f243",
strip_prefix = "chromedriver-linux64",
build_file_content = """
load("@aspect_rules_js//js:defs.bzl", "js_library")
Expand All @@ -337,8 +337,8 @@ js_library(

http_archive(
name = "mac_beta_chromedriver",
url = "https://storage.googleapis.com/chrome-for-testing-public/150.0.7871.13/mac-arm64/chromedriver-mac-arm64.zip",
sha256 = "9c16a2036dfc06013d6a58df4698677d9b9c94f58bb4027d8ab57be183203bbf",
url = "https://storage.googleapis.com/chrome-for-testing-public/150.0.7871.24/mac-arm64/chromedriver-mac-arm64.zip",
sha256 = "03752856ac1110feb59bebee6fb85158361772c544f43449e58fa24e72f45e8f",
strip_prefix = "chromedriver-mac-arm64",
build_file_content = """
load("@aspect_rules_js//js:defs.bzl", "js_library")
Expand Down
12 changes: 2 additions & 10 deletions rb/spec/integration/selenium/webdriver/firefox/driver_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,7 @@ module Firefox
expect(driver.find_elements(id: 'webextensions-selenium-example')).to be_empty
end

it 'install and uninstall unsigned zip file',
except: {browser: :firefox,
version: 'stable',
reason: 'wontfix in Firefox 151, fixed in 152: ' \
'https://bugzilla.mozilla.org/show_bug.cgi?id=2045054'} do
it 'install and uninstall unsigned zip file' do
ext = File.expand_path("#{extensions}/webextensions-selenium-example-unsigned.zip", __dir__)
id = driver.install_addon(ext, true)

Expand Down Expand Up @@ -128,11 +124,7 @@ module Firefox
expect(driver.find_elements(id: 'webextensions-selenium-example')).to be_empty
end

it 'install and uninstall unsigned directory',
except: {browser: :firefox,
version: 'stable',
reason: 'wontfix in Firefox 151, fixed in 152: ' \
'https://bugzilla.mozilla.org/show_bug.cgi?id=2045054'} do
it 'install and uninstall unsigned directory' do
ext = File.expand_path("#{extensions}/webextensions-selenium-example/", __dir__)
id = driver.install_addon(ext, true)

Expand Down
7 changes: 1 addition & 6 deletions rust/src/firefox.rs
Original file line number Diff line number Diff line change
Expand Up @@ -563,12 +563,7 @@ impl SeleniumManager for FirefoxManager {
}
} else if MACOS.is(os) {
artifact_name = "Firefox%20";
// Before Firefox 68, only DMG was released
if major_browser_version < 68 {
artifact_extension = "dmg";
} else {
artifact_extension = "pkg";
}
artifact_extension = "dmg";
if self.is_nightly(browser_version) {
platform_label = "osx";
} else {
Expand Down