updated devtools timeline (dedicated) url

Author: marcelduran

lib/webpagetest.js

@@ -34,14 +34,14 @@ var paths = {
   videoCreation: 'video/create.php',
   videoView: 'video/view.php',
   googleCsi: 'google/google_csi.php',
-  responseBody: 'response_body.php'
+  responseBody: 'response_body.php',
+  timeline: 'getTimeline.php'
 };
 
 var filenames = {
   pageSpeed: 'pagespeed.txt',
   utilization: 'progress.csv',
   request: 'IEWTR.txt',
-  timeline: 'timeline.json',
   netLog: 'netlog.txt',
   consoleLog: 'console_log.json',
   testInfo: 'testinfo.json',
@@ -500,13 +500,13 @@ function getRequestData(id, options, callback) {
 }
 
 function getTimelineData(id, options, callback) {
+  var query;
+
   callback = callback || options;
   options = options === callback ? undefined : options;
+  query = setFilename({test: id}, options, true);
 
-  return api.call(this, paths.gzip, callback, {
-    test: id,
-    file: setFilename(filenames.timeline, options)
-  }, options);
+  return api.call(this, paths.timeline, callback, query, options);
 }
 
 function getNetLogData(id, options, callback) {

test/command-line-test.js

@@ -196,11 +196,20 @@ describe('WebPageTest Command Line', function() {
     });
   });
 
-  it('gets a timeline data input returns the API url', function(done) {
+  it('gets a timeline data input returns the default API url', function(done) {
     exec(mock('timeline 120816_V2_2'), function(err, data) {
       if (err) return done(err);
       data = JSON.parse(data);
-      assert.equal(data.url, wptServer + 'getgzip.php?test=120816_V2_2&file=1_timeline.json');
+      assert.equal(data.url, wptServer + 'getTimeline.php?test=120816_V2_2');
+      done();
+    });
+  });
+
+  it('gets a custom timeline data input returns the API url', function(done) {
+    exec(mock('timeline 120816_V2_2 -r 2 --cached'), function(err, data) {
+      if (err) return done(err);
+      data = JSON.parse(data);
+      assert.equal(data.url, wptServer + 'getTimeline.php?test=120816_V2_2&run=2&cached=1');
       done();
     });
   });

test/dryrun-test.js

@@ -204,10 +204,22 @@ describe('Dry Run', function() {
       });
     });
 
-    it('gets timeline data request', function(done) {
+    it('gets default timeline data request', function(done) {
       wpt.getTimelineData('120816_V2_2', {dryRun: true}, function (err, data) {
         if (err) return done(err);
-        assert.equal(data.url, wptServer + 'getgzip.php?test=120816_V2_2&file=1_timeline.json');
+        assert.equal(data.url, wptServer + 'getTimeline.php?test=120816_V2_2');
+        done();
+      });
+    });
+
+    it('gets custom timeline data request', function(done) {
+      wpt.getTimelineData('120816_V2_2', {
+        run: 2,
+        cached: true,
+        dryRun: true
+      }, function (err, data) {
+        if (err) return done(err);
+        assert.equal(data.url, wptServer + 'getTimeline.php?test=120816_V2_2&run=2&cached=1');
         done();
       });
     });

test/helpers/nock-server.js

@@ -22,7 +22,7 @@ var reqResMap = {
   '/export.php?test=120816_V2_2': 'har.json',
   '/getgzip.php?test=120816_V2_2&file=1_progress.csv': 'utilization.csv',
   '/getgzip.php?test=120816_V2_2&file=1_IEWTR.txt': 'request.txt',
-  '/getgzip.php?test=120816_V2_2&file=1_timeline.json': 'timeline.json',
+  '/getTimeline.php?test=120816_V2_2': 'timeline.json',
   '/getgzip.php?test=120816_V2_2&file=1_netlog.txt': 'netLog.txt',
   '/getgzip.php?test=120816_V2_2&file=1_console_log.json': 'consoleLog.json',
   '/getgzip.php?test=120816_V2_2&file=testinfo.json': 'testInfo.json',