@cloudscape-design/browser-test-tools 3.0.30 → 3.0.32

package/dist/browsers/browser-creator.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="webdriverio/async" />
 import { RemoteOptions } from 'webdriverio';
+import { Capabilities } from './capabilities';
 export interface WebDriverOptions {
     width: number;
     height: number;
@@ -17,5 +18,5 @@ export default abstract class BrowserCreator {
     protected setupBrowser(overrides: Partial<WebDriverOptions>): Promise<WebdriverIO.Browser>;
     getBrowser(options: Partial<WebDriverOptions>): Promise<WebdriverIO.Browser>;
     protected abstract __getBrowserUrl(): Promise<URL>;
-    protected abstract __getCapabilities(): WebDriver.DesiredCapabilities;
+    protected abstract __getCapabilities(): Capabilities;
 }

package/dist/browsers/browser-creator.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 const webdriverio_1 = require("webdriverio");
-const exceptions_1 = require("../exceptions");
 const merge_1 = __importDefault(require("lodash/merge"));
+const exceptions_1 = require("../exceptions");
 const defaultOptions = {
     width: 1200,
     height: 604,
@@ -17,7 +17,6 @@ const defaultOptions = {
     logLevel: 'error',
 };
 class BrowserCreator {
-    // eslint-disable-next-line no-unused-vars
     constructor(browserName, options) {
         this.browserName = browserName;
         this.options = options;

package/dist/browsers/browserstack.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 import { URL } from 'url';
 import BrowserCreator, { WebDriverOptions } from './browser-creator';
-import type { Capabilities } from '@wdio/types';
+import { Capabilities } from './capabilities';
 type BrowserstackCredentials = {
     user: string;
     key: string;
@@ -16,6 +16,6 @@ export type BrowserstackOptions = {
 export default class BrowserStackBrowserCreator extends BrowserCreator {
     getBrowser(options: Partial<WebDriverOptions>): Promise<WebdriverIO.Browser>;
     __getBrowserUrl(): Promise<URL>;
-    __getCapabilities(): Capabilities.DesiredCapabilities;
+    protected __getCapabilities(): Capabilities;
 }
 export {};

package/dist/browsers/browserstack.js

@@ -126,7 +126,7 @@ class BrowserStackBrowserCreator extends browser_creator_1.default {
         return {
             ...capabilities,
             'bstack:options': {
-                ...capabilities['bstack:options'],
+                ...('bstack:options' in capabilities ? capabilities['bstack:options'] : {}),
                 projectName: browserstackOptions.projectName,
                 buildName: browserstackOptions.buildName,
                 userName: browserstackOptions.credentials.user,

package/dist/browsers/capabilities.d.ts

@@ -1,4 +1,6 @@
-import type { Capabilities } from '@wdio/types';
-declare const defaultCapabilities: Record<string, Capabilities.DesiredCapabilities>;
-export declare function getCapability<T>(browserName: string, capabilities: Record<string, T>): T;
+import { RemoteOptions } from 'webdriverio';
+export type Capabilities = RemoteOptions['capabilities'];
+declare const defaultCapabilities: Record<string, Capabilities>;
+export declare function getCapability(browserName: string, capabilities: Record<string, Capabilities>): Capabilities;
+export declare function mergeCapabilities<T>(src: T, overrides: Partial<T>): T;
 export default defaultCapabilities;

package/dist/browsers/capabilities.js

@@ -1,8 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCapability = void 0;
+exports.mergeCapabilities = exports.getCapability = void 0;
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+const lodash_1 = __importDefault(require("lodash"));
 const exceptions_1 = require("../exceptions");
 const defaultCapabilities = {
     Chrome: {
@@ -81,4 +85,13 @@ function getCapability(browserName, capabilities) {
     return capabilities[browserName];
 }
 exports.getCapability = getCapability;
+function mergeArrays(dest, src) {
+    if (Array.isArray(dest) && Array.isArray(src)) {
+        return dest.concat(src);
+    }
+}
+function mergeCapabilities(src, overrides) {
+    return lodash_1.default.mergeWith({}, src, overrides, mergeArrays);
+}
+exports.mergeCapabilities = mergeCapabilities;
 exports.default = defaultCapabilities;

package/dist/browsers/devicefarm-mobile.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import { URL } from 'url';
 import BrowserCreator from './browser-creator';
-import type { Capabilities } from '@wdio/types';
+import { Capabilities } from './capabilities';
 export default class MobileBrowserCreator extends BrowserCreator {
     __getBrowserUrl(): Promise<URL>;
-    __getCapabilities(): Capabilities.DesiredCapabilities;
+    __getCapabilities(): Capabilities;
 }

package/dist/browsers/devicefarm.d.ts

@@ -2,7 +2,7 @@
 import { URL } from 'url';
 import { CredentialsOptions } from 'aws-sdk/lib/credentials';
 import BrowserCreator from './browser-creator';
-import type { Capabilities } from '@wdio/types';
+import { Capabilities } from './capabilities';
 export interface DevicefarmOptions {
     retryCount?: number;
     projectArn: string;
@@ -11,5 +11,5 @@ export interface DevicefarmOptions {
 }
 export default class DevicefarmBrowserCreator extends BrowserCreator {
     protected __getBrowserUrl(): Promise<URL>;
-    protected __getCapabilities(): Capabilities.DesiredCapabilities;
+    protected __getCapabilities(): Capabilities;
 }

package/dist/browsers/devicefarm.js

@@ -34,13 +34,6 @@ const devicefarm_1 = __importDefault(require("aws-sdk/clients/devicefarm"));
 const browser_creator_1 = __importDefault(require("./browser-creator"));
 const capabilities_1 = __importStar(require("./capabilities"));
 const exceptions_1 = require("../exceptions");
-// This uses undocumented options which prevents proper typing
-const capabilities = {
-    ...capabilities_1.default,
-    IE11: {
-        browserName: 'internet explorer',
-    },
-};
 class DevicefarmBrowserCreator extends browser_creator_1.default {
     async __getBrowserUrl() {
         const options = this.options;
@@ -69,7 +62,7 @@ class DevicefarmBrowserCreator extends browser_creator_1.default {
         return new url_1.URL(response.url);
     }
     __getCapabilities() {
-        return (0, capabilities_1.getCapability)(this.browserName, capabilities);
+        return (0, capabilities_1.getCapability)(this.browserName, capabilities_1.default);
     }
 }
 exports.default = DevicefarmBrowserCreator;

package/dist/browsers/local.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import { URL } from 'url';
 import BrowserCreator from './browser-creator';
-import type { Capabilities } from '@wdio/types';
+import { Capabilities } from './capabilities';
 export default class LocalBrowserCreator extends BrowserCreator {
     __getBrowserUrl(): Promise<URL>;
-    __getCapabilities(): Capabilities.DesiredCapabilities;
+    __getCapabilities(): Capabilities;
 }

package/dist/browsers/local.js

@@ -25,7 +25,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
@@ -33,14 +32,8 @@ const url_1 = require("url");
 const browser_creator_1 = __importDefault(require("./browser-creator"));
 const capabilities_1 = __importStar(require("./capabilities"));
 const localBrowsers = {
-    ...capabilities_1.default,
-    Chrome: {
-        ...capabilities_1.default.Chrome,
-    },
-    ChromeHeadless: {
-        ...capabilities_1.default.ChromeHeadless,
+    ChromeHeadless: (0, capabilities_1.mergeCapabilities)(capabilities_1.default.ChromeHeadless, {
         'goog:chromeOptions': {
-            ...capabilities_1.default.ChromeHeadless['goog:chromeOptions'],
             // do not use retina screen when testing locally
             mobileEmulation: {
                 deviceMetrics: {
@@ -48,22 +41,16 @@ const localBrowsers = {
                 },
             },
         },
-    },
-    ChromeHeadlessIntegration: {
-        ...capabilities_1.default.ChromeHeadless,
+    }),
+    ChromeHeadlessIntegration: (0, capabilities_1.mergeCapabilities)(capabilities_1.default.ChromeHeadless, {
         'goog:chromeOptions': {
-            ...capabilities_1.default.ChromeHeadless['goog:chromeOptions'],
-            args: [
-                '--force-prefers-reduced-motion',
-                ...((_b = (_a = capabilities_1.default.ChromeHeadless['goog:chromeOptions']) === null || _a === void 0 ? void 0 : _a.args) !== null && _b !== void 0 ? _b : []),
-            ],
+            args: ['--force-prefers-reduced-motion'],
         },
-    },
-    Firefox: {
-        ...capabilities_1.default.Firefox,
+    }),
+    Firefox: (0, capabilities_1.mergeCapabilities)(capabilities_1.default.Firefox, {
         // https://firefox-source-docs.mozilla.org/testing/geckodriver/Capabilities.html
         'moz:debuggerAddress': true,
-    }, // https://github.com/webdriverio/webdriverio/pull/8355
+    }),
 };
 class LocalBrowserCreator extends browser_creator_1.default {
     async __getBrowserUrl() {

package/internal/manifest.json

@@ -1,3 +1,3 @@
 {
-  "commit": "f227695f839ca788afd3d72c30e66d26d53f37e0"
+  "commit": "b0610161ec99fd2eb50ba125740e3133ae719a5c"
 }

package/package.json

@@ -30,7 +30,6 @@
   ],
   "homepage": "https://cloudscape.design",
   "jest": {
-    "preset": "ts-jest",
     "testEnvironment": "node",
     "collectCoverage": true,
     "collectCoverageFrom": [
@@ -44,11 +43,16 @@
       "lcov",
       "cobertura"
     ],
-    "setupFilesAfterEnv": [
-      "<rootDir>/test/utils/setup.js"
-    ],
-    "globalSetup": "<rootDir>/test/utils/start-chromedriver.js",
-    "globalTeardown": "<rootDir>/test/utils/stop-chromedriver.js"
+    "globalSetup": "<rootDir>/test/utils/start-chromedriver.ts",
+    "globalTeardown": "<rootDir>/test/utils/stop-chromedriver.ts",
+    "transform": {
+      "^.+\\.ts$": [
+        "ts-jest",
+        {
+          "tsconfig": "tsconfig.test.json"
+        }
+      ]
+    }
   },
   "lint-staged": {
     "*.{js,ts}": [
@@ -60,6 +64,6 @@
     "type": "git",
     "url": "git+https://github.com/cloudscape-design/browser-test-tools.git"
   },
-  "version": "3.0.30",
+  "version": "3.0.32",
   "license": "Apache-2.0"
 }