Skip to content

Browserstack optimisations #7201

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

Merged
merged 6 commits into from
Apr 30, 2019
Merged

Browserstack optimisations #7201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
099c687
add local identifier to suppoort parallel runs BrowserStack
nimit95 Apr 30, 2019
9207afc
calling driver quit to stop test and then killing binary
nimit95 Apr 30, 2019
a8e0e8c
run lint-fix
ijjk Apr 30, 2019
0303ce0
standard fixes
nimit95 Apr 30, 2019
6a94bfb
Merge branch 'browserstack_optimizations' of github.com:nimit95/next.…
nimit95 Apr 30, 2019
9323d9a
Merge branch 'canary' into browserstack_optimizations
nimit95 Apr 30, 2019
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
3 changes: 2 additions & 1 deletion test/jest-environment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ if (isBrowserStack) {
}
const sharedOpts = {
'browserstack.local': true,
'browserstack.video': false
'browserstack.video': false,
'browserstack.localIdentifier': global.browserStackLocal.localIdentifierFlag
}

browserOptions = {
Expand Down
3 changes: 2 additions & 1 deletion test/jest-global-setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ if (process.env.BROWSERSTACK) {
const { Local } = require('browserstack-local')
const browserStackLocal = new Local()
const localBrowserStackOpts = {
key: process.env.BROWSERSTACK_ACCESS_KEY
key: process.env.BROWSERSTACK_ACCESS_KEY,
localIdentifier: new Date().getTime() // Adding a unique local identifier to run parallel tests on BrowserStack
}
global.browserStackLocal = browserStackLocal

Expand Down
6 changes: 4 additions & 2 deletions test/jest-global-teardown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ if (process.env.BROWSERSTACK) {
}

module.exports = async () => {
await globalTeardown()

if (browser) {
// Close all remaining browser windows
try {
Expand All @@ -21,7 +19,11 @@ module.exports = async () => {
if (!window) continue
await browser.window(window)
await browser.origClose()
await browser.quit()
await globalTeardown()
}
} catch (_) {}
} else {
await globalTeardown()
}
}