Fix uploadFile command (#6178)

webdriverio · Nov 30, 2020 · 0d6944d · 0d6944d
1 parent e7195f9
commit 0d6944d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/packages/wdio-logger/tests/node.test.ts b/packages/wdio-logger/tests/node.test.ts
@@ -262,7 +262,7 @@ describe('wdio-logger node', () => {
 
                     writableBuffer = scenario.writableBuffer
 
-                    expect(await nodeLogger.waitForBuffer()).toBe(true)
+                    expect(await nodeLogger.waitForBuffer()).toBe(undefined)
                 })
             })
 
@@ -298,7 +298,7 @@ describe('wdio-logger node', () => {
     })
     describe('waitForBuffer with no logFile', () => {
         it('should be ok if logFile is undefined', async () => {
-            expect(await nodeLogger.waitForBuffer()).toBe(true)
+            expect(await nodeLogger.waitForBuffer()).toBe(undefined)
         })
     })
 })
diff --git a/packages/webdriverio/src/commands/browser/uploadFile.ts b/packages/webdriverio/src/commands/browser/uploadFile.ts
@@ -9,10 +9,13 @@
     const path = require('path');
 
     it('should upload a file', function () {
-        const filePath = path.join(__dirname, '/local/path/to/your/file');
+        browser.url('https://the-internet.herokuapp.com/upload')
 
-        const remoteFilePath = browser.uploadFile(filePath);
-        $('.upload-data-file-input').setValue(remoteFilePath);
+        const filePath = '/path/to/some/file.png'
+        const remoteFilePath = browser.uploadFile(filePath)
+
+        $('#file-upload').setValue(remoteFilePath)
+        $('#file-submit').click()
     });
  * </example>
  *
@@ -29,7 +32,7 @@ import archiver from 'archiver'
 export default async function uploadFile (
     this: WebdriverIO.BrowserObject,
     localPath: string
-): Promise<void> {
+): Promise<string> {
     /**
      * parameter check
      */
@@ -53,7 +56,7 @@ export default async function uploadFile (
             .on('data', (data: Uint8Array) => zipData.push(data))
             .on('end', () => this.file(
                 Buffer.concat(zipData).toString('base64')
-            ).then(() => resolve(), reject))
+            ).then((localPath) => resolve(localPath), reject))
             .append(source, { name: path.basename(localPath) })
             .finalize()
     })

diff --git a/packages/webdriverio/tests/commands/browser/uploadFile.test.js b/packages/webdriverio/tests/commands/browser/uploadFile.test.js
@@ -71,7 +71,7 @@ describe('uploadFile', () => {
                 browserName: 'chrome'
             }
         })
-        browser.file = jest.fn().mockReturnValue(Promise.resolve())
+        browser.file = jest.fn().mockReturnValue(Promise.resolve('/some/local/path'))
 
         const archiverMock = archiver()
         const command = browser.uploadFile(path.resolve(__dirname, '..', '__fixtures__', 'toUpload.jpg'))
@@ -82,8 +82,9 @@ describe('uploadFile', () => {
         archiverMock.on.mock.calls[1][1](Buffer.alloc(33))
         archiverMock.on.mock.calls[2][1]()
 
-        await command
+        const localPath = await command
         expect(browser.file).toBeCalledWith('AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==')
+        expect(localPath).toBe('/some/local/path')
     })
 
     afterEach(() => {