@applitools/screenshoter 3.3.6 → 3.3.7

package/CHANGELOG.md

@@ -4,6 +4,13 @@
 ## Unreleased
 
 
+## 3.3.7 - 2022/2/15
+
+- fix image scaling on pages without viewport metatag
+- fix safari's viewport detection on iOS devices
+- updated to @applitools/snippets@2.1.13 (from 2.1.12)
+- updated to @applitools/utils@1.2.13 (from 1.2.12)
+
 ## 3.3.6 - 2022/2/9
 
 - fix testing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/screenshoter",
-  "version": "3.3.6",
+  "version": "3.3.7",
   "description": "Applitools universal screenshoter for web and native applications",
   "keywords": [
     "applitools",
@@ -43,6 +43,7 @@
     "setup:android": "yarn android:setup && yarn appium:setup",
     "setup:ios": "yarn ios:setup && yarn appium:setup",
     "android:setup": "node ./scripts/android-emulator.js",
+    "android:shutdown": "adb -s emulator-5555 emu kill || true && adb -s emulator-5557 emu kill || true",
     "docker:setup": "node ../scripts/scripts/generate-docker-compose-config.js && docker-compose up -d",
     "docker:teardown": "docker-compose down",
     "ios:setup": "node ./scripts/ios-simulator.js",
@@ -59,15 +60,15 @@
     }
   },
   "dependencies": {
-    "@applitools/snippets": "2.1.12",
-    "@applitools/utils": "1.2.12",
+    "@applitools/snippets": "2.1.13",
+    "@applitools/utils": "1.2.13",
     "png-async": "0.9.4"
   },
   "devDependencies": {
-    "@applitools/driver": "1.4.12",
+    "@applitools/driver": "1.4.14",
     "@applitools/sdk-release-kit": "0.13.11",
     "@applitools/spec-driver-webdriverio": "1.2.7",
-    "@applitools/test-utils": "1.0.11",
+    "@applitools/test-utils": "1.0.12",
     "appium": "^1.22.2",
     "chromedriver": "^95.0.0",
     "eslint": "^7.9.0",
@@ -81,6 +82,6 @@
     "webdriverio": "^7.16.7"
   },
   "engines": {
-    "node": ">= 8.9.0"
+    "node": ">= 10.0.0"
   }
 }

package/src/find-image-pattern.js

@@ -1,19 +1,22 @@
 function findImagePattern(image, pattern) {
   for (let pixel = 0; pixel < image.width * image.height; ++pixel) {
     if (isPattern(image, pixel, pattern)) {
-      const patterOffset = pattern.offset * pattern.pixelRatio
+      const patterOffset = Math.round(pattern.offset * pattern.scale)
       return {x: (pixel % image.width) - patterOffset, y: Math.floor(pixel / image.width) - patterOffset}
     }
   }
   return null
 }
 
