Merge pull request #157 from jitto/master

Add proxy mapping - so proxy passed in runTest is used for fetching results

Author: tkadlec

lib/mapping.js

@@ -665,6 +665,10 @@ var options = {
       valid:
         /^(?:dot|spec|tap|xunit|list|progress|min|nyan|landing|json|doc|markdown|teamcity)$/,
     },
+    proxy: {
+      name: "proxy",
+      info: "set the proxy used to fetch results",
+    },
   },
   waterfall: {
     type: {

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

@@ -18,6 +18,7 @@ Options:
   -S, --specs <json_or_file>  set the specs for performance test suite
   -r, --reporter <name>       set performance test suite reporter output:
                               [dot]|spec|tap|xunit|list|progress|min|nyan|landing|json|doc|markdown|teamcity
+      --proxy                 set the proxy used to fetch results
   -e, --request <id>          echo request ID, useful to track asynchronous
                               requests
   -h, --help                  display help for command

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

@@ -173,4 +173,5 @@ Options:
       --reporter <name>               set performance test suite reporter
                                       output:
                                       [dot]|spec|tap|xunit|list|progress|min|nyan|landing|json|doc|markdown|teamcity
+      --proxy                 set the proxy used to fetch results
   -h, --help                          display help for command