added command line for video/player and tests

Author: marcelduran

lib/mapping.js

@@ -539,6 +539,16 @@ var options = {
       param: 'api_key',
       info: 'API key (if assigned). Contact the WebPageTest server administrator for a key if required'
     }
+  },
+  'video': {
+    'end': {
+      name: 'comparisonEndPoint',
+      key: 'e',
+      api: 'end',
+      param: 'end_point',
+      info: 'frame comparison end point: [visual]=visually complete | all=last change | doc=document complete | full=fully loaded',
+      valid: /^(?:visual|all|doc|full)$/
+    }
   }
 };
 
@@ -642,6 +652,17 @@ var commands = {
     options: [options.run, options.image, options.screenshot],
     info: 'get the fully loaded page screenshot in JPG format (PNG if in full resolution)'
   },
+  'video': {
+    name: 'createVideo',
+    param: 'tests',
+    options: [options.video],
+    info: 'create a video from <tests> (comma separated test ids)'
+  },
+  'player': {
+    name: 'getEmbedVideoPlayer',
+    param: 'id',
+    info: 'get a html5 player for a video <id>'
+  },
   'listen': {
     name: 'listen',
     param: 'hostname:port',

lib/webpagetest.js

@@ -626,7 +626,7 @@ function createVideo(tests, options, callback) {
   var params = {
     tests: tests,
     f: 'json',
-    end: options.end || 'visual'
+    end: options.comparisonEndPoint || 'visual'
   };
 
   api.call(this, paths.videoCreation, callback, params, options);

test/command-line-test.js

@@ -298,7 +298,7 @@ describe('WebPageTest Command Line', function() {
   [
     '', 'status', 'results', 'locations', 'testers', 'test', 'cancel', 'har',
     'pagespeed', 'utilization', 'request', 'timeline', 'netlog', 'console',
-    'testinfo', 'history', 'waterfall', 'screenshot', 'listen'
+    'testinfo', 'history', 'waterfall', 'screenshot', 'listen', 'video'
   ].forEach(function eachCmd(command) {
       it('gets a ' + command + ' help input and returns the help text', function(done) {
         exec(mock(command + ' --help'), function(err, data) {

test/dryrun-test.js

@@ -372,6 +372,14 @@ describe('Dry Run', function() {
       });
     });
 
+    it('create a video with document complete comparison end point', function (done) {
+      wpt.createVideo('130416_YS_KD4-r:3-c:1,130416_W6_KEE-r:8-c:1', {dryRun: true, comparisonEndPoint: 'doc'}, function (err, data) {
+        if (err) throw err;
+        assert.equal(data.url, wptServer + 'video/create.php?tests=130416_YS_KD4-r%3A3-c%3A1%2C130416_W6_KEE-r%3A8-c%3A1&f=json&end=doc');
+        done();
+      });
+    });
+
     it('get the url of an embedded video', function (done) {
       wpt.getEmbedVideoPlayer('130416_36ed6e37013655a14b2b857cdccec99db72adcaa', {dryRun: true}, function (err, data) {
         if (err) throw err;

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

@@ -0,0 +1,8 @@
+
+  Usage: video [options] <tests>
+
+  Options:
+
+    -h, --help             output usage information
+    -e, --end <end_point>  frame comparison end point: [visual]=visually complete | all=last change | doc=document complete | full=fully loaded
+

test/fixtures/command-line/help.txt

@@ -20,6 +20,8 @@
     history [days]         get history of previously run tests
     waterfall [options] <id> get the waterfall PNG image
     screenshot [options] <id> get the fully loaded page screenshot in JPG format (PNG if in full resolution)
+    video [options] <tests> create a video from <tests> (comma separated test ids)
+    player <id>            get a html5 player for a video <id>
     listen [hostname:port] start webpagetest-api server on <hostname>:<port> [hostname:7791]
     batch <file>           run commands in batch, i.e. one command per line from <file> in parallel