Merge branch 'trunk' into mfest

VietND96 · web-flow · commit 7ad6555f81dc · 2024-11-06T00:45:02.000+05:30
diff --git a/dotnet/docs/api/index.md b/dotnet/docs/api/index.md
diff --git a/dotnet/docs/docfx.json b/dotnet/docs/docfx.json
@@ -3,29 +3,40 @@
     {
       "src": [
         {
+          "src": "../src/webdriver",
           "files": [
-            "src/webdriver/WebDriver.csproj",
-            "src/support/WebDriver.Support.csproj",
-            "bin/**/*.dll"
-          ],
-          "src": "../"
+            "**/*.csproj"
+          ]
         }
       ],
-      "dest": "api",
-      "includePrivateMembers": false,
-      "disableGitFeatures": false,
-      "disableDefaultFilter": false,
-      "noRestore": false,
-      "namespaceLayout": "flattened",
-      "memberLayout": "samePage",
-      "allowCompilationErrors": false
+      "dest": "webdriver",
+      "namespaceLayout": "nested",
+      "outputFormat": "apiPage"
+    },
+    {
+      "src": [
+        {
+          "src": "../src/support",
+          "files": [
+            "**/*.csproj"
+          ]
+        }
+      ],
+      "dest": "support",
+      "namespaceLayout": "nested",
+      "outputFormat": "apiPage"
     }
+
   ],
   "build": {
     "content": [
       {
-        "files": "**/*.{md|yml}",
-        "src": "api"
+        "files": [
+          "**/*.{md,yml}"
+        ],
+        "exclude": [
+          "_site/**"
+        ]
       }
     ],
     "resource": [
@@ -35,15 +46,16 @@
         ]
       }
     ],
-    "dest": "../../build/docs/api/dotnet",
-    "globalMetadataFiles": [],
-    "fileMetadataFiles": [],
+    "output": "../../build/docs/api/dotnet",
     "template": [
       "default",
       "modern"
     ],
-    "postProcessors": [],
-    "keepFileLink": false,
-    "disableGitFeatures": false
+    "globalMetadata": {
+      "_appName": "Selenium .NET API",
+      "_appLogoPath": "images/logo.svg",
+      "_appFaviconPath": "images/favicon.ico",
+      "_enableSearch": true
+    }
   }
 }
