feat: add screenshotDelay option for screenShooter

ruslanxdev · ruslanxdev · commit 250afe0af779 · 2019-04-04T13:36:56.000+03:00
diff --git a/lib/screen-shooter/index.js b/lib/screen-shooter/index.js
@@ -13,18 +13,18 @@ module.exports = class ScreenShooter {
         this._browser = browser;
     }
 
-    capture(page, {allowViewportOverflow = false} = {}) {
-        return this._browser.captureViewportImage(page)
+    capture(page, {allowViewportOverflow = false, screenshotDelay} = {}) {
+        return this._browser.captureViewportImage(page, screenshotDelay)
             .then((viewportImage) => Viewport.create(page.viewport, viewportImage, page.pixelRatio, allowViewportOverflow))
-            .then((viewport) => this._cropImage(viewport, page));
+            .then((viewport) => this._cropImage(viewport, page, screenshotDelay));
     }
 
-    _cropImage(viewport, page) {
+    _cropImage(viewport, page, screenshotDelay) {
         try {
             viewport.validate(page.captureArea, this._browser);
         } catch (e) {
             return e instanceof HeightViewportError && this._browser.config.compositeImage
-                ? this._extendImage(viewport, page)
+                ? this._extendImage(viewport, page, screenshotDelay)
                 : Promise.reject(e);
         }
 
@@ -33,7 +33,7 @@ module.exports = class ScreenShooter {
         return viewport.crop(page.captureArea);
     }
 
-    _extendImage(viewport, page) {
+    _extendImage(viewport, page, screenshotDelay) {
         const scrollHeight = Math.min(
             viewport.getVerticalOverflow(page.captureArea),
             page.viewport.height
@@ -43,9 +43,9 @@ module.exports = class ScreenShooter {
             .scrollBy(0, scrollHeight)
             .then(() => {
                 page.viewport.top += scrollHeight;
-                return this._browser.captureViewportImage(page);
+                return this._browser.captureViewportImage(page, screenshotDelay);
             })
             .then((newImage) => viewport.extendBy(scrollHeight, newImage))
-            .then(() => this._cropImage(viewport, page));
+            .then(() => this._cropImage(viewport, page, screenshotDelay));
     }
 };
diff --git a/test/lib/screen-shooter/index.js b/test/lib/screen-shooter/index.js
@@ -20,7 +20,7 @@ describe('screen-shooter', () => {
         let browser;
 
         const stubPage = (page) => Object.assign({viewport: {}, captureArea: {}}, page);
-        const capture = (page, errorHandler) => ScreenShooter.create(browser, errorHandler).capture(stubPage(page));
+        const capture = (page, errorHandler, opts) => ScreenShooter.create(browser, errorHandler).capture(stubPage(page), opts);
 
         beforeEach(() => {
             browser = {
@@ -56,6 +56,11 @@ describe('screen-shooter', () => {
                 .then(() => assert.calledOnceWith(Viewport.create, 'foo', {baz: 'qux'}, 'bar'), {allowViewportOverflow: true});
         });
 
+        it('should pass screenshotDelay from options option to captureViewportImage', async () => {
+            await capture(stubPage(), {}, {screenshotDelay: 2000});
+            assert.calledWithMatch(browser.captureViewportImage, sinon.match.any, 2000);
+        });
+
         it('should crop image of passed size', () => {
             return capture({captureArea: {foo: 'bar'}})
                 .then(() => assert.calledOnceWith(Viewport.prototype.crop, {foo: 'bar'}));
