From: Robert Konigsberg <konigsberg@gmail.com>
Date: Mon, 3 Jun 2013 19:41:05 +0000 (-0700)
Subject: Merge pull request #255 from kberg/master
X-Git-Tag: v1.0.0~27^2~1
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=08aa114abe7cd4e41b8bbef487a9b033f091a12a;hp=aa000f5121ef0fd24c61510c3de32c797cd69073;p=dygraphs.git

Merge pull request #255 from kberg/master

Add --verbose flag to test.sh and phantom-driver.js which gathers all output from the web page under test.
---

diff --git a/phantom-driver.js b/phantom-driver.js
index 9b98fdf..a782100 100644
--- a/phantom-driver.js
+++ b/phantom-driver.js
@@ -22,10 +22,16 @@ page.open(url, function(status) {
   }
 
   var testCase, test;
-  if (phantom.args.length == 1) {
-    var parts = phantom.args[0].split('.');
+  var verbose = false;
+  var optIdx = 0;
+  if (phantom.args.length > 0 && phantom.args[0] === "--verbose") {
+  verbose = true;
+  optIdx = 1;
+  }
+  if (phantom.args.length == optIdx + 1) {
+    var parts = phantom.args[optIdx].split('.');
     if (2 != parts.length) {
-      console.warn('Usage: phantomjs phantom-driver.js [testCase.test]');
+      console.warn('Usage: phantomjs phantom-driver.js [--verbose] [testCase.test]');
       phantom.exit();
     }
     testCase = parts[0];
@@ -39,7 +45,7 @@ page.open(url, function(status) {
     } else if (msg.substr(0, 'Running'.length) == 'Running') {
       loggingOn = false;
     }
-    if (loggingOn) console.log(msg);
+    if (verbose || loggingOn) console.log(msg);
   };
 
   page.onError = function (msg, trace) {
diff --git a/test.sh b/test.sh
index f54d6e0..9ca252e 100755
--- a/test.sh
+++ b/test.sh
@@ -16,4 +16,4 @@ if [ $? != 0 ]; then
   exit 1
 fi
 
-phantomjs phantom-driver.js
+phantomjs phantom-driver.js $*