diff --git a/packages/browser/scripts/checkbrowsers.js b/packages/browser/scripts/checkbrowsers.js index 9e6481485d79..a32dcd4fff8b 100644 --- a/packages/browser/scripts/checkbrowsers.js +++ b/packages/browser/scripts/checkbrowsers.js @@ -102,7 +102,9 @@ const checkLocalConfigsVsBrowserStack = (localConfigs, bsConfigs) => { } console.log( '\nPlease visit https://api.browserstack.com/5/browsers or https://api.browserstack.com/5/browsers?flat=true to choose new configurations.', + "\n\n(If you're sure one of the reported browsers is supported, check to make sure the local config contains all keys (even if they have a null value) and that the values match exactly the ones given by the API.)\n", ); + process.exit(-1); } else { console.log('\nAll configurations supported!\n'); } @@ -119,9 +121,14 @@ const checkLocalConfigsVsBrowserStack = (localConfigs, bsConfigs) => { const findUnsupportedConfigs = localConfigs => { if (!hasCreds()) { console.warn( - 'Unable to find API credentials in env. Please export them as BROWSERSTACK_USERNAME and BROWSERSTACK_ACCESS_KEY.', + 'Unable to find API credentials in env. Please export them as BROWSERSTACK_USERNAME and BROWSERSTACK_ACCESS_KEY.\n', ); - return; + process.exit(-1); + } + + if (!localConfigs) { + console.warn('Unable to load local browser configurations.\n'); + process.exit(-1); } fetchCurrentData(browserstackUsername, browserstackAccessKey) diff --git a/packages/browser/test/integration/suites/loader-specific.js b/packages/browser/test/integration/suites/loader-specific.js index b6382151aaba..145fcd6e1dff 100644 --- a/packages/browser/test/integration/suites/loader-specific.js +++ b/packages/browser/test/integration/suites/loader-specific.js @@ -6,7 +6,7 @@ var loaderVariants = [ for (var idx in loaderVariants) { (function() { describe(loaderVariants[idx], function() { - this.timeout(5000); + this.timeout(60000); this.retries(3); var sandbox; diff --git a/packages/browser/test/integration/suites/shell.js b/packages/browser/test/integration/suites/shell.js index b0ce68e60d81..089aaca8848f 100644 --- a/packages/browser/test/integration/suites/shell.js +++ b/packages/browser/test/integration/suites/shell.js @@ -6,7 +6,7 @@ function runVariant(variant) { var IS_SYNC_LOADER = !!variant.match(/^loader-lazy-no$/); describe(variant, function() { - this.timeout(5000); + this.timeout(60000); this.retries(3); var sandbox; diff --git a/packages/core/src/baseclient.ts b/packages/core/src/baseclient.ts index 52c853fe559c..5b48161a52ef 100644 --- a/packages/core/src/baseclient.ts +++ b/packages/core/src/baseclient.ts @@ -429,7 +429,7 @@ export abstract class BaseClient implement originalException: reason as Error, }); reject( - `Event processing pipeline threw an error, original event will not be sent. Details has been sent as a new event.\nReason: ${reason}`, + `Event processing pipeline threw an error, original event will not be sent. Details have been sent as a new event.\nReason: ${reason}`, ); }); }); diff --git a/scripts/browser-integration.sh b/scripts/browser-integration.sh index 9616fb0228f5..c5da93fa1041 100755 --- a/scripts/browser-integration.sh +++ b/scripts/browser-integration.sh @@ -5,6 +5,6 @@ yarn # We have to build other packages first, as we use absolute packages import in TypeScript yarn build cd packages/browser +yarn test:integration:checkbrowsers yarn test:integration yarn test:package -