diff --git a/dotnet/docs/images/favicon.ico b/dotnet/docs/images/favicon.ico
diff --git a/dotnet/docs/images/logo.svg b/dotnet/docs/images/logo.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="40pt" height="30pt" ><defs><style>.cls-1{fill:#43b02a;}</style></defs><title>Selenium logo mark green</title><path class="cls-1" d="M25.24,25.31a2.93,2.93,0,0,0-3,2.6.1.1,0,0,0,.1.11h5.82a.1.1,0,0,0,.1-.11A2.83,2.83,0,0,0,25.24,25.31Z"/><path class="cls-1" d="M37.72,5.78,25.36,19.65a.38.38,0,0,1-.55,0l-6.31-6.5a.38.38,0,0,1,0-.47L20.55,10a.38.38,0,0,1,.61,0l3.51,3.91a.38.38,0,0,0,.57,0L35.14.42A.27.27,0,0,0,34.93,0H.29A.29.29,0,0,0,0,.29V39.71A.29.29,0,0,0,.29,40H37.9a.29.29,0,0,0,.29-.29V6A.27.27,0,0,0,37.72,5.78ZM10.65,35.61a9.51,9.51,0,0,1-6.75-2.4.37.37,0,0,1,0-.48l1.47-2.06a.37.37,0,0,1,.55-.06,7.23,7.23,0,0,0,4.94,1.93c1.93,0,2.87-.89,2.87-1.83,0-2.92-9.5-.92-9.5-7.13,0-2.75,2.38-5,6.26-5a9.28,9.28,0,0,1,6.18,2.07.37.37,0,0,1,0,.5l-1.51,2a.37.37,0,0,1-.53.06,7.15,7.15,0,0,0-4.51-1.56c-1.51,0-2.35.67-2.35,1.66,0,2.62,9.48.87,9.48,7C17.26,33.33,15.11,35.61,10.65,35.61Zm20.73-5.72a.32.32,0,0,1-.32.32H22.39a.1.1,0,0,0-.1.11,3.31,3.31,0,0,0,3.51,2.73,5.44,5.44,0,0,0,3-1,.32.32,0,0,1,.46.07l1.06,1.55a.33.33,0,0,1-.07.44,7.85,7.85,0,0,1-4.82,1.5,6.21,6.21,0,0,1-6.55-6.45,6.24,6.24,0,0,1,6.35-6.42c3.66,0,6.14,2.74,6.14,6.75Z"/></svg>
diff --git a/dotnet/docs/index.md b/dotnet/docs/index.md
@@ -0,0 +1,9 @@
+---
+layout: landingPage
+---
+
+# Welcome to the Selenium .NET API Docs
+
+## Modules
+- [Selenium.WebDriver](/webdriver/OpenQA.Selenium.html)
+- [Selenium.Support](/support/OpenQA.Selenium.Support.html)
diff --git a/dotnet/docs/support/.gitignore b/dotnet/docs/support/.gitignore
diff --git a/dotnet/docs/toc.yml b/dotnet/docs/toc.yml
@@ -0,0 +1,9 @@
+- name: Intro
+  href: index.md
+
+- name: Modules
+  items:
+  - name: WebDriver
+    href: webdriver/OpenQA.Selenium.yml
+  - name: Support
+    href: support/OpenQA.Selenium.Support.yml
diff --git a/dotnet/docs/webdriver/.gitignore b/dotnet/docs/webdriver/.gitignore
@@ -0,0 +1,5 @@
+###############
+#  temp file  #
+###############
+*.yml
+.manifest
diff --git a/java/src/org/openqa/selenium/grid/config/TomlConfig.java b/java/src/org/openqa/selenium/grid/config/TomlConfig.java
@@ -31,20 +31,15 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-import java.util.logging.Logger;
 import org.openqa.selenium.internal.Require;
 
 public class TomlConfig implements Config {
 
   private final Toml toml;
-  private static final Logger LOG = Logger.getLogger(TomlConfig.class.getName());
 
   public TomlConfig(Reader reader) {
     try {
       toml = JToml.parse(reader);
-      LOG.warning(
-          "Please use quotes to denote strings. Upcoming TOML parser will require this and unquoted"
-              + " strings will throw an error in the future");
     } catch (IOException e) {
       throw new ConfigException("Unable to read TOML.", e);
     } catch (ParseException e) {
diff --git a/javascript/node/selenium-webdriver/bidi/browsingContext.js b/javascript/node/selenium-webdriver/bidi/browsingContext.js
@@ -528,10 +528,15 @@ class BrowsingContext {
       throw Error(`Pass in an array of ReferenceValue objects. Received: ${startNodes}`)
     }
 
+    let startNodesSerialized = undefined
+
     if (startNodes !== undefined && Array.isArray(startNodes)) {
+      startNodesSerialized = []
       startNodes.forEach((node) => {
         if (!(node instanceof ReferenceValue)) {
           throw Error(`Pass in a ReferenceValue object. Received: ${node}`)
+        } else {
+          startNodesSerialized.push(node.asMap())
         }
       })
     }
@@ -544,7 +549,7 @@ class BrowsingContext {
         maxNodeCount: maxNodeCount,
         sandbox: sandbox,
         serializationOptions: serializationOptions,
-        startNodes: startNodes,
+        startNodes: startNodesSerialized,
       },
     }
 
diff --git a/javascript/node/selenium-webdriver/test/bidi/locate_nodes_test.js b/javascript/node/selenium-webdriver/test/bidi/locate_nodes_test.js
@@ -19,7 +19,7 @@
 
 const assert = require('node:assert')
 const { Browser } = require('selenium-webdriver')
-const { Pages, suite } = require('../../lib/test')
+const { Pages, suite, ignore } = require('../../lib/test')
 const BrowsingContext = require('selenium-webdriver/bidi/browsingContext')
 const { Locator } = require('selenium-webdriver/bidi/browsingContext')
 const { ScriptManager } = require('selenium-webdriver/index')
@@ -80,7 +80,7 @@ suite(
         assert.notEqual(element.sharedId, undefined)
       })
 
-      xit('can locate node with xpath locator', async function () {
+      it('can locate node with xpath locator', async function () {
         const id = await driver.getWindowHandle()
         const browsingContext = await BrowsingContext(driver, {
           browsingContextId: id,
@@ -97,7 +97,7 @@ suite(
         assert.notEqual(element.sharedId, undefined)
       })
 
-      xit('can locate node with inner test locator', async function () {
+      ignore(env.browsers(Browser.FIREFOX)).it('can locate node with inner test locator', async function () {
         const id = await driver.getWindowHandle()
         const browsingContext = await BrowsingContext(driver, {
           browsingContextId: id,
@@ -109,12 +109,9 @@ suite(
         const element = elements[0]
         assert.strictEqual(element.type, 'node')
         assert.notEqual(element.value, undefined)
-        assert.strictEqual(element.value.localName, 'div')
-        assert.strictEqual(element.value.attributes.class, 'content')
-        assert.notEqual(element.sharedId, undefined)
       })
 
-      xit('can locate node with max node count', async function () {
+      it('can locate node with max node count', async function () {
         const id = await driver.getWindowHandle()
         const browsingContext = await BrowsingContext(driver, {
           browsingContextId: id,
@@ -126,7 +123,7 @@ suite(
         assert.strictEqual(elements.length, 4)
       })
 
-      xit('can locate node with given start nodes', async function () {
+      it('can locate node with given start nodes', async function () {
         const id = await driver.getWindowHandle()
         const browsingContext = await BrowsingContext(driver, {
           browsingContextId: id,
@@ -155,14 +152,7 @@ suite(
           startNodes.push(new ReferenceValue(node.handle, node.sharedId))
         })
 
-        const elements = await browsingContext.locateNodes(
-          Locator.css('input'),
-          50,
-          'none',
-          undefined,
-          undefined,
-          startNodes,
-        )
+        const elements = await browsingContext.locateNodes(Locator.css('input'), 50, 'none', undefined, startNodes)
 
         assert.strictEqual(elements.length, 35)
       })
@@ -236,5 +226,5 @@ suite(
       })
     })
   },
-  { browsers: [Browser.FIREFOX] },
+  { browsers: [Browser.FIREFOX, Browser.CHROME, Browser.EDGE] },
 )

Original file line number	Diff line number	Diff line change
`@@ -528,10 +528,15 @@ class BrowsingContext {`
`528`	`528`	throw Error(`Pass in an array of ReferenceValue objects. Received: ${startNodes}`)
`529`	`529`	`}`
`530`	`530`
	`531`	`+ let startNodesSerialized = undefined`
	`532`	`+`
`531`	`533`	`if (startNodes !== undefined && Array.isArray(startNodes)) {`
	`534`	`+ startNodesSerialized = []`
`532`	`535`	`startNodes.forEach((node) => {`
`533`	`536`	`if (!(node instanceof ReferenceValue)) {`
`534`	`537`	throw Error(`Pass in a ReferenceValue object. Received: ${node}`)
	`538`	`+ } else {`
	`539`	`+ startNodesSerialized.push(node.asMap())`
`535`	`540`	`}`
`536`	`541`	`})`
`537`	`542`	`}`
`@@ -544,7 +549,7 @@ class BrowsingContext {`
`544`	`549`	`maxNodeCount: maxNodeCount,`
`545`	`550`	`sandbox: sandbox,`
`546`	`551`	`serializationOptions: serializationOptions,`
`547`		`- startNodes: startNodes,`
	`552`	`+ startNodes: startNodesSerialized,`
`548`	`553`	`},`
`549`	`554`	`}`
`550`	`555`