@applitools/screenshoter 3.4.5 → 3.4.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/screenshoter",
-  "version": "3.4.5",
+  "version": "3.4.8",
   "description": "Applitools universal screenshoter for web and native applications",
   "keywords": [
     "applitools",
@@ -18,7 +18,7 @@
   "repository": {
     "type": "git",
     "url": "git://github.com/applitools/eyes.sdk.javascript1.git",
-    "directory": "packages/screenshoter"
+    "directory": "js/packages/screenshoter"
   },
   "license": "SEE LICENSE IN LICENSE",
   "author": {
@@ -43,12 +43,14 @@
   "scripts": {
     "lint": "eslint . --ext .js",
     "test": "yarn test:it && yarn test:e2e",
+    "test:sanity": "yarn test:unit && yarn test:it && yarn test:e2e:web",
     "test:unit": "mocha ./test/unit/*.spec.js --no-timeouts",
     "test:it": "mocha ./test/it/*.spec.js --no-timeouts",
     "test:e2e": "yarn test:e2e:web && yarn && yarn test:e2e:android && yarn test:e2e:ios",
     "test:e2e:web": "mocha ./test/e2e/web/*.spec.js --no-timeouts -r @applitools/test-utils/mocha-hooks/docker",
     "test:e2e:android": "APPLITOOLS_TEST_REMOTE=sauce mocha ./test/e2e/android*/*.spec.js --no-timeouts --parallel --jobs ${MOCHA_JOBS:-2}",
     "test:e2e:ios": "APPLITOOLS_TEST_REMOTE=sauce mocha ./test/e2e/ios*/*.spec.js --no-timeouts --parallel --jobs ${MOCHA_JOBS:-2}",
+    "setup": "yarn setup:web",
     "setup:web": "yarn docker:setup",
     "setup:android": "echo \"setup:android - do nothing\"",
     "setup:ios": "echo \"setup:ios - do nothing\"",
@@ -70,18 +72,18 @@
     }
   },
   "dependencies": {
-    "@applitools/logger": "1.1.13",
-    "@applitools/snippets": "2.4.3",
-    "@applitools/utils": "1.3.9",
+    "@applitools/logger": "1.1.14",
+    "@applitools/snippets": "2.4.4",
+    "@applitools/utils": "1.3.10",
     "jpeg-js": "0.4.4",
     "png-async": "0.9.4"
   },
   "devDependencies": {
-    "@applitools/bongo": "^2.1.5",
-    "@applitools/driver": "^1.9.7",
-    "@applitools/scripts": "1.1.0",
-    "@applitools/spec-driver-webdriverio": "1.2.13",
-    "@applitools/test-utils": "1.3.3",
+    "@applitools/bongo": "^2.1.6",
+    "@applitools/driver": "^1.9.12",
+    "@applitools/scripts": "^1.1.0",
+    "@applitools/spec-driver-webdriverio": "^1.2.16",
+    "@applitools/test-utils": "^1.4.0",
     "appium": "^1.22.3",
     "chromedriver": "^101.0.0",
     "eslint": "^8.16.0",

package/src/take-stitched-screenshot.js

@@ -57,7 +57,7 @@ async function takeStitchedScreenshot({
   logger.log('Crop region calculated: ', cropRegion)
   if (utils.geometry.isEmpty(cropRegion)) throw new Error('Screenshot region is out of viewport')
 
-  image.crop(withStatusBar ? utils.geometry.offset(cropRegion, {x: 0, y: driver.statusBarHeight}) : cropRegion)
+  image.crop(withStatusBar ? utils.geometry.offset(cropRegion, {x: 0, y: driver.statusBarSize}) : cropRegion)
   await image.debug({...debug, name: 'initial', suffix: 'region'})
 
   const contentRegion = utils.geometry.region({x: 0, y: 0}, contentSize)
@@ -151,7 +151,7 @@ async function takeStitchedScreenshot({
     stitchedImage.frame(
       firstImage,
       lastImage,
-      withStatusBar ? utils.geometry.offset(cropRegion, {x: 0, y: driver.statusBarHeight}) : cropRegion,
+      withStatusBar ? utils.geometry.offset(cropRegion, {x: 0, y: driver.statusBarSize}) : cropRegion,
     )
     await stitchedImage.debug({...debug, name: 'framed'})
 

package/src/take-viewport-screenshot.js

@@ -99,7 +99,7 @@ function makeTakeMarkedScreenshot({driver, stabilization = {}, debug, logger}) {
     else image.scale(1 / driver.pixelRatio / driver.viewportScale)
 
     if (stabilization.rotate) image.rotate(stabilization.rotate)
-    else if (driver.orientation === 'landscape' && image.width < image.height) image.rotate(-90)
+    else if (driver.orientation.startsWith('landscape') && image.width < image.height) image.rotate(-90)
 
     if (stabilization.crop) image.crop(stabilization.crop)
     else {
@@ -126,7 +126,7 @@ function makeTakeMarkedScreenshot({driver, stabilization = {}, debug, logger}) {
       const image = makeImage(await driver.takeScreenshot())
 
       if (stabilization.rotate) image.rotate(stabilization.rotate)
-      else if (driver.orientation === 'landscape' && image.width < image.height) image.rotate(-90)
+      else if (driver.orientation.startsWith('landscape') && image.width < image.height) image.rotate(-90)
 
       await image.debug({...debug, name: 'marker'})
 
@@ -156,26 +156,24 @@ function makeTakeNativeScreenshot({driver, stabilization = {}, debug, logger}) {
     else image.scale(1 / driver.pixelRatio / driver.viewportScale)
 
     if (stabilization.rotate) image.rotate(stabilization.rotate)
-    else if (driver.orientation === 'landscape' && image.width < image.height) image.rotate(-90)
+    else if (driver.orientation.startsWith('landscape') && image.width < image.height) image.rotate(-90)
 
     if (stabilization.crop) image.crop(stabilization.crop)
     else {
-      const viewportSize = await driver.getViewportSize()
+      const viewportRegion = await driver.getViewportRegion()
+      const cropRegion = {...viewportRegion}
       if (withStatusBar) {
-        image.crop({x: 0, y: 0, width: viewportSize.width, height: viewportSize.height + driver.statusBarHeight})
-      } else if (driver.isAndroid && driver.orientation === 'landscape') {
-        image.crop({
-          top: driver.statusBarHeight,
-          bottom: driver.orientation === 'landscape' ? 0 : driver.navigationBarHeight,
-          left: driver.platformVersion >= 8 ? driver.navigationBarHeight : 0,
-          right: driver.platformVersion < 8 ? driver.navigationBarHeight : 0,
-        })
-      } else {
-        image.crop({x: 0, y: driver.statusBarHeight, width: viewportSize.width, height: viewportSize.height})
+        cropRegion.y = 0
+        cropRegion.height += driver.statusBarSize
       }
+      image.crop(cropRegion)
     }
 
-    await image.debug({...debug, name, suffix: `viewport${withStatusBar ? '-with-statusbar' : ''}`})
+    await image.debug({
+      ...debug,
+      name,
+      suffix: `viewport${withStatusBar ? '-with-statusbar' : ''}`,
+    })
 
     return image
   }