mirror of
https://github.com/google/blockly.git
synced 2026-01-08 01:20:12 +01:00
Merge pull request #7500 from rachel-fenichel/update_webdriverio
chore(deps): update webdriverio to 8.16 and remove selenium-standalone
This commit is contained in:
@@ -41,7 +41,6 @@ async function driverSetup() {
|
||||
args: ['--allow-file-access-from-files'],
|
||||
},
|
||||
},
|
||||
services: [['selenium-standalone']],
|
||||
logLevel: 'warn',
|
||||
};
|
||||
|
||||
@@ -367,8 +366,8 @@ async function connect(
|
||||
);
|
||||
|
||||
const delta = {
|
||||
x: targetLocation.x - draggedLocation.x,
|
||||
y: targetLocation.y - draggedLocation.y,
|
||||
x: Math.round(targetLocation.x - draggedLocation.x),
|
||||
y: Math.round(targetLocation.y - draggedLocation.y),
|
||||
};
|
||||
if (mutatorBlockId) {
|
||||
await dragBlockSelector.dragAndDrop(delta);
|
||||
@@ -525,7 +524,7 @@ async function getAllBlocks(browser) {
|
||||
* - The workspace has a trash can, which means it has a second (hidden) flyout.
|
||||
* @param browser The active WebdriverIO Browser object.
|
||||
* @param xDelta How far to drag the flyout in the x direction. Positive is right.
|
||||
* @param yDelta How far to drag thte flyout in the y direction. Positive is down.
|
||||
* @param yDelta How far to drag the flyout in the y direction. Positive is down.
|
||||
* @return A Promise that resolves when the actions are completed.
|
||||
*/
|
||||
async function scrollFlyout(browser, xDelta, yDelta) {
|
||||
|
||||
@@ -36,7 +36,6 @@ async function runCompileCheckInBrowser() {
|
||||
browserName: 'chrome',
|
||||
},
|
||||
logLevel: 'warn',
|
||||
services: ['selenium-standalone']
|
||||
};
|
||||
// Run in headless mode on Github Actions.
|
||||
if (process.env.CI) {
|
||||
|
||||
@@ -47,7 +47,6 @@ async function runGeneratorsInBrowser(outputDir) {
|
||||
},
|
||||
},
|
||||
logLevel: 'warn',
|
||||
services: ['selenium-standalone']
|
||||
};
|
||||
|
||||
// Run in headless mode on Github Actions.
|
||||
|
||||
@@ -25,9 +25,6 @@ async function runMochaTestsInBrowser() {
|
||||
args: ['--allow-file-access-from-files'],
|
||||
},
|
||||
},
|
||||
services: [
|
||||
['selenium-standalone'],
|
||||
],
|
||||
logLevel: 'warn',
|
||||
};
|
||||
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
/* eslint-disable */
|
||||
|
||||
module.exports = {
|
||||
// check for more recent versions of selenium here:
|
||||
// https://selenium-release.storage.googleapis.com/index.html
|
||||
version: '3.9.1',
|
||||
baseURL: 'https://selenium-release.storage.googleapis.com',
|
||||
drivers: {
|
||||
chrome: {
|
||||
// check for more recent versions of chrome driver here:
|
||||
// https://chromedriver.storage.googleapis.com/index.html
|
||||
version: '91.0.4472.19',
|
||||
arch: process.arch,
|
||||
baseURL: 'https://chromedriver.storage.googleapis.com',
|
||||
},
|
||||
firefox: {
|
||||
// check for more recent versions of chrome driver here:
|
||||
// https://chromedriver.storage.googleapis.com/index.html
|
||||
version: '0.21.0',
|
||||
arch: process.arch,
|
||||
baseURL: 'https://github.com/mozilla/geckodriver/releases/download',
|
||||
},
|
||||
},
|
||||
requestOpts: {
|
||||
// see https://github.com/request/request#requestoptions-callback
|
||||
timeout: 10000,
|
||||
},
|
||||
};
|
||||
@@ -1,6 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [ "${RUNNER_OS}" == "macOS" ]
|
||||
then
|
||||
export CHROME_BIN="/Applications/Google Chrome.app"
|
||||
fi
|
||||
Reference in New Issue
Block a user