Skip to content

refactor: extract shared dropFile script for attachFile dropzone support #5486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DavertMik wants to merge 1 commit into
base: 4.x
Choose a base branch
from
+32 −42
Open

refactor: extract shared dropFile script for attachFile dropzone support #5486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 7 additions & 14 deletions lib/helper/Playwright.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import RemoteBrowserConnectionRefused from './errors/RemoteBrowserConnectionRefu
import Popup from './extras/Popup.js'
import Console from './extras/Console.js'
import { findReact, findVue, findByPlaywrightLocator } from './extras/PlaywrightReactVueLocator.js'
import { dropFile } from './scripts/dropFile.js'
import WebElement from '../element/WebElement.js'

let playwright
Expand Down Expand Up @@ -2347,20 +2348,12 @@ class Playwright extends Helper {

const targetEls = els.length ? els : await this._locate(locator)
assertElementExists(targetEls, locator, 'Element')
const base64Content = base64EncodeFile(file)
const fileName = path.basename(file)
const mimeType = getMimeType(fileName)
await targetEls[0].evaluate((el, { base64Content, fileName, mimeType }) => {
const binaryStr = atob(base64Content)
const bytes = new Uint8Array(binaryStr.length)
for (let i = 0; i < binaryStr.length; i++) bytes[i] = binaryStr.charCodeAt(i)
const fileObj = new File([bytes], fileName, { type: mimeType })
const dataTransfer = new DataTransfer()
dataTransfer.items.add(fileObj)
el.dispatchEvent(new DragEvent('dragenter', { dataTransfer, bubbles: true }))
el.dispatchEvent(new DragEvent('dragover', { dataTransfer, bubbles: true }))
el.dispatchEvent(new DragEvent('drop', { dataTransfer, bubbles: true }))
}, { base64Content, fileName, mimeType })
const fileData = {
base64Content: base64EncodeFile(file),
fileName: path.basename(file),
mimeType: getMimeType(path.basename(file)),
}
await targetEls[0].evaluate(dropFile, fileData)
return this._waitForAction()
}

Expand Down
21 changes: 7 additions & 14 deletions lib/helper/Puppeteer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import Popup from './extras/Popup.js'
import Console from './extras/Console.js'
import { highlightElement } from './scripts/highlightElement.js'
import { blurElement } from './scripts/blurElement.js'
import { dropFile } from './scripts/dropFile.js'
import { dontSeeElementError, seeElementError, dontSeeElementInDOMError, seeElementInDOMError } from './errors/ElementAssertion.js'
import { dontSeeTraffic, seeTraffic, grabRecordedNetworkTraffics, stopRecordingTraffic, flushNetworkTraffics } from './network/actions.js'
import WebElement from '../element/WebElement.js'
Expand Down Expand Up @@ -1639,20 +1640,12 @@ class Puppeteer extends Helper {

const targetEls = els.length ? els : await this._locate(locator)
assertElementExists(targetEls, locator, 'Element')
const base64Content = base64EncodeFile(file)
const fileName = path.basename(file)
const mimeType = getMimeType(fileName)
await targetEls[0].evaluate((el, { base64Content, fileName, mimeType }) => {
const binaryStr = atob(base64Content)
const bytes = new Uint8Array(binaryStr.length)
for (let i = 0; i < binaryStr.length; i++) bytes[i] = binaryStr.charCodeAt(i)
const fileObj = new File([bytes], fileName, { type: mimeType })
const dataTransfer = new DataTransfer()
dataTransfer.items.add(fileObj)
el.dispatchEvent(new DragEvent('dragenter', { dataTransfer, bubbles: true }))
el.dispatchEvent(new DragEvent('dragover', { dataTransfer, bubbles: true }))
el.dispatchEvent(new DragEvent('drop', { dataTransfer, bubbles: true }))
}, { base64Content, fileName, mimeType })
const fileData = {
base64Content: base64EncodeFile(file),
fileName: path.basename(file),
mimeType: getMimeType(path.basename(file)),
}
await targetEls[0].evaluate(dropFile, fileData)
return this._waitForAction()
}

Expand Down
21 changes: 7 additions & 14 deletions lib/helper/WebDriver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import { highlightElement } from './scripts/highlightElement.js'
import { focusElement } from './scripts/focusElement.js'
import { blurElement } from './scripts/blurElement.js'
import { dontSeeElementError, seeElementError, seeElementInDOMError, dontSeeElementInDOMError } from './errors/ElementAssertion.js'
import { dropFile } from './scripts/dropFile.js'
import { dontSeeTraffic, seeTraffic, grabRecordedNetworkTraffics, stopRecordingTraffic, flushNetworkTraffics } from './network/actions.js'
import WebElement from '../element/WebElement.js'

Expand Down Expand Up @@ -1376,20 +1377,12 @@ class WebDriver extends Helper {
const targetRes = res.length ? res : await this._locate(locator)
assertElementExists(targetRes, locator, 'Element')
const targetEl = usingFirstElement(targetRes)
const base64Content = base64EncodeFile(file)
const fileName = path.basename(file)
const mimeType = getMimeType(fileName)
return this.browser.execute(function (el, data) {
var binaryStr = atob(data.base64Content)
var bytes = new Uint8Array(binaryStr.length)
for (var i = 0; i < binaryStr.length; i++) bytes[i] = binaryStr.charCodeAt(i)
var fileObj = new File([bytes], data.fileName, { type: data.mimeType })
var dataTransfer = new DataTransfer()
dataTransfer.items.add(fileObj)
el.dispatchEvent(new DragEvent('dragenter', { dataTransfer: dataTransfer, bubbles: true }))
el.dispatchEvent(new DragEvent('dragover', { dataTransfer: dataTransfer, bubbles: true }))
el.dispatchEvent(new DragEvent('drop', { dataTransfer: dataTransfer, bubbles: true }))
}, targetEl, { base64Content, fileName, mimeType })
const fileData = {
base64Content: base64EncodeFile(file),
fileName: path.basename(file),
mimeType: getMimeType(path.basename(file)),
}
return this.browser.execute(dropFile, targetEl, fileData)
}

/**
Expand Down
11 changes: 11 additions & 0 deletions lib/helper/scripts/dropFile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
export const dropFile = (el, { base64Content, fileName, mimeType }) => {
const binaryStr = atob(base64Content)
const bytes = new Uint8Array(binaryStr.length)
for (let i = 0; i < binaryStr.length; i++) bytes[i] = binaryStr.charCodeAt(i)
const fileObj = new File([bytes], fileName, { type: mimeType })
const dataTransfer = new DataTransfer()
dataTransfer.items.add(fileObj)
el.dispatchEvent(new DragEvent('dragenter', { dataTransfer, bubbles: true }))
el.dispatchEvent(new DragEvent('dragover', { dataTransfer, bubbles: true }))
el.dispatchEvent(new DragEvent('drop', { dataTransfer, bubbles: true }))
}