[bazel] Fix runfiles loading in JavaScript tests

SeleniumHQ · Apr 18, 2024 · 3e8261d · 3e8261d
1 parent 0608c63
commit 3e8261d
Show file tree

Hide file tree

Showing 8 changed files with 21,784 additions and 1,551 deletions.
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/java/test/org/openqa/selenium/build/InProject.java b/java/test/org/openqa/selenium/build/InProject.java
@@ -69,7 +69,7 @@ public static Path findProjectRoot() {
     if (!Platform.getCurrent().is(WINDOWS)) {
       dir = findRunfilesRoot();
       if (dir != null) {
-        return dir.resolve("selenium").normalize();
+        return dir.resolve("_main").normalize();
       }
     }
 

diff --git a/java/test/org/openqa/selenium/javascript/JavaScriptTestSuite.java b/java/test/org/openqa/selenium/javascript/JavaScriptTestSuite.java
@@ -83,7 +83,7 @@ public Collection<DynamicTest> dynamicTests() throws IOException {
           try {
             String url = "/" + s;
             if (isBazel() && !url.startsWith("/common/generated/")) {
-              url = "/filez/selenium" + url;
+              url = "/filez/_main" + url;
             }
             return new URL(appServer.whereIs(url));
           } catch (MalformedURLException e) {

diff --git a/java/test/org/openqa/selenium/javascript/TestFileLocator.java b/java/test/org/openqa/selenium/javascript/TestFileLocator.java
@@ -72,7 +72,7 @@ private static Path getTestDirectory() {
     Path testDir;
     if (runfiles != null) {
       // Running with bazel.
-      testDir = runfiles.resolve("selenium").resolve(testDirName);
+      testDir = runfiles.resolve("_main").resolve(testDirName);
     } else {
       // Legacy.
       testDir = InProject.locate(testDirName);

diff --git a/javascript/atoms/README.md b/javascript/atoms/README.md
@@ -17,7 +17,7 @@ browser. You can do this by starting a debug server:
 bazel run javascript/atoms:test_debug_server
 ```
 
-And then navigating to: <http://localhost:2310/filez/selenium/javascript/atoms/>
+And then navigating to: <http://localhost:2310/filez/_main/javascript/atoms/>
 
 You'll be able to browse around the filesystem until you find the test
 you want to work on.

diff --git a/javascript/atoms/test/test_bootstrap.js b/javascript/atoms/test/test_bootstrap.js
@@ -62,11 +62,11 @@
     '../../deps.js'
   ];
 
-  if (location.pathname.lastIndexOf('/filez/selenium/javascript/', 0) === 0) {
+  if (location.pathname.lastIndexOf('/filez/_main/javascript/', 0) === 0) {
     directoryPath = '';
     files = [
       '/filez/com_google_javascript_closure_library/closure/goog/base.js',
-      '/filez/selenium/javascript/atoms/deps.js',
+      '/filez/_main/javascript/atoms/deps.js',
     ];
   }
 

diff --git a/javascript/chrome-driver/test/test_bootstrap.js b/javascript/chrome-driver/test/test_bootstrap.js
@@ -60,11 +60,11 @@
     '../../deps.js'
   ];
 
-  if (location.pathname.lastIndexOf('/filez/selenium/javascript/', 0) === 0) {
+  if (location.pathname.lastIndexOf('/filez/_main/javascript/', 0) === 0) {
     directoryPath = '';
     files = [
       '/filez/com_google_javascript_closure_library/closure/goog/base.js',
-      '/filez/selenium/javascript/chrome-driver/deps.js',
+      '/filez/_main/javascript/chrome-driver/deps.js',
     ];
   }
 

diff --git a/javascript/webdriver/test/test_bootstrap.js b/javascript/webdriver/test/test_bootstrap.js
@@ -61,13 +61,13 @@
   ];
 
 
-  if (location.pathname.lastIndexOf('/filez/selenium/javascript/', 0) === 0
+  if (location.pathname.lastIndexOf('/filez/_main/javascript/', 0) === 0
       || location.pathname.lastIndexOf('/common/generated/javascript/', 0) === 0) {
     directoryPath = '';
     files = [
       '/filez/com_google_javascript_closure_library/closure/goog/base.js',
-      '/filez/selenium/javascript/atoms/deps.js',
-      '/filez/selenium/javascript/webdriver/deps.js',
+      '/filez/_main/javascript/atoms/deps.js',
+      '/filez/_main/javascript/webdriver/deps.js',
     ];
   }