fix #345

bbc · Dec 3, 2015 · 2478ed3 · 2478ed3
1 parent 1f36fe9
commit 2478ed3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/lib/wraith/javascript/_phantom__common.js b/lib/wraith/javascript/_phantom__common.js
@@ -33,7 +33,6 @@ module.exports = function (config) {
     currentDimensions = dimensions;
   }
 
-  page.viewportSize = { width: currentDimensions.viewportWidth, height: currentDimensions.viewportHeight};
   page.settings = { loadImages: true, javascriptEnabled: javascriptEnabled };
 
   // If you want to use additional phantomjs commands, place them here
@@ -58,18 +57,27 @@ module.exports = function (config) {
   });
 
   function runSetupJavaScriptThenCaptureImage() {
+    resize();
     if (globalBeforeCaptureJS) {
       require(globalBeforeCaptureJS)(page);
     }
     if (pathBeforeCaptureJS) {
       require(pathBeforeCaptureJS)(page);
     }
-    captureImage();
+    resizeAndCaptureImage();
   }
 
-  function captureImage() {
+  function resize() {
+    page.viewportSize = { width: currentDimensions.viewportWidth, height: currentDimensions.viewportHeight};
+  }
 
+  function resizeAndCaptureImage() {
     console.log('Snapping ' + url + ' at: ' + currentDimensions.viewportWidth + 'x' + currentDimensions.viewportHeight);
+    resize();
+    setTimeout(captureImage, 1000); // give page time to re-render properly
+  }
+
+  function captureImage() {
     page.clipRect = {
       top: 0,
       left: 0,
@@ -82,7 +90,7 @@ module.exports = function (config) {
     if (helper.takingMultipleScreenshots(dimensions) && dimensionsProcessed < dimensions.length) {
       currentDimensions = dimensions[dimensionsProcessed];
       image_name = helper.replaceImageNameWithDimensions(image_name, currentDimensions);
-      setTimeout(captureImage, 1000);
+      setTimeout(resizeAndCaptureImage, 1000);
     }
     else {
       // prevent CI from failing from 'Unsafe JavaScript attempt to access frame with URL about:blank from frame with URL' errors

diff --git a/lib/wraith/version.rb b/lib/wraith/version.rb
@@ -1,3 +1,3 @@
 module Wraith
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 end