Fix optionalIntentArguments

Author: imurchie

lib/helpers.js

@@ -147,7 +147,28 @@ function buildStartCmd (startAppOptions, apiLevel) {
     cmd.push('-f', startAppOptions.flags);
   }
   if (startAppOptions.optionalIntentArguments) {
-    cmd.push(startAppOptions.optionalIntentArguments);
+    // expect optionalIntentArguments to be something like '-x options',
+    // '-y option argument' or a combination of the two
+    let argRe = /(-[^\s]+) ([^-]+)/g;
+    while (true) {
+      let optionalIntentArguments = argRe.exec(startAppOptions.optionalIntentArguments);
+      if (!optionalIntentArguments) {
+        break;
+      }
+      let flag = optionalIntentArguments[1];
+      let space = optionalIntentArguments[2].indexOf(' ');
+      let arg, value;
+      if (space === -1) {
+        arg = optionalIntentArguments[2];
+      } else {
+        arg = optionalIntentArguments[2].substring(0, space).trim();
+        value = optionalIntentArguments[2].substring(space + 1).trim();
+      }
+      cmd.push(flag, arg);
+      if (value) {
+        cmd.push(value);
+      }
+    }
   }
   return cmd;
 }

test/unit/apk-utils-specs.js

@@ -11,9 +11,10 @@ const should = chai.should(),
       act = '.ContactManager',
       startAppOptions = {stopApp: true, action: 'action', category: 'cat',
                          flags: 'flags', pkg: 'pkg', activity: 'act',
-                         optionalIntentArguments: '-x options'},
+                         optionalIntentArguments: '-x options -y option argument -z option arg with spaces'},
       cmd = ['am', 'start', '-n', 'pkg/act', '-S', '-a', 'action', '-c', 'cat',
-             '-f', 'flags', '-x options'],
+             '-f', 'flags', '-x', 'options', '-y', 'option', 'argument',
+             '-z', 'option', 'arg with spaces'],
       language = 'en',
       country = 'US',
       locale = 'en-US';