Merge branch 'trunk' into renovate/apollo-graphql-packages

SeleniumHQ · Jan 16, 2025 · 29ea521 · 29ea521
2 parents c60b5a3 + 960ff05
commit 29ea521
Show file tree

Hide file tree

Showing 58 changed files with 1,393 additions and 762 deletions.
diff --git a/Rakefile b/Rakefile
@@ -891,7 +891,7 @@ namespace :java do
   task :update do
     # Make sure things are in a good state to start with
     args = ['--action_env=RULES_JVM_EXTERNAL_REPIN=1']
-    Bazel.execute('run', args, '@unpinned_maven//:pin')
+    Bazel.execute('run', args, '@maven//:pin')
 
     file_path = 'MODULE.bazel'
     content = File.read(file_path)
@@ -915,7 +915,7 @@ namespace :java do
     File.write(file_path, content)
 
     args = ['--action_env=RULES_JVM_EXTERNAL_REPIN=1']
-    Bazel.execute('run', args, '@unpinned_maven//:pin')
+    Bazel.execute('run', args, '@maven//:pin')
   end
 
   desc 'Update Java changelog'

diff --git a/common/src/web/relative_locators.html b/common/src/web/relative_locators.html
@@ -1,5 +1,4 @@
-
-<html>
+<html lang="en">
 <head>
   <title>Relative Locators</title>
   <style>
@@ -10,57 +9,101 @@
     td {
       border: solid;
     }
-    .small-rectangle {
+    #center {
+      width: 100px;
+    }
+    #rectangles {
+      position: relative;
+    }
+    #rectangles div {
+      position: absolute;
+      border: 1px solid black;
+      height: 50px;
+      width: 50px;
+    }
+    #a {
+      left: 25px;
+      top: 0;
+    }
+    #b {
+      left: 78px;
+      top: 30px;
+    }
+    #c {
+      left: 131px;
+      top: 60px;
+    }
+    #d {
+      left: 0;
+      top: 53px;
+    }
+    #e {
+      left: 53px;
+      top: 83px;
+    }
+    #f {
+      left: 106px;
+      top: 113px;
+    }
+    #proximity .small {
       border: 1px solid black;
       width: 100px;
       height: 50px;
       margin: 5px 25px;
     }
-    .big-rectangle {
+    #proximity .big {
       border: 1px solid black;
       width: 150px;
-      height: 400px;                
+      height: 400px;
+    }
+    #rect3 {
+      margin: 60px 25px;
     }
   </style>
 </head>
 <body>
 <h1>Relative Locator Tests</h1>
-<p id="above">This text is above.
-<p id="mid">This is a paragraph of text in the middle.
-<p id="below">This text is below.
-
+<section id="paragraphs">
+  <p id="above">This text is above.</p>
+  <p id="mid">This is a paragraph of text in the middle.</p>
+  <p id="below">This text is below.</p>
+</section>
 
 <table>
   <tr>
-    <td id="first">1</td>
-    <td id="second" style="width: 100px">2</td>
-    <td id="third">3</td>
+    <td id="topLeft">1</td>
+    <td id="top">2</td>
+    <td id="topRight">3</td>
   </tr>
   <tr>
-    <td id="fourth">4</td>
+    <td id="left">4</td>
     <td id="center">5</td>
-    <td id="sixth">6</td>
+    <td id="right">6</td>
   </tr>
   <tr>
-    <td id="seventh">7</td>
-    <td id="eighth">8</td>
-    <td id="ninth">9</td>
+    <td id="bottomLeft">7</td>
+    <td id="bottom">8</td>
+    <td id="bottomRight">9</td>
   </tr>
 </table>
 
-<div class="small-rectangle" id="rect1">
-  Rectangle 1
-</div>
-<div class="big-rectangle" id="rect2">
-  Rectangle 2, which is near Rectangle 1
-</div>
+<section id="rectangles">
+  <div id="a">El-A</div>
+  <div id="b">El-B</div>
+  <div id="c">El-C</div>
+  <div id="d">El-D</div>
+  <div id="e">El-E</div>
+  <div id="f">El-F</div>
+</section>
 
-<div class="small-rectangle" style="margin:60px 25px" id="rect3">
-  Rectangle 3
-</div>
-<div class="big-rectangle" id="rect4">
-  Rectangle 4, which is not near Rectangle 2 because it is more than 50 px away
-</div>
+<section id="proximity">
+  <div class="small" id="rect1">Rectangle 1</div>
+  <div class="big" id="rect2">Rectangle 2, which is near Rectangle 1</div>
+  <div class="small" id="rect3">Rectangle 3</div>
+  <div class="big" id="rect4">
+    Rectangle 4, which is not near Rectangle 2 because it is more than 50 px away
+  </div>
+</section>
 
 </body>
 </html>
diff --git a/dotnet/src/support/BUILD.bazel b/dotnet/src/support/BUILD.bazel
@@ -36,7 +36,7 @@ csharp_library(
     ]) + [":assembly-info"],
     out = "WebDriver.Support",
     langversion = "12.0",
-    nullable = "annotations",
+    nullable = "enable",
     target_frameworks = [
         "netstandard2.0",
     ],
@@ -77,7 +77,7 @@ csharp_library(
     out = "WebDriver.Support.StrongNamed",
     keyfile = "//dotnet:WebDriver.snk",
     langversion = "12.0",
-    nullable = "annotations",
+    nullable = "enable",
     target_frameworks = [
         "netstandard2.0",
     ],