Skip to content
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

Jump to bottom

chore: clean up unnecessary webdriverio/spectron references #5342

Merged
merged 5 commits into from
Apr 13, 2022
Merged

chore: clean up unnecessary webdriverio/spectron references #5342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d38990
Update usages of async dep to 3.2.3, and remove unneeded ones
dbjorge Apr 8, 2022
026bfd5
yarn format:fix
dbjorge Apr 8, 2022
5cd3db3
Remove resolutions
dbjorge Apr 8, 2022
c5355d8
Merge branch 'main' into update-moment
dbjorge Apr 13, 2022
d4cda7c
Update lockfile
dbjorge Apr 13, 2022
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
14 changes: 0 additions & 14 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,20 +50,6 @@ updates:
- dependency-name: electron
versions:
- ">= 0"
# Spectron major versions are tied to Electron major versions.
# We can only take major version updates as part of Electron updates.
- dependency-name: spectron
versions:
- ">=13.0.0"
# We use webdriverio only indirectly via spectron; our direct
# dependency on the package is only for the sake of typings, so
# we stick to the major version of webdriverio used by spectron.
#
# The spectron issue tracking their update to v5 is
# https://github.com/electron-userland/spectron/issues/349
- dependency-name: webdriverio
versions:
- ">=5.0.0"
# Major version of @types/node is pinned to match the version of node we
# use for builds (ideally, latest LTS)
- dependency-name: "@types/node"
Expand Down
2 changes: 1 addition & 1 deletion docs/building-web.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ You will need the following tools installed:
- [Node](https://nodejs.org) >= 14.19.0 (check by running `node --version`) - This is the version being enforced on our builds
- [Yarn](https://yarnpkg.com/getting-started/install) >= 1.22.10 (check by running `yarn --version`)
- Note: There is a [known name collision](https://github.com/yarnpkg/yarn/issues/673) between Yarn package manager and Hadoop YARN. If you have Hadoop YARN installed, replace `yarn` with `yarnpkg` in the commands below.
- **macOS only** [Xcode](https://wilsonmar.github.io/xcode/#XcodeInstall). This is needed when installing some dev dependencies (like spectron). After installing Xcode, run the following commands from a command terminal:
- **macOS only** [Xcode](https://wilsonmar.github.io/xcode/#XcodeInstall). This is needed when installing certain dependencies with native compilation steps. After installing Xcode, run the following commands from a command terminal:
```
xcode-select --install
sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
Expand Down
9 changes: 4 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@
"typed-scss-modules": "^6.2.0",
"typemoq": "^2.1.0",
"typescript": "^4.6.3",
"webdriverio": "^4.13.0",
"webpack": "^5.72.0",
"webpack-cli": "^4.9.2",
"webpack-node-externals": "^3.0.0"
Expand Down Expand Up @@ -198,13 +197,13 @@
},
"resolutions": {
"@types/node": "^14.14.6",
"ansi-regex": "^5.0.1",
"dot-prop": "^5.2.0",
"kind-of": "^6.0.3",
"minimist": "^1.2.3",
"license-check-and-add/yargs": "^15.3.1",
"ansi-regex": "^5.0.1",
"minimist": "^1.2.3",
"nth-check": ">=2.0.1",
"tar": ">=6.1.9",
"plist": ">=3.0.5"
"plist": ">=3.0.5",
"tar": ">=6.1.9"
}
}
16 changes: 0 additions & 16 deletions src/tests/electron/setup/timeouts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,5 @@
// How long to allow an entire test to execute, including startup/setup
export const DEFAULT_ELECTRON_TEST_TIMEOUT_MS = 60000;

// These govern how long to allow connection to the test app to take
// The product of these should be significantly less than the test timeout
export const DEFAULT_APP_CONNECT_TIMEOUT_MS = 10000;
export const DEFAULT_APP_CONNECT_RETRIES = 3;

// These govern how long Spectron should allow for ChromeDriver to start
// The product of these should be significantly less than the test timeout
export const DEFAULT_CHROMEDRIVER_START_TIMEOUT_MS = 5000;
export const DEFAULT_CHROMEDRIVER_START_RETRIES = 3;

// How long to wait for an element to be visible
export const DEFAULT_WAIT_FOR_ELEMENT_TO_BE_VISIBLE_TIMEOUT_MS = 10000;

// How long of a wait to artificially inject between element hover/mousedown/mouseup during clicks
export const DEFAULT_CLICK_HOVER_DELAY_MS = 100;

// How long to wait for a mock adb or service log to contain a value
export const DEFAULT_WAIT_FOR_LOG_TIMEOUT_MS = 1500;
3 changes: 1 addition & 2 deletions src/tests/end-to-end/common/timeouts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ export const DEFAULT_TARGET_PAGE_SCAN_TIMEOUT_MS = 15000;
// How long to wait for a new page to load in response to the UI action that launched it
export const DEFAULT_NEW_PAGE_WAIT_TIMEOUT_MS = 5000;

// How long of a wait to artificially inject between element hover/mousedown/mouseup during clicks
export const DEFAULT_CLICK_HOVER_DELAY_MS = 100;
// How long of a wait to artificially inject between element mouseup during clicks
export const DEFAULT_CLICK_MOUSEUP_DELAY_MS = 50;

// How long to allow screenshotOnError to take (we don't want to allow arbitrarily long because the
Expand Down
Loading