@applitools/spec-driver-puppeteer 1.1.5 → 1.1.8

package/dist/index.js

@@ -28,4 +28,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const spec = __importStar(require("./spec-driver"));
 __exportStar(require("./spec-driver"), exports);
-exports.default = spec;
+const typedSpec = spec;
+exports.default = typedSpec;

package/dist/spec-driver.js

@@ -23,9 +23,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.build = exports.waitUntilDisplayed = exports.scrollIntoView = exports.hover = exports.type = exports.click = exports.takeScreenshot = exports.visit = exports.getUrl = exports.getTitle = exports.getDriverInfo = exports.getCookies = exports.setViewportSize = exports.getViewportSize = exports.findElements = exports.findElement = exports.childContext = exports.parentContext = exports.mainContext = exports.executeScript = exports.isStaleElementError = exports.extractContext = exports.transformSelector = exports.isSelector = exports.isElement = exports.isContext = exports.isDriver = void 0;
+exports.build = exports.waitUntilDisplayed = exports.scrollIntoView = exports.hover = exports.type = exports.click = exports.takeScreenshot = exports.visit = exports.getUrl = exports.getTitle = exports.getDriverInfo = exports.getCookies = exports.setViewportSize = exports.getViewportSize = exports.findElements = exports.findElement = exports.childContext = exports.parentContext = exports.mainContext = exports.executeScript = exports.isStaleElementError = exports.extractContext = exports.untransformSelector = exports.transformSelector = exports.isSelector = exports.isElement = exports.isContext = exports.isDriver = void 0;
 const utils = __importStar(require("@applitools/utils"));
 // #region HELPERS
+const XPATH_SELECTOR_START = ['/', '(', '../', './', '*/'];
 async function handleToObject(handle) {
     const [, type] = handle.toString().split('@');
     if (type === 'array') {
@@ -97,8 +98,8 @@ function scriptRunner(script, arg, ...elements) {
         }
     }
 }
-function isXpath(selector) {
-    return selector.startsWith('//') || selector.startsWith('..');
+function isXpathSelector(selector) {
+    return XPATH_SELECTOR_START.some(start => selector.startsWith(start));
 }
 // #endregion
 // #region UTILITY
@@ -130,6 +131,13 @@ function transformSelector(selector) {
     return selector;
 }
 exports.transformSelector = transformSelector;
+function untransformSelector(selector) {
+    if (utils.types.isString(selector)) {
+        return { type: isXpathSelector(selector) ? 'xpath' : 'css', selector };
+    }
+    return selector;
+}
+exports.untransformSelector = untransformSelector;
 function extractContext(page) {
     return isDriver(page) ? page.mainFrame() : page;
 }
@@ -169,12 +177,12 @@ async function childContext(_frame, element) {
 exports.childContext = childContext;
 async function findElement(frame, selector, parent) {
     const root = parent !== null && parent !== void 0 ? parent : frame;
-    return isXpath(selector) ? root.$x(selector).then(elements => elements[0]) : root.$(selector);
+    return (isXpathSelector(selector) ? root.$x(selector).then(elements => elements[0]) : root.$(selector));
 }
 exports.findElement = findElement;
 async function findElements(frame, selector, parent) {
     const root = parent !== null && parent !== void 0 ? parent : frame;
-    return isXpath(selector) ? root.$x(selector) : root.$$(selector);
+    return (isXpathSelector(selector) ? root.$x(selector) : root.$$(selector));
 }
 exports.findElements = findElements;
 async function getViewportSize(page) {
@@ -219,8 +227,8 @@ async function visit(page, url) {
 }
 exports.visit = visit;
 async function takeScreenshot(page) {
-    const scr = await page._client.send('Page.captureScreenshot');
-    return scr.data;
+    const result = await page.screenshot({ captureBeyondViewport: false });
+    return result;
 }
 exports.takeScreenshot = takeScreenshot;
 async function click(frame, element) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/spec-driver-puppeteer",
-  "version": "1.1.5",
+  "version": "1.1.8",
   "keywords": [
     "puppeteer",
     "chrome devtools protocol",
@@ -17,7 +17,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/applitools/eyes.sdk.javascript1.git"
+    "url": "git://github.com/applitools/eyes.sdk.javascript1.git",
+    "directory": "js/packages/spec-driver-puppeteer"
   },
   "license": "SEE LICENSE IN LICENSE",
   "author": {
@@ -38,6 +39,7 @@
     "lint": "eslint '**/*.ts'",
     "build": "ttsc",
     "test": "mocha ./test/**/*.spec.ts --no-timeouts -r ts-node/register",
+    "test:sanity": "yarn test",
     "setup": "yarn puppeteer:setup",
     "puppeteer:setup": "PUPPETEER_PRODUCT=firefox node ./node_modules/puppeteer/install.js",
     "upgrade:framework": "if [ ! -z $APPLITOOLS_PUPPETEER_VERSION ]; then packagejson=`cat package.json`; yarn upgrade --no-lockfile puppeteer@$APPLITOOLS_PUPPETEER_VERSION; echo \"$packagejson\" > package.json; fi",
@@ -54,14 +56,14 @@
     }
   },
   "dependencies": {
-    "@applitools/types": "1.5.2",
-    "@applitools/utils": "1.3.7"
+    "@applitools/types": "1.5.7",
+    "@applitools/utils": "1.3.10"
   },
   "devDependencies": {
-    "@applitools/api-extractor": "1.2.8",
-    "@applitools/bongo": "^2.1.5",
+    "@applitools/api-extractor": "1.2.9",
+    "@applitools/bongo": "^2.1.6",
     "@applitools/scripts": "1.1.0",
-    "@applitools/test-utils": "1.3.3",
+    "@applitools/test-utils": "1.4.3",
     "@types/mocha": "^9.1.1",
     "@types/node": "12",
     "@typescript-eslint/eslint-plugin": "^5.27.0",
@@ -74,7 +76,7 @@
     "husky": "^4.3.7",
     "mocha": "^9.2.2",
     "prettier": "^2.6.2",
-    "puppeteer": "^14.1.2",
+    "puppeteer": "^15.3.1",
     "ts-node": "^10.8.0",
     "ttypescript": "^1.5.13",
     "typescript": "^4.7.2"

package/types/index.d.ts

@@ -4,7 +4,8 @@ export function isDriver(page: any): page is Driver;
 export function isContext(frame: any): frame is Context;
 export function isElement(element: any): element is Element;
 export function isSelector(selector: any): selector is Selector;
-export function transformSelector(selector: Selector | (string | { selector: string | Selector; type?: string; })): Selector;
+export function transformSelector(selector: string | { selector: string | Selector; type?: string; }): Selector;
+export function untransformSelector(selector: Selector): string | { selector: string; type?: string; };
 export function extractContext(page: Driver | Context): Context;
 export function isStaleElementError(err: any): boolean;
 export function executeScript(frame: Context, script: string | ((arg: any) => any), arg: any): Promise<any>;
@@ -20,7 +21,7 @@ export function getDriverInfo(_page: Driver): Promise<import('@applitools/types'
 export function getTitle(page: Driver): Promise<string>;
 export function getUrl(page: Driver): Promise<string>;
 export function visit(page: Driver, url: string): Promise<void>;
-export function takeScreenshot(page: Driver): Promise<string>;
+export function takeScreenshot(page: Driver): Promise<Buffer>;
 export function click(frame: Context, element: Element | Selector): Promise<void>;
 export function type(frame: Context, element: Element | Selector, keys: string): Promise<void>;
 export function hover(frame: Context, element: Element | Selector): Promise<void>;