-function isPattern(image, index, pattern) {
-  const itemLength = pattern.size * pattern.pixelRatio
-  for (const [itemIndex, itemColor] of pattern.mask.entries()) {
-    for (let partOffset = itemIndex * itemLength; partOffset < (itemIndex + 1) * itemLength; ++partOffset) {
-      const pixelColor = pixelColorAt(image, index + partOffset)
-      if (pixelColor !== itemColor) return false
+function isPattern(image, offset, pattern) {
+  const length = Math.round(pattern.size * pattern.scale)
+  for (const [index, color] of pattern.mask.entries()) {
+    const maxLength = index * pattern.size * pattern.scale // how many pixels actually could be occupied at this point
+    const missedPixels = Math.abs(maxLength - Math.round(maxLength)) // how many pixels were missed due to rounding
+    const skippedPixels = missedPixels >= 0.25 ? Math.ceil(missedPixels) : 0 // how many pixels should be skipped from checking in pattern (usually 1 or 0)
+    for (let pixel = index * length; pixel < (index + 1) * length - skippedPixels; ++pixel) {
+      const pixelColor = pixelColorAt(image, offset + pixel)
+      if (pixelColor !== color) return false
     }
   }
   return true
@@ -27,7 +30,10 @@ function pixelColorAt(image, index) {
 
   const luminance = 0.2126 * r + 0.7152 * g + 0.0722 * b
 
-  return luminance < 128 ? /* black */ 1 : /* white */ 0
+  // if luminance is between black and white check the color of previous pixel
+  if (luminance >= 112 && luminance <= 144) return pixelColorAt(image, index - 1)
+  else if (luminance < 128) return /* black */ 1
+  else return /* white*/ 0
 }
 
 module.exports = findImagePattern

package/src/image.js

@@ -22,7 +22,7 @@ function makeImage(data) {
   } else if (data.isImage) {
     transforms = data.transforms
     image = data.toRaw()
-    size = utils.geometry.scale(data.size, 1 / transforms.scale)
+    size = data.rawSize
   } else if (utils.types.has(data, ['width', 'height'])) {
     image = fromSize(data)
     if (data.data) image.data = data.data
@@ -38,9 +38,18 @@ function makeImage(data) {
       return true
     },
     get size() {
-      return utils.geometry.round(
-        utils.geometry.rotate(utils.geometry.scale(size, transforms.scale), transforms.rotate),
-      )
+      const croppedSize = utils.geometry.size(transforms.crop || size)
+      const scaledSize = utils.geometry.scale(croppedSize, transforms.scale)
+      const rotatedSize = utils.geometry.rotate(scaledSize, transforms.rotate)
+      return utils.geometry.round(rotatedSize)
+    },
+    get unscaledSize() {
+      const croppedSize = utils.geometry.size(transforms.crop || size)
+      const rotatedSize = utils.geometry.rotate(croppedSize, transforms.rotate)
+      return utils.geometry.round(rotatedSize)
+    },
+    get rawSize() {
+      return size
     },
     get transforms() {
       return {...transforms}
@@ -53,12 +62,10 @@ function makeImage(data) {
     },
     scale(ratio) {
       transforms.scale *= ratio
-      // size = utils.geometry.scale(size, ratio)
       return this
     },
     rotate(degrees) {
       transforms.rotate = (transforms.rotate + degrees) % 360
-      // size = utils.geometry.rotate(size, degrees)
       return this
     },
     crop(region) {
@@ -77,39 +84,47 @@ function makeImage(data) {
         ? utils.geometry.intersect(transforms.crop, utils.geometry.offset(region, transforms.crop))
         : utils.geometry.intersect({x: 0, y: 0, ...size}, region)
       transforms.crop = region
-      size = utils.geometry.size(transforms.crop)
       return this
     },
     copy(srcImage, offset) {
-      const scale = srcImage.transforms.scale
+      // if "auto" image and this is first chunk
+      if (!image && size.width === -1 && size.height === -1) transforms.scale = srcImage.transforms.scale
+
+      const unscaledOffset = utils.geometry.scale(offset, 1 / transforms.scale)
+
       if (!image) {
         size = {
-          width: Math.max(Math.floor((offset.x + srcImage.width) / scale), size.width),
-          height: Math.max(Math.floor((offset.y + srcImage.height) / scale), size.height),
+          width: Math.max(Math.floor(unscaledOffset.x) + srcImage.unscaledSize.width, size.width),
+          height: Math.max(Math.floor(unscaledOffset.y) + srcImage.unscaledSize.height, size.height),
         }
-        transforms.scale = Math.min(scale, transforms.scale)
       }
-      transforms.modifiers.push({
-        type: 'copy',
-        image: srcImage.scale(scale === transforms.scale ? 1 / scale : scale / transforms.scale).toObject(),
-        offset: utils.geometry.scale(offset, 1 / transforms.scale),
-      })
+
+      const unscale =
+        srcImage.transforms.scale === transforms.scale
+          ? 1 / srcImage.transforms.scale
+          : srcImage.transforms.scale / transforms.scale
+
+      transforms.modifiers.push({type: 'copy', image: srcImage.scale(unscale).toObject(), offset: unscaledOffset})
 
       return this
     },
     frame(topImage, bottomImage, region) {
-      const scale = topImage.transforms.scale
       const prevSize = size
-      region = utils.geometry.scale(region, 1 / scale)
+      const unscaledRegion = utils.geometry.scale(region, 1 / topImage.transforms.scale)
       size = {
-        width: Math.floor(topImage.width / scale + Math.max(size.width - region.width, 0)),
-        height: Math.floor(topImage.height / scale + Math.max(size.height - region.height, 0)),
+        width: Math.floor(topImage.unscaledSize.width + Math.max(size.width - unscaledRegion.width, 0)),
+        height: Math.floor(topImage.unscaledSize.height + Math.max(size.height - unscaledRegion.height, 0)),
       }
+
+      const unscale =
+        topImage.transforms.scale === transforms.scale
+          ? 1 / topImage.transforms.scale
+          : topImage.transforms.scale / transforms.scale
       transforms.modifiers.push({
         type: 'frame',
-        top: topImage.scale(scale === transforms.scale ? 1 / scale : scale / transforms.scale).toObject(),
-        bottom: bottomImage.scale(scale === transforms.scale ? 1 / scale : scale / transforms.scale).toObject(),
-        region,
+        top: topImage.scale(unscale).toObject(),
+        bottom: bottomImage.scale(unscale).toObject(),
+        region: unscaledRegion,
       })
       transforms.added = {width: size.width - prevSize.width, height: size.height - prevSize.height}
       return this

package/src/scroller.js

@@ -80,7 +80,6 @@ function makeScroller({logger, element, scrollingMode = 'mixed'}) {
 
   async function scrollTo(offset, element = defaultElement) {
     try {
-      // offset = {x: Math.max(offset.x, 0), y: Math.max(offset.y, 0)}
       const scrollOffset = await element.scrollTo(offset)
       return scrollOffset
     } catch (err) {
@@ -92,7 +91,6 @@ function makeScroller({logger, element, scrollingMode = 'mixed'}) {
 
   async function translateTo(offset, element = defaultElement) {
     try {
-      // offset = {x: Math.max(offset.x, 0), y: Math.max(offset.y, 0)}
       await element.scrollTo({x: 0, y: 0})
       const translateOffset = await element.translateTo(offset)
       return translateOffset
@@ -105,8 +103,15 @@ function makeScroller({logger, element, scrollingMode = 'mixed'}) {
 
   async function shiftTo(offset, element = defaultElement) {
     try {
-      // offset = {x: Math.max(offset.x, 0), y: Math.max(offset.y, 0)}
       const scrollOffset = await element.scrollTo(offset)
+      if (utils.geometry.equals(scrollOffset, offset)) return scrollOffset
+
+      // there is a "bug" in iOS that will not move a root element if it already scrolled, so it should be translated all the way
+      if (element.driver.isIOS && (await element.isRoot())) {
+        const translateOffset = await element.translateTo(offset)
+        return translateOffset
+      }
+
       const remainingOffset = utils.geometry.offsetNegative(offset, scrollOffset)
       const translateOffset = await element.translateTo(remainingOffset)
 

package/src/take-screenshot.js

@@ -60,6 +60,8 @@ async function takeScreenshot({
         ? await takeStitchedScreenshot({...target, withStatusBar, overlap, framed, wait, stabilization, debug, logger})
         : await takeSimpleScreenshot({...target, withStatusBar, wait, stabilization, debug, logger})
 
+    screenshot.image.scale(driver.viewportScale)
+
     if (hooks && hooks.afterScreenshot) {
       // imitate image-like state for the hook
       if (window && fully && target.scroller) {

package/src/take-viewport-screenshot.js

@@ -33,7 +33,7 @@ function makeTakeDefaultScreenshot({driver, stabilization = {}, debug, logger})
     await image.debug({...debug, name, suffix: 'original'})
 
     if (stabilization.scale) image.scale(stabilization.scale)
-    else image.scale(1 / driver.pixelRatio)
+    else image.scale(1 / driver.pixelRatio / driver.viewportScale)
 
     if (stabilization.rotate) image.crop(stabilization.rotate)
 
@@ -53,7 +53,7 @@ function makeTakeMainContextScreenshot({driver, stabilization = {}, debug, logge
     await image.debug({...debug, name, suffix: 'original'})
 
     if (stabilization.scale) image.scale(stabilization.scale)
-    else image.scale(1 / driver.pixelRatio)
+    else image.scale(1 / driver.pixelRatio / driver.viewportScale)
 
     if (stabilization.rotate) image.rotate(stabilization.rotate)
 
@@ -72,7 +72,7 @@ function makeTakeSafari11Screenshot({driver, stabilization = {}, debug, logger})
     await image.debug({...debug, name, suffix: 'original'})
 
     if (stabilization.scale) image.scale(stabilization.scale)
-    else image.scale(1 / driver.pixelRatio)
+    else image.scale(1 / driver.pixelRatio / driver.viewportScale)
 
     if (stabilization.rotate) image.rotate(stabilization.rotate)
 
@@ -96,7 +96,7 @@ function makeTakeMarkedScreenshot({driver, stabilization = {}, debug, logger}) {
     await image.debug({...debug, name, suffix: 'original'})
 
     if (stabilization.scale) image.scale(stabilization.scale)
-    else image.scale(1 / driver.pixelRatio)
+    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)
@@ -113,7 +113,13 @@ function makeTakeMarkedScreenshot({driver, stabilization = {}, debug, logger}) {
   }
 
   async function getViewportRegion() {
-    const marker = await driver.mainContext.execute(snippets.addPageMarker)
+    // marker is -> bwb bwbb wbw bwbb wbww bbb
+    const marker = await driver.mainContext.execute(snippets.addPageMarker, [
+      {
+        mask: [1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1],
+        size: utils.math.multiplier(driver.viewportScale * driver.pixelRatio, 0.05),
+      },
+    ])
     await utils.general.sleep(100)
 
     try {
@@ -124,12 +130,16 @@ function makeTakeMarkedScreenshot({driver, stabilization = {}, debug, logger}) {
 
       await image.debug({...debug, name: 'marker'})
 
-      const markerLocation = findImagePattern(await image.toObject(), {...marker, pixelRatio: driver.pixelRatio})
+      const markerLocation = findImagePattern(await image.toObject(), {
+        ...marker,
+        scale: driver.viewportScale * driver.pixelRatio,
+      })
       if (!markerLocation) return null
 
-      const viewportSize = await driver.getViewportSize()
-
-      return utils.geometry.region(utils.geometry.scale(markerLocation, 1 / driver.pixelRatio), viewportSize)
+      return utils.geometry.region(
+        utils.geometry.scale(markerLocation, 1 / driver.pixelRatio / driver.viewportScale),
+        await driver.getViewportSize(),
+      )
     } finally {
       await driver.mainContext.execute(snippets.cleanupPageMarker)
     }
@@ -143,7 +153,7 @@ function makeTakeNativeScreenshot({driver, stabilization = {}, debug, logger}) {
     await image.debug({...debug, name, suffix: 'original'})
 
     if (stabilization.scale) image.scale(stabilization.scale)
-    else image.scale(1 / driver.pixelRatio)
+    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)