- Fixed arg extraction in case of comments in the middle

Author: lmartorella

lib/robotremote.js

@@ -13,14 +13,24 @@ function Server(libraries, options, listeningCallback) {
         'stopRemoteServer': this.stopRemoteServer
     };
 
+    function getParamNames(func) {
+        var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
+        var ARGUMENT_NAMES = /([^\s,]+)/g;
+        
+        var fnStr = func.toString().replace(STRIP_COMMENTS, '');
+        var result = fnStr.slice(fnStr.indexOf('(')+1, fnStr.indexOf(')')).match(ARGUMENT_NAMES);
+        if(result === null)
+           result = [];
+        return result;
+    }
+
     // Load libraries
     libraries.forEach(function (lib) {
         for (var keywordName in lib) {
             if (lib.hasOwnProperty(keywordName)) {
                 var keyword = lib[keywordName];
-                // Parameters name for documenting purpose.
-                var rawParameters = /\(([\s\S]*?)\)/.exec(keyword.toString())[1];
-                keyword.args = rawParameters.length > 0 ? rawParameters.split(/\s*,\s*/) : [];
+                // Get parameter count and names.
+                keyword.args = getParamNames(keyword.toString());
                 if (!keyword.doc) {
                     keyword.doc = '';
                 }

test/test.js

@@ -24,6 +24,8 @@ describe('Robot Remote Library', function () {
     });
 
     it('client should fail to start if server is not running', function (done) {
+        // In case of slow DNS this will fail after 2000ms
+        this.timeout(5000); 
         robot.createClient({host: 'localhost', port: nextPort()}).done(
             function (val) {
                 throw new Error('client succeeded');
@@ -44,6 +46,14 @@ describe('Robot Remote Library', function () {
             );
         });
     });
+    it('server should correctly manage keyword arguments', function (done) {
+        var serverPort = nextPort();
+        var server = new robot.Server([testLibrary], {host: 'localhost', port: serverPort, allowStop: true}, function () {
+            assert.deepEqual(server.keywords['concatenateArguments'].args, ['arg1', 'arg2']);
+            assert.deepEqual(server.keywords['concatenateArgumentsWithCommentsInArgs'].args, ['arg1', 'arg2']);
+            done();
+        });
+    });
     it('keyword should run when called by a client', function (done) {
         var serverPort = nextPort();
 

test/testlibrary.js

@@ -13,6 +13,10 @@ lib.concatenateArguments = function (arg1, arg2) {
     return arg1 + arg2;
 };
 
+lib.concatenateArgumentsWithCommentsInArgs = function (arg1, arg2 /*, skipped arg */) {
+    return arg1 + arg2;
+};
+
 lib.justFail = function () {
     throw new Error();
 };