extended testcases to cover new functionality

Author: quinkennedy

extension.js

@@ -38,31 +38,28 @@ module.exports = new Extension({
  * @param {object} tokens Original tokens for this extension
  */
 function _extendTokens(args, tokens) {
-    // if we have an args object, there might be properties we want to
-    // migrate into the tokens object.
-    if (typeof(args) === 'object') {
+    var _tokens = {},
+        _args = args,
+        expectedKeys = ['flags'];
 
-        var _tokens = {},
-            expectedKeys = ['flags'];
-
-        // shallow-copy the original tokens object
-        for (let key in tokens) {
-            _tokens[key] = tokens[key];
-        }
-
-        // copy expected arguments from args to the new tokens object
-        // defaulting to an emptystring
-        for (let key of expectedKeys) {
-            // prepend keys with a dollar-sign for template-replacement
-            _tokens['$'+key] = args[key] || '';
-        }
+    // if args is not an object, we'll just use an empty one
+    if (typeof(args) !== 'object') {
+        _args = {};
+    }
 
-        return _tokens;
+    // shallow-copy the original tokens object
+    for (let key in tokens) {
+        _tokens[key] = tokens[key];
     }
-    // otherwise we just pass through the original tokens object
-    else {
-        return tokens;
+
+    // copy expected arguments from args to the new tokens object
+    // defaulting to an emptystring
+    for (let key of expectedKeys) {
+        // prepend keys with a dollar-sign for template-replacement
+        _tokens['$'+key] = _args[key] || '';
     }
+
+    return _tokens;
 }
 
 /**

test/.xinitrc.tpl

@@ -1 +1 @@
-exec /usr/bin/chromium --noerrdialogs --kiosk --incognito $url
+exec /usr/bin/chromium --noerrdialogs --kiosk --incognito $flags "$url"

test/extension.spec.js

@@ -11,10 +11,6 @@ describe('instantiation', function() {
 });
 
 describe('properties', function() {
-    after(function(done) {
-        exec('rm ' + __dirname + '/.xinitrc', done);
-    });
-
     it('should include all required format properties', function() {
         var format = WebsiteExtension.props.format;
 
@@ -37,29 +33,81 @@ describe('properties', function() {
         assert(format.end_command);
         assert(typeof format.end_command === 'string');
     });
+});
 
-    it('start_command should update .xinitrc file with supplied token', function(done) {
-        var format = WebsiteExtension.props.format,
-            command,
-            expected = 'exec /usr/bin/chromium --noerrdialogs --kiosk --incognito http://test.com';
+describe('start_command', function() {
+    var expectedDefault = 'exec /usr/bin/chromium --noerrdialogs --kiosk --incognito  "http://test.com"';
 
-        // use test .xinitrc
-        format.xinitrcTplPath = __dirname + '/.xinitrc.tpl';
-        format.xinitrcFinalPath = format.xinitrcTplPath.replace('.tpl', '');
+    after(function(done) {
+        exec('rm ' + __dirname + '/.xinitrc', done);
+    });
+
+    it('should update .xinitrc file with supplied token', function(done) {
+        var format = getTestFormat(),
+            command;
 
         // replace $url token with url string
         command = format.start_command({}, {
             $url: 'http://test.com'
         });
 
         assert(typeof command === 'string');
+        checkXinitrc(format.xinitrcFinalPath, expectedDefault, done);
+    });
+    it('should not accept undefined args parameter', function(done) {
+        var format = getTestFormat(),
+            command;
+
+        // replace $url token with url string
+        command = format.start_command(undefined, {
+            $url: 'http://test.com'
+        });
+
+        assert(typeof command === 'string');
+        checkXinitrc(format.xinitrcFinalPath, expectedDefault, done);
+    });
+    it('should update .xinitrc with optional args', function(done) {
+        var format = getTestFormat(),
+            command,
+            expected = 'exec /usr/bin/chromium --noerrdialogs --kiosk --incognito --allow-insecure-localhost "http://test.com"';
 
-        fs.readFile(format.xinitrcFinalPath, 'utf8', function(err, data) {
+        // replace $url token with url string
+        command = format.start_command({flags:'--allow-insecure-localhost'}, {
+            $url: 'http://test.com'
+        });
+
+        assert(typeof command === 'string');
+        checkXinitrc(format.xinitrcFinalPath, expected, done);
+    });
+    it('should ignore unsupported args', function(done) {
+        var format = getTestFormat(),
+            command;
+
+        // replace $url token with url string
+        command = format.start_command({random:'args'}, {
+            $url: 'http://test.com'
+        });
+
+        assert(typeof command === 'string');
+        checkXinitrc(format.xinitrcFinalPath, expectedDefault, done);
+    });
+
+    function checkXinitrc(path, expected, done) {
+        fs.readFile(path, 'utf8', function(err, data) {
             if (err) {
                 throw err;
             }
             assert.equal(data, expected);
             done();
         });
-    });
+    }
+    function getTestFormat() {
+        var format = WebsiteExtension.props.format;
+
+        // set test .xinitrc.tpl
+        format.xinitrcTplPath = __dirname + '/.xinitrc.tpl';
+        format.xinitrcFinalPath = format.xinitrcTplPath.replace('.tpl', '');
+
+        return format;
+    }
 });