Pull request feedback :

1) Changed x, y to width, height 2) Removed setTimeout, and simplified viewport changing 3) Wrote tests - tested on both phantomjs and slimerjs
nathanboktae · Apr 27, 2016 · dbb310a · dbb310a
1 parent 118eb8f
commit dbb310a
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -124,8 +124,8 @@ if (window.callPhantom) {
 if (window.callPhantom) {
   window.callPhantom({
     viewportSize : {
-      x : 100,
-      y : 100
+      width : 100,
+      height : 100
     }
   });
 }

diff --git a/mocha-phantomjs-core.js b/mocha-phantomjs-core.js
@@ -114,15 +114,11 @@ page.onCallback = function(data) {
       output.write(data.stdout)
     } else if (typeof data.screenshot === 'string') {
       page.render(data.screenshot + '.png')
-    } else if (data.viewportSize && (data.viewportSize.x || data.viewportSize.y)) {
-      setTimeout(function() {
-        page.viewportSize = (function(_page, _current, _x, _y) {
-          return _page.viewportSize = {
-            width : _x || _current.width,
-            height : _y || _current.height
-          };
-        })(page, page.viewportSize, data.viewportSize.x, data.viewportSize.y);
-      }, 0);
+    } else if (data.viewportSize && (data.viewportSize.width || data.viewportSize.height)) {
+      page.viewportSize = {
+        width: data.viewportSize.width || page.viewportSize.width,
+        height: data.viewportSize.height || page.viewportSize.height,
+      }
     } else if (data.configureColWidth) {
       page.evaluate(function(columns) {
         Mocha.reporters.Base.window.width = columns

diff --git a/test/lib/viewport-size.js b/test/lib/viewport-size.js
@@ -0,0 +1,23 @@
+describe('Viewport Size Change', function() {
+  it('changes viewport size', function() {
+    if (window.callPhantom) {
+    	console.log("Changing viewport size to : width 500, height 500")
+    	callPhantom({'viewportSize': { width : 500, height : 500}})
+    }
+  });
+
+  it('changes viewport size - only on width', function() {
+  	if (window.callPhantom) {
+	  	console.log("Changing viewport size to : width 1000")
+		callPhantom({'viewportSize': { width : 1000}})
+  	}
+  })
+
+  it('chanves viewport size - only on height', function() {
+  	if (window.callPhantom) {
+	  	console.log("Changing viewport size to : height 1000")
+	    callPhantom({'viewportSize': { height : 1000}})
+  	}
+  })
+});
+
diff --git a/test/viewport-size.html b/test/viewport-size.html
@@ -0,0 +1,20 @@
+<html>
+  <head>
+    <title>Viewport size test</title>
+    <meta charset="utf-8">
+    <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
+  </head>
+  <body>
+    <div id="mocha"></div>
+    <script src="../node_modules/mocha/mocha.js"></script>
+    <script>
+      mocha.ui('bdd'); 
+      mocha.reporter('html');
+    </script>
+    <script src="lib/viewport-size.js"></script>
+    <script>
+      mocha.run();
+    </script>
+  </body>
+</html>
+