Merge branch 'SeleniumHQ:trunk' into manifest

Author: sandeepsuryaprasad

dotnet/src/webdriver/SeleniumManager.cs

@@ -195,28 +195,12 @@ private static ResultResponse RunCommand(string fileName, string arguments)
 
             if (jsonResponse.Logs is not null)
             {
-                foreach (var entry in jsonResponse.Logs)
+                // Treat SM's logs always as Trace to avoid SM writing at Info level
+                if (_logger.IsEnabled(LogEventLevel.Trace))
                 {
-                    switch (entry.Level)
+                    foreach (var entry in jsonResponse.Logs)
                     {
-                        case "WARN":
-                            if (_logger.IsEnabled(LogEventLevel.Warn))
-                            {
-                                _logger.Warn(entry.Message);
-                            }
-                            break;
-                        case "DEBUG":
-                            if (_logger.IsEnabled(LogEventLevel.Debug))
-                            {
-                                _logger.Debug(entry.Message);
-                            }
-                            break;
-                        case "INFO":
-                            if (_logger.IsEnabled(LogEventLevel.Info))
-                            {
-                                _logger.Info(entry.Message);
-                            }
-                            break;
+                        _logger.Trace($"{entry.Level} {entry.Message}");
                     }
                 }
             }

javascript/node/selenium-webdriver/lib/webdriver.js

@@ -2752,6 +2752,7 @@ class WebElement {
       keys = await this.driver_.fileDetector_.handleFile(this.driver_, keys.join(''))
     } catch (ex) {
       this.log_.severe('Error trying parse string as a file with file detector; sending keys instead' + ex)
+      keys = keys.join('')
     }
 
     return this.execute_(

javascript/node/selenium-webdriver/test/lib/webdriver_test.js

@@ -932,6 +932,32 @@ describe('WebDriver', function () {
 
       return driver.findElement(By.id('foo')).sendKeys('original/', 'path')
     })
+
+    it('sendKeysWithAFileDetector_handlerError', function () {
+      let executor = new FakeExecutor()
+        .expect(CName.FIND_ELEMENT, {
+          using: 'css selector',
+          value: '*[id="foo"]',
+        })
+        .andReturnSuccess(WebElement.buildId('one'))
+        .expect(CName.SEND_KEYS_TO_ELEMENT, {
+          id: WebElement.buildId('one'),
+          text: 'original/path',
+          value: 'original/path'.split(''),
+        })
+        .andReturnSuccess()
+        .end()
+
+      let driver = executor.createDriver()
+      let handleFile = function (d, path) {
+        assert.strictEqual(driver, d)
+        assert.strictEqual(path, 'original/path')
+        return Promise.reject('unhandled file error')
+      }
+      driver.setFileDetector({ handleFile })
+
+      return driver.findElement(By.id('foo')).sendKeys('original/', 'path')
+    })
   })
 
   describe('switchTo()', function () {

py/selenium/webdriver/support/wait.py

@@ -99,9 +99,9 @@ def until(self, method: Callable[[D], Union[Literal[False], T]], message: str =
             except self._ignored_exceptions as exc:
                 screen = getattr(exc, "screen", None)
                 stacktrace = getattr(exc, "stacktrace", None)
-            time.sleep(self._poll)
             if time.monotonic() > end_time:
                 break
+            time.sleep(self._poll)
         raise TimeoutException(message, screen, stacktrace)
 
     def until_not(self, method: Callable[[D], T], message: str = "") -> Union[T, Literal[True]]:
@@ -122,7 +122,7 @@ def until_not(self, method: Callable[[D], T], message: str = "") -> Union[T, Lit
                     return value
             except self._ignored_exceptions:
                 return True
-            time.sleep(self._poll)
             if time.monotonic() > end_time:
                 break
+            time.sleep(self._poll)
         raise TimeoutException(message)