@applitools/screenshoter 3.5.5 → 3.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/screenshoter",
-  "version": "3.5.5",
+  "version": "3.6.1",
   "description": "Applitools universal screenshoter for web and native applications",
   "keywords": [
     "applitools",
@@ -48,8 +48,8 @@
     "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}",
+    "test:e2e:android": "APPLITOOLS_TEST_REMOTE=sauce mocha ./test/e2e/android*/*.spec.js --no-timeouts --parallel --jobs ${MOCHA_JOBS:-3}",
+    "test:e2e:ios": "APPLITOOLS_TEST_REMOTE=sauce mocha ./test/e2e/ios*/*.spec.js --no-timeouts --parallel --jobs ${MOCHA_JOBS:-4}",
     "setup": "yarn setup:web",
     "setup:web": "yarn docker:setup",
     "setup:android": "echo \"setup:android - do nothing\"",
@@ -73,7 +73,7 @@
   },
   "dependencies": {
     "@applitools/image": "1.0.2",
-    "@applitools/logger": "1.1.23",
+    "@applitools/logger": "1.1.25",
     "@applitools/snippets": "2.4.5",
     "@applitools/utils": "1.3.12",
     "jpeg-js": "0.4.4",
@@ -81,9 +81,9 @@
   },
   "devDependencies": {
     "@applitools/bongo": "^2.2.0",
-    "@applitools/driver": "^1.9.34",
-    "@applitools/scripts": "^1.1.0",
-    "@applitools/spec-driver-webdriverio": "^1.2.25",
+    "@applitools/driver": "^1.10.4",
+    "@applitools/scripts": "^1.2.0",
+    "@applitools/spec-driver-webdriverio": "^1.3.1",
     "@applitools/test-utils": "^1.5.1",
     "appium": "^1.22.3",
     "chromedriver": "^101.0.0",

package/src/take-screenshot.js

@@ -23,13 +23,20 @@ async function takeScreenshot({
   debug,
   logger,
   lazyLoad,
+  webview,
 }) {
   debug =
     debug ||
     (process.env.APPLITOOLS_DEBUG_SCREENSHOTS_DIR ? {path: process.env.APPLITOOLS_DEBUG_SCREENSHOTS_DIR} : debug)
   logger = logger ? logger.extend({label: 'screenshoter'}) : makeLogger({label: 'screenshoter'})
+
   // screenshot of a window/app was requested (fully or viewport)
   const window = !region && (!frames || frames.length === 0)
+
+  // switch worlds as needed
+  if (webview && driver.isNative) await driver.switchWorld(typeof webview === 'string' ? {id: webview} : null)
+  if (window && !webview && driver.isWebView) await driver.switchWorld({goHome: true})
+
   // framed screenshots could be taken only when screenshot of window/app fully was requested
   framed = framed && fully && window
   // screenshots with status bar could be taken only when screenshot of app or framed app fully was requested
@@ -115,6 +122,9 @@ async function takeScreenshot({
 
       // restore focus on original active context
       await activeContext.focus()
+
+      // return driver to previous app world if switched
+      await driver.switchWorld({restoreState: true})
     },
   }
 }

package/src/take-viewport-screenshot.js

@@ -7,7 +7,7 @@ function makeTakeViewportScreenshot(options) {
   const {driver} = options
   if (driver.isNative) {
     return makeTakeNativeScreenshot(options)
-  } else if (driver.isIOS) {
+  } else if ((!driver.isEmulation && driver.isIOS) || driver.isWebView) {
     // safari on ios takes screenshot with browser and os interfaces
     return makeTakeMarkedScreenshot(options)
   } else if (driver.browserName === 'Firefox') {
@@ -28,7 +28,7 @@ function makeTakeViewportScreenshot(options) {
 
 function makeTakeDefaultScreenshot({driver, stabilization = {}, debug, logger}) {
   return async function takeScreenshot({name} = {}) {
-    logger.verbose('Taking screenshot...')
+    logger.verbose('Taking screenshot (default)...')
     const image = makeImage(await driver.takeScreenshot())
     await image.debug({...debug, name, suffix: 'original'})
 
@@ -45,7 +45,7 @@ function makeTakeDefaultScreenshot({driver, stabilization = {}, debug, logger})
 
 function makeTakeMainContextScreenshot({driver, stabilization = {}, debug, logger}) {
   return async function takeScreenshot({name} = {}) {
-    logger.verbose('Taking screenshot...')
+    logger.verbose('Taking screenshot (with forced main context)...')
     const originalContext = driver.currentContext
     await driver.mainContext.focus()
     const image = makeImage(await driver.takeScreenshot())
@@ -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.startsWith('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.startsWith('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'})