Skip to content

Commit 705a619

Browse files
committed
Use rootpath for the ruby tests too
1 parent b5bb51b commit 705a619

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

rb/.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.6
1+
jruby-9.4.9.0

rb/spec/tests.bzl

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ BROWSERS = {
1919
"WD_SPEC_DRIVER": "chrome",
2020
} | select({
2121
"@selenium//common:use_pinned_linux_chrome": {
22-
"CHROME_BINARY": "$(location @linux_chrome//:chrome-linux64/chrome)",
23-
"CHROMEDRIVER_BINARY": "$(location @linux_chromedriver//:chromedriver)",
22+
"CHROME_BINARY": "$(rootpath @linux_chrome//:chrome-linux64/chrome)",
23+
"CHROMEDRIVER_BINARY": "$(rootpath @linux_chromedriver//:chromedriver)",
2424
},
2525
"@selenium//common:use_pinned_macos_chrome": {
26-
"CHROME_BINARY": "$(location @mac_chrome//:Chrome.app)/Contents/MacOS/Chrome",
27-
"CHROMEDRIVER_BINARY": "$(location @mac_chromedriver//:chromedriver)",
26+
"CHROME_BINARY": "$(rootpath @mac_chrome//:Chrome.app)/Contents/MacOS/Chrome",
27+
"CHROMEDRIVER_BINARY": "$(rootpath @mac_chromedriver//:chromedriver)",
2828
},
2929
"//conditions:default": {},
3030
}) | select({
@@ -42,12 +42,12 @@ BROWSERS = {
4242
"WD_SPEC_DRIVER": "edge",
4343
} | select({
4444
"@selenium//common:use_pinned_linux_edge": {
45-
"EDGE_BINARY": "$(location @linux_edge//:opt/microsoft/msedge/microsoft-edge)",
46-
"MSEDGEDRIVER_BINARY": "$(location @linux_edgedriver//:msedgedriver)",
45+
"EDGE_BINARY": "$(rootpath @linux_edge//:opt/microsoft/msedge/microsoft-edge)",
46+
"MSEDGEDRIVER_BINARY": "$(rootpath @linux_edgedriver//:msedgedriver)",
4747
},
4848
"@selenium//common:use_pinned_macos_edge": {
49-
"EDGE_BINARY": "$(location @mac_edge//:Edge.app)/Contents/MacOS/Microsoft\\ Edge",
50-
"MSEDGEDRIVER_BINARY": "$(location @mac_edgedriver//:msedgedriver)",
49+
"EDGE_BINARY": "$(rootpath @mac_edge//:Edge.app)/Contents/MacOS/Microsoft\\ Edge",
50+
"MSEDGEDRIVER_BINARY": "$(rootpath @mac_edgedriver//:msedgedriver)",
5151
},
5252
"//conditions:default": {},
5353
}) | select({
@@ -65,12 +65,12 @@ BROWSERS = {
6565
"WD_SPEC_DRIVER": "firefox",
6666
} | select({
6767
"@selenium//common:use_pinned_linux_firefox": {
68-
"FIREFOX_BINARY": "$(location @linux_firefox//:firefox/firefox)",
69-
"GECKODRIVER_BINARY": "$(location @linux_geckodriver//:geckodriver)",
68+
"FIREFOX_BINARY": "$(rootpath @linux_firefox//:firefox/firefox)",
69+
"GECKODRIVER_BINARY": "$(rootpath @linux_geckodriver//:geckodriver)",
7070
},
7171
"@selenium//common:use_pinned_macos_firefox": {
72-
"FIREFOX_BINARY": "$(location @mac_firefox//:Firefox.app)/Contents/MacOS/firefox",
73-
"GECKODRIVER_BINARY": "$(location @mac_geckodriver//:geckodriver)",
72+
"FIREFOX_BINARY": "$(rootpath @mac_firefox//:Firefox.app)/Contents/MacOS/firefox",
73+
"GECKODRIVER_BINARY": "$(rootpath @mac_geckodriver//:geckodriver)",
7474
},
7575
"//conditions:default": {},
7676
}) | select({
@@ -88,12 +88,12 @@ BROWSERS = {
8888
"WD_SPEC_DRIVER": "firefox",
8989
} | select({
9090
"@selenium//common:use_pinned_linux_firefox": {
91-
"FIREFOX_BINARY": "$(location @linux_beta_firefox//:firefox/firefox)",
92-
"GECKODRIVER_BINARY": "$(location @linux_geckodriver//:geckodriver)",
91+
"FIREFOX_BINARY": "$(rootpath @linux_beta_firefox//:firefox/firefox)",
92+
"GECKODRIVER_BINARY": "$(rootpath @linux_geckodriver//:geckodriver)",
9393
},
9494
"@selenium//common:use_pinned_macos_firefox": {
95-
"FIREFOX_BINARY": "$(location @mac_beta_firefox//:Firefox.app)/Contents/MacOS/firefox",
96-
"GECKODRIVER_BINARY": "$(location @mac_geckodriver//:geckodriver)",
95+
"FIREFOX_BINARY": "$(rootpath @mac_beta_firefox//:Firefox.app)/Contents/MacOS/firefox",
96+
"GECKODRIVER_BINARY": "$(rootpath @mac_geckodriver//:geckodriver)",
9797
},
9898
"//conditions:default": {},
9999
}) | select({

0 commit comments

Comments
 (0)