Changed all occurrences of endpoint to hostAndPort

Author: waxtell

README.md

@@ -84,8 +84,8 @@ table includes the currently implemented options.
 | output | c:\\temp\\reports  | Directory to store reports in.|
 | reportFileName |  N/A | File name for the report. If omitted, the report will get a name based on the test job ID|
 | callback | http://localhost:8080 | The URL, to which the results will be posted|
-| environment | dev | Specify the The target environment for test job. Can not be used with **endpoint**|
-| endpoint | localhost:8080 | The endpoint to be used for HTTP requests sent by this test, in the format host:[port]. Can not be used with **environment**|
+| environment | dev | Specify the The target environment for test job. Can not be used with **hostAndPort**|
+| hostAndPort | localhost:8080 | The host and port to be used for HTTP requests sent by this test, in the format host:[port]. Can not be used with **environment**|
 | format | excel | Specify the file type of the report. Currently supported formats are json, junit, excel and pdf. The default format is junit|
 | proxyHost | 172.0.1.10  | Hostname or IP of the server to use as a proxy for outgoing requests (from TestEngine)|
 | proxyPort | 8888  | Port of the proxyHost to contact for outgoing requests (from TestEngine)|

bin/run_functions.js

@@ -30,7 +30,7 @@ module.exports.dispatcher = function (args) {
         'securitytest',
         'tags',
         'callback',
-        'endpoint',
+        'hostAndPort',
         'environment',
         '=printReport',
         'output',
@@ -59,7 +59,7 @@ module.exports.dispatcher = function (args) {
 function printModuleHelp() {
     util.error("Usage: testengine run <command>");
     util.error("Commands: ");
-    util.error("   project [testsuite=<name>] [async] [skipdeps] [priorityJob] [testcase=<name>] [securitytest=<name>] [timeout=<seconds>] [tags=(tag1,tag2)] [output=<directory>] [printReport] [reportFileName=<filename>] [format=junit/excel/json/pdf] [environment=<environment name>] [endpoint=<host:port>] [callback=<url>]");
+    util.error("   project [testsuite=<name>] [async] [skipdeps] [priorityJob] [testcase=<name>] [securitytest=<name>] [timeout=<seconds>] [tags=(tag1,tag2)] [output=<directory>] [printReport] [reportFileName=<filename>] [format=junit/excel/json/pdf] [environment=<environment name>] [hostAndPort=<host:port>] [callback=<url>]");
     util.error("           [projectPassword=<password>] [proxyHost=<hostname>] [proxyPort=<port>] [proxyUser=<username>]");
     util.error("           [proxyPassword=<password>] <filename>");
     util.error("   help");
@@ -76,8 +76,8 @@ function conflictingOptionsCheck(options) {
         }
     }
 
-    if(('endpoint' in options) && ('environment' in options)) {
-        util.printErrorAndExit('Error: environment cannot be used together with endpoint');
+    if(('hostAndPort' in options) && ('environment' in options)) {
+        util.printErrorAndExit('Error: environment cannot be used together with hostAndPort');
     }
 
     if (('testcase' in options)
@@ -188,7 +188,7 @@ function getQueryStringFromOptions(options) {
             case 'callback':
                 queryStringPart = 'callback=' + encodeURI(options[key]);
                 break;
-            case 'endpoint':
+            case 'hostAndPort':
                 queryStringPart = 'hostAndPort=' + encodeURI(options[key]);
                 break;
             case 'proxyUser':