added test results extra data options

Author: marcelduran

lib/helper.js

@@ -46,14 +46,22 @@ function xmlToObj(xml) {
               val = o[a[0]];
               o[a[0]] = [val];
             }
-            newObj = {};
-            o[a[0]].push(newObj);
+            if (len === 2) {
+              return rec([o[a[0]].length, a[1]], o[a[0]]);
+            } else {
+              newObj = {};
+              o[a[0]].push(newObj);
+            }
           } else {
             o[a[0]] = {};
           }
           for (i = 1, len = a.length; i < len; i += 1) {
             rec(a[i], newObj || o[a[0]]);
           }
+        } else if (len === undefined && typeof a === 'object') {
+          Object.keys(a).forEach(function(key) {
+            o[key] = a[key];
+          });
         }
       };
 

lib/mapping.js

@@ -413,6 +413,34 @@ var options = {
     }
   },
   results: {
+    'breakdown': {
+      name: 'breakDown',
+      key: 'b',
+      api: 'breakdown',
+      bool: true,
+      info: 'include the breakdown of requests and bytes by mime type'
+    },
+    'domains': {
+      name: 'domains',
+      key: 'D',
+      api: 'domains',
+      bool: true,
+      info: 'include the breakdown of requests and bytes by domain'
+    },
+    'pagespeed': {
+      name: 'pageSpeed',
+      key: 'p',
+      api: 'pagespeed',
+      bool: true,
+      info: 'include the PageSpeed score in the response (may be slower)'
+    },
+    'requests': {
+      name: 'requests',
+      key: 'R',
+      api: 'requests',
+      bool: true,
+      info: 'include the request data in the response (slower and results in much larger responses)'
+    },
     'median': {
       name: 'medianMetric',
       key: 'm',

test/command-line-test.js

@@ -54,6 +54,16 @@ describe('WebPageTest Command Line', function() {
     });
   });
 
+  it('gets a test results with extra data input returns the API url', function(done) {
+    exec(mock('results 130724_YD_8JX -bDpR'), function(err, data) {
+      if (err) return done(err);
+      data = JSON.parse(data);
+        assert.equal(data.url, wptServer +
+          'xmlResult.php?test=130724_YD_8JX&breakdown=1&domains=1&pagespeed=1&requests=1');
+      done();
+    });
+  });
+
   it('gets the locations list input returns the API url', function(done) {
     exec(mock('locations'), function(err, data) {
       if (err) return done(err);

test/dryrun-test.js

@@ -62,6 +62,21 @@ describe('Dry Run', function() {
       });
     });
 
+    it('gets a test results with extra data request', function(done) {
+      wpt.getTestResults('130724_YD_8JX', {
+        breakDown: true,
+        domains: true,
+        pageSpeed: true,
+        requests: true,
+        dryRun: true
+      }, function (err, data) {
+        if (err) return done(err);
+        assert.equal(data.url, wptServer +
+          'xmlResult.php?test=130724_YD_8JX&breakdown=1&domains=1&pagespeed=1&requests=1');
+        done();
+      });
+    });
+
     it('gets the locations list request', function(done) {
       wpt.getLocations({dryRun: true}, function (err, data) {
         if (err) return done(err);

test/fixtures/command-line/help-results.txt

@@ -4,6 +4,10 @@
   Options:
 
     -h, --help                  output usage information
+    -b, --breakdown             include the breakdown of requests and bytes by mime type
+    -D, --domains               include the breakdown of requests and bytes by domain
+    -p, --pagespeed             include the PageSpeed score in the response (may be slower)
+    -R, --requests              include the request data in the response (slower and results in much larger responses)
     -m, --median <metric>       set the metric used to calculate median for multiple runs tests [loadTime]
     -S, --specs <json_or_file>  set the specs for performance test suite
     -r, --reporter <name>       set performance test suite reporter output: [dot]|spec|tap|xunit|list|progress|min|nyan|landing|json|doc|markdown|teamcity

test/fixtures/command-line/help-test.txt

@@ -53,6 +53,10 @@
         --wait [hostname:port]    wait for test results informed by agent once complete listening on <hostname>:<port> [hostname:first port available above 8000]
         --timeout <seconds>       timeout for polling and waiting results [no timeout]
     -e, --request <id>            echo request ID, useful to track asynchronous requests
+        --breakdown               include the breakdown of requests and bytes by mime type
+        --domains                 include the breakdown of requests and bytes by domain
+        --pagespeed               include the PageSpeed score in the response (may be slower)
+        --requests                include the request data in the response (slower and results in much larger responses)
         --median <metric>         set the metric used to calculate median for multiple runs tests [loadTime]
         --specs <json_or_file>    set the specs for performance test suite
         --reporter <name>         set performance test suite reporter output: [dot]|spec|tap|xunit|list|progress|min|nyan|landing|json|doc|markdown|teamcity