added wappalyzerpr to test runs

Author: max-ostapenko

README.md

@@ -139,6 +139,7 @@ _The default WPT server can also be specified via environment variable `WEBPAGET
 - **-b, --block** _\<urls\>_: space-delimited list of urls to block (substring match)
 - **-Z, --spof** _\<domains\>_: space-delimited list of domains to simulate failure by re-routing to blackhole.webpagetest.org to silently drop all requests
 - **-c, --custom** _\<script\>_: execute arbitrary javascript at the end of a test to collect custom metrics
+- **-w, --wappalyzerpr** _\<number\>_: set the wappalyzer fork PR number to use for technology detection
 - **-a, --authtype** _\<type\>_: type of authentication: 0 = Basic, 1 = SNS [0]
 - **-n, --notify** _\<e-mail\>_: e-mail address to notify with the test results
 - **-B, --pingback** _\<url\>_: URL to ping when the test is complete (the test ID will be passed as an "id" parameter)
@@ -316,7 +317,7 @@ webpagetest status 121025_PT_N8K -k YOURAPIKEY
 #### 4. Get test results
 
 ```bash
-webpagetest results 121025_PT_N8K -k YOURAPIKEY 
+webpagetest results 121025_PT_N8K -k YOURAPIKEY
 ```
 
 ```javascript
@@ -517,6 +518,7 @@ wpt.runTest(script, (err, data) => {
 - **block**: _String_, space-delimited list of urls to block (substring match)
 - **spof**: _String_, space-delimited list of domains to simulate failure by re-routing to blackhole.webpagetest.org to silently drop all requests
 - **customMetrics**: _String_, execute arbitrary JavaScript at the end of a test to collect custom metrics
+- **wappalyzerpr** _Integer_, set the wappalyzer fork PR number to use for technology detection
 - **authenticationType**: _Number_, type of authentication: 0 = Basic, 1 = SNS [0]
 - **notifyEmail**: _String_, e-mail address to notify with the test results
 - **pingback**: _String_, URL to ping when the test is complete (the test ID will be passed as an "id" parameter)

lib/mapping.js

@@ -307,6 +307,14 @@ var options = {
       info: "execute arbitrary JavaScript at the end of a test to collect custom metrics",
     },
 
+    wappalyzerpr: {
+      name: "wappalyzerpr",
+      key: "wpr",
+      api: "wappalyzerpr",
+      param: "number",
+      info: "PR number of the Wappalyzer fork to use in technology detection",
+    },
+
     // API only settings
     authtype: {
       name: "authenticationType",
@@ -836,6 +844,13 @@ var options = {
       param: "script",
       info: "execute arbitrary JavaScript at the end of a test to collect custom metrics",
     },
+    wappalyzerpr: {
+      name: "wappalyzerpr",
+      key: "wpr",
+      api: "wappalyzerpr",
+      param: "number",
+      info: "PR number of the Wappalyzer fork to use in technology detection",
+    },
 
     // API only settings
     authtype: {

test/command-line-test.js

@@ -102,11 +102,12 @@ describe('WebPageTest Command Line', function() {
         '--first ' +
         '--timeline ' +
         '--netlog ' +
+        '--wappalyzerpr 1 ' +
         '--full'
       ), function(err, data) {
       if (err) return done(err);
       data = JSON.parse(data);
-      assert.equal(data.url, wptServer + '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');
+      assert.equal(data.url, wptServer + '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&wappalyzerpr=1&pngss=1&f=json');
       done();
     });
   });

test/edge-cases-test.js

@@ -85,6 +85,17 @@ describe('Edge Cases of', function() {
       });
     });
 
+    it('gets a test with custom wappalyzer rules then returns API url', function (done) {
+      wpt.runTest('http://foobar.com', {
+        dryRun: true,
+        wappalyzerpr: 1,
+      }, function (err, data) {
+        if (err) return done(err);
+        assert.equal(data.url, wptServer + 'runtest.php?url=http%3A%2F%2Ffoobar.com&wappalyzerpr=1&f=json');
+        done();
+      });
+    });
+
   });
 
   describe('WebPageTest localhost helper', function() {

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

@@ -60,7 +60,7 @@ Options:
                                       switches (Chrome only)
       --lighthouse                    perform lighthouse test (Chrome only,
                                       Linux agent only)
-  -thc, --throttleCPU <number>        custom cpu throttling    
+  -thc, --throttleCPU <number>        custom cpu throttling
   -g, --login <username>              username for authenticating tests (http
                                       authentication)
   -w, --password <password>           password for authenticating tests (http
@@ -78,6 +78,8 @@ Options:
                                       drop all requests
   -c, --custom <script>               execute arbitrary JavaScript at the end
                                       of a test to collect custom metrics
+  -wpr, --wappalyzerpr <number>       set the wappalyzerPR fork PR number to
+                                      use for technology detection
   -a, --authtype <type>               type of authentication: 0 = Basic, 1 =
                                       SNS [0]
   -n, --notify <e-mail>               e-mail address to notify with the test

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

@@ -60,7 +60,7 @@ Options:
                                       switches (Chrome only)
       --lighthouse                    perform lighthouse test (Chrome only,
                                       Linux agent only)
-  -thc, --throttleCPU <number>        custom cpu throttling    
+  -thc, --throttleCPU <number>        custom cpu throttling
   -g, --login <username>              username for authenticating tests (http
                                       authentication)
   -w, --password <password>           password for authenticating tests (http
@@ -78,6 +78,8 @@ Options:
                                       drop all requests
   -c, --custom <script>               execute arbitrary JavaScript at the end
                                       of a test to collect custom metrics
+  -wpr, --wappalyzerpr <number>         set the wappalyzerPR fork PR number to
+                                      use for technology detection
   -a, --authtype <type>               type of authentication: 0 = Basic, 1 =
                                       SNS [0]
   -n, --notify <e-mail>               e-mail address to notify with the test
@@ -88,7 +90,7 @@ Options:
   -D, --bwdown <bandwidth>            download bandwidth in Kbps (used when
                                       specifying a custom connectivity profile)
   -U, --bwup <bandwidth>              upload bandwidth in Kbps (used when
-                                      specifying a custom connectivity profile)               
+                                      specifying a custom connectivity profile)
   -bw, --browserwidth <pixels>        Browser window width (in display pixels)
   -bh, --browserheight <pixels>       Browser window height (in display pixels)
   -vh, --viewportheight <pixels>      Viewport Height in css pixels