fix(assertView): do not fall when trying to take screenshot of the vi…

…ewport
gemini-testing · Sep 6, 2024 · 8fa3599 · 8fa3599
1 parent 20318df
commit 8fa3599
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/browser/client-scripts/index.js b/src/browser/client-scripts/index.js
@@ -112,12 +112,13 @@ function prepareScreenshotUnsafe(areas, opts) {
     } else if (allowViewportOverflow && viewPort.rectIntersects(rect)) {
         rect.overflowsTopBound(viewPort) && rect.recalculateHeight(viewPort);
         rect.overflowsLeftBound(viewPort) && rect.recalculateWidth(viewPort);
-    } else if (!captureElementFromTop && !viewPort.rectIntersects(rect)) {
+    } else if (!captureElementFromTop && !allowViewportOverflow && !viewPort.rectIntersects(rect)) {
         return {
             error: "OUTSIDE_OF_VIEWPORT",
             message:
                 "Can not capture element, because it is outside of viewport. " +
-                'Try to set "captureElementFromTop=true" to scroll to it before capture.'
+                'Try to set "captureElementFromTop=true" to scroll to it before capture' +
+                ' or to set "allowViewportOverflow=true" to ignore viewport overflow error.'
         };
     }
 

diff --git a/src/browser/commands/assert-view/index.js b/src/browser/commands/assert-view/index.js
@@ -175,7 +175,7 @@ module.exports.default = browser => {
     };
 
     const assertViewByViewport = async (state, opts) => {
-        opts = _.defaults(opts, {
+        opts = Object.assign(opts, {
             allowViewportOverflow: true,
             compositeImage: false,
             captureElementFromTop: false,