added missing aliases

Author: marcelduran

lib/helper.js

@@ -214,7 +214,8 @@ function setQuery(map, options, query) {
         if (param.array) {
           value = [].concat(value).join(' ');
         }
-        query[param.api] = param.bool ? (value ? 1 : 0) : value;
+        query[param.api] = param.bool ? param.invert ?
+          (value ? 0 : 1) : (value ? 1 : 0) : value;
       }
     });
   });

lib/mapping.js

@@ -452,6 +452,7 @@ var options = {
     },
     'requests': {
       name: 'requests',
+      api: 'requests',
       key: 'R',
       param: 'items',
       info: 'filter requests (e.g.:1,2,3,4-9,8) [all]'

lib/webpagetest.js

@@ -182,8 +182,9 @@ function setFilename(input, options) {
 
   options = options || {};
 
-  run = parseInt(options.run, 10) || 1;
-  cached = options.repeatView ? filenames.cached : '';
+  run = parseInt(options.run || options.r, 10) || 1;
+  cached = (options.repeatView || options.cached || options.c) ?
+    filenames.cached : '';
 
   if (typeof input === 'string') {
     return run + cached + '_' + input;
@@ -496,37 +497,29 @@ function getTestInfo(id, options, callback) {
 }
 
 function getWaterfallImage(id, options, callback) {
-  var params,
+  var query,
       pathname = paths.waterfall;
 
   callback = callback || options;
   options = options === callback ? {} : options;
-  params = setFilename({test: id}, options),
+  query = setFilename({test: id}, options),
   options.encoding = options.encoding || 'binary';
+  options.dataURI = options.dataURI || options.uri || options.u;
   options.parser = options.parser ||
     (options.dataURI ? helper.dataURI : undefined);
   options.args = options.args || {
     type: 'image/png',
     encoding: options.dataURI ? 'utf8' : options.encoding
   };
 
-  if (options.thumbnail) {
+  if (options.thumbnail || options.t) {
     pathname = paths.thumbnail;
-    params.file = setFilename(filenames.waterfall, options);
+    query.file = setFilename(filenames.waterfall, options);
   }
 
-  Object.keys(mapping.options.waterfall).forEach(function wfParamsEach(key) {
-    var param = mapping.options.waterfall[key],
-        name = param.name,
-        value = options[name] || options[key];
-
-    if (value !== undefined) {
-      params[param.api || name] =
-        param.bool ? param.invert ? (value ? 0 : 1) : (value ? 1 : 0) : value;
-    }
-  });
+  helper.setQuery(mapping.commands.waterfall, options, query);
 
-  return api.call(this, pathname, callback, params, options);
+  return api.call(this, pathname, callback, query, options);
 }
 
 function getScreenshotImage(id, options, callback) {
@@ -538,14 +531,15 @@ function getScreenshotImage(id, options, callback) {
   callback = callback || options;
   options = options === callback ? {} : options;
   options.encoding = options.encoding || 'binary';
+  options.dataURI = options.dataURI || options.uri || options.u;
   options.parser = options.parser ||
     (options.dataURI ? helper.dataURI : undefined);
 
-  if (options.startRender) {
+  if (options.startRender || options.render || options.n) {
     filename = filenames.screenshotStartRender;
-  } else if (options.documentComplete) {
+  } else if (options.documentComplete || options.complete || options.p) {
     filename = filenames.screenshotDocumentComplete;
-  } else if (options.fullResolution) {
+  } else if (options.fullResolution || options.full || options.f) {
     filename = filenames.screenshotFullResolution;
     type = 'png';
   }
@@ -556,7 +550,7 @@ function getScreenshotImage(id, options, callback) {
 
   params.file = setFilename(filename, options);
 
-  if (options.thumbnail) {
+  if (options.thumbnail || options.t) {
     pathname = paths.thumbnail;
     params = setFilename(params, options);
   }

test/dryrun-test.js

@@ -299,5 +299,38 @@ describe('Dry Run', function() {
       });
     });
 
+    it('gets a customized waterfall image request with aliases', function(done) {
+      wpt.waterfall('120816_V2_2', {
+        type: 'connection',
+        mime: true,
+        width: 640,
+        max: 9,
+        R: '1,2,4,6-8',
+        C: true,
+        b: true,
+        noellipsis: true,
+        l: true,
+        dryRun: true
+      }, function (err, data) {
+        if (err) return done(err);
+        assert.equal(data.url, wptServer + 'waterfall.php?test=120816_V2_2&run=1&cached=0&type=connection&mime=1&width=640&max=9&dots=0&requests=1%2C2%2C4%2C6-8&cpu=0&bw=0&labels=0');
+        done();
+      });
+    });
+
+    it('gets a screenshot thumbnail request with aliases', function(done) {
+      wpt.screenshot('120816_V2_2', {
+        cached: true,
+        r: 2,
+        t: true,
+        complete: true,
+        dryRun: true
+      }, function (err, data) {
+        if (err) return done(err);
+        assert.equal(data.url, wptServer + 'thumbnail.php?test=120816_V2_2&file=2_Cached_screen_doc.jpg&run=2&cached=1');
+        done();
+      });
+    });
+
   });
 });