From 68f82b3302b6d1e7975dc0bdaea99f5f43f1db63 Mon Sep 17 00:00:00 2001
From: Priyansh Garg <priyanshgarg30@gmail.com>
Date: Tue, 29 Oct 2024 00:11:41 +0530
Subject: [PATCH] [js]: Fix sendKeys command fail on FileDetector.handleFile
 error. (#14663)

Fix sendKeys command failing on FileDetector handleFile error.

Co-authored-by: David Burns <david.burns@theautomatedtester.co.uk>
Co-authored-by: Sri Harsha <12621691+harsha509@users.noreply.github.com>
---
 .../node/selenium-webdriver/lib/webdriver.js  |  1 +
 .../test/lib/webdriver_test.js                | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/javascript/node/selenium-webdriver/lib/webdriver.js b/javascript/node/selenium-webdriver/lib/webdriver.js
index cb60563695a06..e004e4505c1e4 100644
--- a/javascript/node/selenium-webdriver/lib/webdriver.js
+++ b/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_(
diff --git a/javascript/node/selenium-webdriver/test/lib/webdriver_test.js b/javascript/node/selenium-webdriver/test/lib/webdriver_test.js
index f850c3e4fcac8..419fdf6f80212 100644
--- a/javascript/node/selenium-webdriver/test/lib/webdriver_test.js
+++ b/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 () {