added dummy url when scripting, needed for webdriver scripts

Author: marcelduran

README.md

@@ -670,6 +670,7 @@ $ npm test
 
 ## Changelog
 
+* 0.3.1: Added dummy url when scripting, needed for webdriver scripting on mobbile agents
 * 0.3.0: Replaced xmlResult.php by jsonResult.php WPT API endpoint for fetching test results
 * 0.2.5: Added test options: custom, chrometrace, callstack, tester; Added chrometrace command (`getChromeTraceData` method)
 * 0.2.4: Added test options: clearcerts, medianvideo, datareduction, useragent and tsview; HTTPS support to listen/proxy server

lib/webpagetest.js

@@ -300,6 +300,10 @@ function runTest(what, options, callback) {
 
   // testing url or script?
   query[reSpace.test(what) ? 'script' : 'url'] = what;
+  // set dummy url when scripting, needed when webdriver script
+  if (query.script) {
+    query.url = 'http://www.webpagetest.org';
+  }
   helper.setQuery(mapping.commands.test, options, query);
 
   // connectivity

package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpagetest",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "WebPageTest API wrapper for NodeJS",
   "author": "Marcel Duran <github@marcelduran.com> (http://github.com/marcelduran)",
   "homepage": "http://github.com/marcelduran/webpagetest-api",

test/command-line-test.js

@@ -126,7 +126,7 @@ describe('WebPageTest Command Line', function() {
     exec(mock('test ' + encodeURIComponent(script)), function(err, data) {
       if (err) return done(err);
       data = JSON.parse(data);
-      assert.equal(data.url, wptServer + 'runtest.php?script=logData%090%0Anavigate%09http%3A%2F%2Ffoo.com%2Flogin%0A%2F%2F%20log%20some%20data%0AlogData%091%0AsetValue%09name%3Dusername%09johndoe%0AsetValue%09name%3Dpassword%0912345%0AsubmitForm%09action%3Dhttp%3A%2F%2Ffoo.com%2Fmain%0AwaitForComplete&f=json');
+      assert.equal(data.url, wptServer + 'runtest.php?script=logData%090%0Anavigate%09http%3A%2F%2Ffoo.com%2Flogin%0A%2F%2F%20log%20some%20data%0AlogData%091%0AsetValue%09name%3Dusername%09johndoe%0AsetValue%09name%3Dpassword%0912345%0AsubmitForm%09action%3Dhttp%3A%2F%2Ffoo.com%2Fmain%0AwaitForComplete&url=http%3A%2F%2Fwww.webpagetest.org&f=json');
       done();
     });
   });
@@ -137,7 +137,7 @@ describe('WebPageTest Command Line', function() {
     exec(mock('test ' + filename), function(err, data) {
       if (err) return done(err);
       data = JSON.parse(data);
-      assert.equal(data.url, wptServer + 'runtest.php?script=logData%090%0Anavigate%09http%3A%2F%2Ffoo.com%2Flogin%0A%2F%2F%20log%20some%20data%0AlogData%091%0AsetValue%09name%3Dusername%09johndoe%0AsetValue%09name%3Dpassword%0912345%0AsubmitForm%09action%3Dhttp%3A%2F%2Ffoo.com%2Fmain%0AwaitForComplete%0A&f=json');
+      assert.equal(data.url, wptServer + 'runtest.php?script=logData%090%0Anavigate%09http%3A%2F%2Ffoo.com%2Flogin%0A%2F%2F%20log%20some%20data%0AlogData%091%0AsetValue%09name%3Dusername%09johndoe%0AsetValue%09name%3Dpassword%0912345%0AsubmitForm%09action%3Dhttp%3A%2F%2Ffoo.com%2Fmain%0AwaitForComplete%0A&url=http%3A%2F%2Fwww.webpagetest.org&f=json');
       done();
     });
   });

test/dryrun-test.js

@@ -151,7 +151,7 @@ describe('Dry Run', function() {
 
         wpt.runTest(script, {dryRun: true}, function (err, data) {
         if (err) return done(err);
-        assert.equal(data.url, wptServer + 'runtest.php?script=logData%090%0Anavigate%09http%3A%2F%2Ffoo.com%2Flogin%0A%2F%2F%20log%20some%20data%0AlogData%091%0AsetValue%09name%3Dusername%09johndoe%0AsetValue%09name%3Dpassword%0912345%0AsubmitForm%09action%3Dhttp%3A%2F%2Ffoo.com%2Fmain%0AwaitForComplete&f=json');
+        assert.equal(data.url, wptServer + 'runtest.php?script=logData%090%0Anavigate%09http%3A%2F%2Ffoo.com%2Flogin%0A%2F%2F%20log%20some%20data%0AlogData%091%0AsetValue%09name%3Dusername%09johndoe%0AsetValue%09name%3Dpassword%0912345%0AsubmitForm%09action%3Dhttp%3A%2F%2Ffoo.com%2Fmain%0AwaitForComplete&url=http%3A%2F%2Fwww.webpagetest.org&f=json');
         done();
       });
     });

test/helpers/nock-server.js

@@ -17,7 +17,7 @@ var reqResMap = {
   '/getTesters.php': 'testers.xml',
   '/runtest.php?url=http%3A%2F%2Ftwitter.com%2Fmarcelduran&f=json': 'runTest.json',
   '/runtest.php?url=http%3A%2F%2Ftwitter.com%2Fmarcelduran&location=Local_Firefox_Chrome%3AChrome&runs=3&fvonly=1&label=test%20123&timeline=1&netlog=1&pngss=1&f=json': 'runTest.json',
-  '/runtest.php?script=logData%090%0Anavigate%09http%3A%2F%2Ffoo.com%2Flogin%0A%2F%2F%20log%20some%20data%0AlogData%091%0AsetValue%09name%3Dusername%09johndoe%0AsetValue%09name%3Dpassword%0912345%0AsubmitForm%09action%3Dhttp%3A%2F%2Ffoo.com%2Fmain%0AwaitForComplete&f=json': 'runTest.json',
+  '/runtest.php?script=logData%090%0Anavigate%09http%3A%2F%2Ffoo.com%2Flogin%0A%2F%2F%20log%20some%20data%0AlogData%091%0AsetValue%09name%3Dusername%09johndoe%0AsetValue%09name%3Dpassword%0912345%0AsubmitForm%09action%3Dhttp%3A%2F%2Ffoo.com%2Fmain%0AwaitForComplete&url=http%3A%2F%2Fwww.webpagetest.org&f=json': 'runTest.json',
   '/getgzip.php?test=120816_V2_2&file=1_pagespeed.txt': 'pageSpeed.json',
   '/export.php?test=120816_V2_2': 'har.json',
   '/getgzip.php?test=120816_V2_2&file=1_progress.csv': 'utilization.csv',
@@ -55,7 +55,7 @@ var reqResMap = {
   '/testStatus.php?test=120816_V2_3': 'testStatusNotFound.json',
   '/jsonResult.php?test=120816_V2_3': 'testResultsNotFound.json',
   '/runtest.php?url=&f=json': 'runTestInvalid.json',
-  '/runtest.php?script=&f=json': 'runTestInvalid.json',
+  '/runtest.php?script=&url=http%3A%2F%2Fwww.webpagetest.org&f=json': 'runTestInvalid.json',
   '/getgzip.php?test=120816_V2_3&file=1_pagespeed.txt': '',
   '/export.php?test=120816_V2_3': 'harNotFound.json',
   '/waterfall.php?test=120816_V2_3&run=1&cached=0': 'waterfallNotFound.png',