@applitools/screenshoter 3.8.13 → 3.8.15

package/CHANGELOG.md

@@ -1,5 +1,65 @@
 # Changelog
 
+## [3.8.15](https://github.com/applitools/eyes.sdk.javascript1/compare/js/screenshoter@3.8.14...js/screenshoter@3.8.15) (2023-11-07)
+
+
+### Dependencies
+
+* @applitools/spec-driver-webdriver bumped to 1.0.49
+
+* @applitools/driver bumped to 1.15.0
+  #### Features
+
+  * added warning when driver used with capabilities that may conflict with applitools lib workflow ([#2011](https://github.com/applitools/eyes.sdk.javascript1/issues/2011)) ([081006d](https://github.com/applitools/eyes.sdk.javascript1/commit/081006d879894db03a2713129b66586496b6eb02))
+
+## [3.8.14](https://github.com/applitools/eyes.sdk.javascript1/compare/js/screenshoter@3.8.13...js/screenshoter@3.8.14) (2023-10-17)
+
+
+### Bug Fixes
+
+* allow css scrolling when taking screenshot of the webview ([2d3a257](https://github.com/applitools/eyes.sdk.javascript1/commit/2d3a2572768e7f979d16297ca316a79ab2538adb))
+
+
+### Code Refactoring
+
+* disallow usage of global Buffer ([#1957](https://github.com/applitools/eyes.sdk.javascript1/issues/1957)) ([adcc082](https://github.com/applitools/eyes.sdk.javascript1/commit/adcc082f20f6b92e819b96424e995d9a69d99758))
+
+
+### Dependencies
+
+* @applitools/utils bumped to 1.6.2
+  #### Code Refactoring
+
+  * disallow usage of global Buffer ([#1957](https://github.com/applitools/eyes.sdk.javascript1/issues/1957)) ([adcc082](https://github.com/applitools/eyes.sdk.javascript1/commit/adcc082f20f6b92e819b96424e995d9a69d99758))
+* @applitools/logger bumped to 2.0.12
+  #### Code Refactoring
+
+  * disallow usage of global Buffer ([#1957](https://github.com/applitools/eyes.sdk.javascript1/issues/1957)) ([adcc082](https://github.com/applitools/eyes.sdk.javascript1/commit/adcc082f20f6b92e819b96424e995d9a69d99758))
+
+
+
+* @applitools/image bumped to 1.1.7
+  #### Bug Fixes
+
+  * avoid using ascii text decoder ([1b68d39](https://github.com/applitools/eyes.sdk.javascript1/commit/1b68d3945d96b17b9ab1f1a87d352206fd0c81d6))
+
+
+  #### Code Refactoring
+
+  * disallow usage of global Buffer ([#1957](https://github.com/applitools/eyes.sdk.javascript1/issues/1957)) ([adcc082](https://github.com/applitools/eyes.sdk.javascript1/commit/adcc082f20f6b92e819b96424e995d9a69d99758))
+
+
+
+* @applitools/spec-driver-webdriver bumped to 1.0.48
+
+* @applitools/driver bumped to 1.14.4
+  #### Code Refactoring
+
+  * disallow usage of global Buffer ([#1957](https://github.com/applitools/eyes.sdk.javascript1/issues/1957)) ([adcc082](https://github.com/applitools/eyes.sdk.javascript1/commit/adcc082f20f6b92e819b96424e995d9a69d99758))
+
+
+
+
 ## [3.8.13](https://github.com/applitools/eyes.sdk.javascript1/compare/js/screenshoter@3.8.12...js/screenshoter@3.8.13) (2023-09-29)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/screenshoter",
-  "version": "3.8.13",
+  "version": "3.8.15",
   "description": "Applitools universal screenshoter for web and native applications",
   "keywords": [
     "applitools",
@@ -43,7 +43,7 @@
     "test:unit": "MOCHA_GROUP=unit run --top-level mocha ./test/unit/*.spec.js",
     "test:it": "MOCHA_GROUP=it run --top-level mocha ./test/it/*.spec.js",
     "test:e2e": "yarn test:e2e:web && yarn test:e2e:android && yarn test:e2e:ios",
-    "test:e2e:web": "MOCHA_GROUP=web run --top-level mocha ./test/e2e/web/*.spec.js -r @applitools/test-utils/mocha-hooks/docker",
+    "test:e2e:web": "MOCHA_GROUP=web run --top-level mocha ./test/e2e/web/*.spec.js",
     "test:e2e:android": "APPLITOOLS_TEST_REMOTE=sauce MOCHA_GROUP=android run --top-level mocha ./test/e2e/android*/*.spec.js --parallel --jobs ${MOCHA_JOBS:-3}",
     "test:e2e:ios": "APPLITOOLS_TEST_REMOTE=sauce MOCHA_GROUP=ios run --top-level mocha ./test/e2e/ios*/*.spec.js --parallel --jobs ${MOCHA_JOBS:-4}",
     "setup": "yarn setup:web",
@@ -56,17 +56,16 @@
     "appium:setup": "mkdir -p ./logs && appium --address 127.0.0.1 --port 4723 --base-path /wd/hub --log-level error:info --log ./logs/appium.log --relaxed-security &"
   },
   "dependencies": {
-    "@applitools/image": "1.1.6",
-    "@applitools/logger": "2.0.11",
+    "@applitools/image": "1.1.7",
+    "@applitools/logger": "2.0.12",
     "@applitools/snippets": "2.4.24",
-    "@applitools/utils": "1.6.1"
+    "@applitools/utils": "1.6.2"
   },
   "devDependencies": {
-    "@applitools/driver": "^1.14.3",
-    "@applitools/spec-driver-webdriver": "^1.0.47",
+    "@applitools/driver": "^1.15.0",
+    "@applitools/spec-driver-webdriver": "^1.0.49",
     "@applitools/test-utils": "^1.5.17",
     "appium": "^1.22.3",
-    "chromedriver": "^115.0.1",
     "pixelmatch": "^5.3.0",
     "webdriver": "^7.31.1"
   },

package/src/take-screenshot.js

@@ -33,24 +33,28 @@ async function takeScreenshot({
   // screenshot of a window/app was requested (fully or viewport)
   const window = !region && (!frames || frames.length === 0)
 
-  const environment = await driver.getEnvironment()
+  const originalEnvironment = await driver.getEnvironment()
 
-  // switch worlds as needed
+  // world should be switched to webview if webview screenshot or the window screenshot is requested
+  // in case of window screenshot we will be switching to native app view
   let activeWorld
-  if (environment.isNative && (webview || (window && environment.isWeb))) {
+  if (originalEnvironment.isNative && (webview || (window && originalEnvironment.isWeb))) {
     if (webview === true) {
       const worlds = await driver.getWorlds()
       webview = worlds && worlds.find(name => name.includes('WEBVIEW'))
     }
     activeWorld = await driver.getCurrentWorld()
-    await driver.switchWorld(webview)
+    if (activeWorld !== webview) await driver.switchWorld(webview)
+    else activeWorld = undefined
   }
 
+  const environment = await driver.getEnvironment()
+
   // 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
   withStatusBar = withStatusBar && environment.isNative && window && (!fully || framed)
-  scrollingMode = environment.isNative ? 'scroll' : scrollingMode
+  scrollingMode = !environment.isWeb ? 'scroll' : scrollingMode
 
   const activeContext = driver.currentContext
   const context =
@@ -65,7 +69,7 @@ async function takeScreenshot({
     if (scrollingElement) {
       if (environment.isWeb && hideScrollbars) await scrollingElement.hideScrollbars()
       // this is unwanted but necessary side effect, because it is not possible to extract initial scroll position
-      if (environment.isNative && !window) await scrollingElement.scrollTo({x: 0, y: 0}, {force: true})
+      if (!environment.isWeb && !window) await scrollingElement.scrollTo({x: 0, y: 0}, {force: true})
       await scrollingElement.preserveState()
     }
   }
@@ -80,7 +84,7 @@ async function takeScreenshot({
     if (environment.isWeb && hideScrollbars) await target.scroller.hideScrollbars()
   }
 
-  if (!window && !environment.isNative) await scrollIntoViewport({...target, logger})
+  if (!window && environment.isWeb) await scrollIntoViewport({...target, logger})
 
   if (fully && !target.region && target.scroller) await target.scroller.moveTo({x: 0, y: 0})