3 files changed, 46 insertions, 15 deletions
diff --git a/e2e/ambassador/src/client/keys.js b/e2e/ambassador/src/client/keys.js
index af0fb3d..37b9c0a 100644
--- a/e2e/ambassador/src/client/keys.js
+++ b/e2e/ambassador/src/client/keys.js
@@ -1,29 +1,31 @@
 import { EVENT_KEYPRESS, EVENT_KEYDOWN, EVENT_KEYUP } from '../shared/messages';
 import * as ipc from './ipc';
 
-const press = (tabId, key) => {
-  return ipc.send({
+const NEUTRAL_MODIFIERS = { shiftKey: false, altKey: false, ctrlKey: false };
+
+const press = (tabId, key, modifiers = NEUTRAL_MODIFIERS) => {
+  return ipc.send(Object.assign({}, modifiers, {
     type: EVENT_KEYPRESS,
     tabId,
     key,
-  });
+  }));
 };
 
-const down = (tabId, key) => {
-  return ipc.send({
+const down = (tabId, key, modifiers = NEUTRAL_MODIFIERS) => {
+  return ipc.send(Object.assign({}, modifiers, {
     type: EVENT_KEYDOWN,
     tabId,
     key,
-  });
+  }));
 };
 
 
-const up = (tabId, key) => {
-  return ipc.send({
+const up = (tabId, key, modifiers = NEUTRAL_MODIFIERS) => {
+  return ipc.send(Object.assign({}, modifiers, {
     type: EVENT_KEYUP,
     tabId,
     key,
-  });
+  }));
 };
 
 export { press, down, up };
diff --git a/e2e/ambassador/src/content/events.js b/e2e/ambassador/src/content/events.js
new file mode 100644
index 0000000..1e45909
--- /dev/null
+++ b/e2e/ambassador/src/content/events.js
@@ -0,0 +1,31 @@
+const keypress = (opts) => {
+  let event = new KeyboardEvent('keypress', {
+    key: opts.key,
+    altKey: opts.altKey,
+    shiftKey: opts.shiftKey,
+    ctrlKey: opts.ctrlKey
+  });
+  document.body.dispatchEvent(event);
+};
+
+const keydown = (opts) => {
+  let event = new KeyboardEvent('keydown', {
+    key: opts.key,
+    altKey: opts.altKey,
+    shiftKey: opts.shiftKey,
+    ctrlKey: opts.ctrlKey
+  });
+  document.body.dispatchEvent(event);
+};
+
+const keyup = (opts) => {
+  let event = new KeyboardEvent('keyup', {
+    key: opts.key,
+    altKey: opts.altKey,
+    shiftKey: opts.shiftKey,
+    ctrlKey: opts.ctrlKey
+  });
+  document.body.dispatchEvent(event);
+};
+
+export { keypress, keydown, keyup };
diff --git a/e2e/ambassador/src/content/index.js b/e2e/ambassador/src/content/index.js
index 93943b8..fd19136 100644
--- a/e2e/ambassador/src/content/index.js
+++ b/e2e/ambassador/src/content/index.js
@@ -3,6 +3,7 @@ import {
   SCROLL_GET, SCROLL_SET,
 } from '../shared/messages';
 import * as ipc from './ipc';
+import * as events from './events';
 import * as scrolls from './scrolls';
 
 ipc.receivePageMessage((message) => {
@@ -12,16 +13,13 @@ ipc.receivePageMessage((message) => {
 ipc.receiveBackgroundMesssage((message) => {
   switch (message.type) {
   case EVENT_KEYPRESS:
-    document.body.dispatchEvent(
-      new KeyboardEvent('keypress', { 'key': message.key }));
+    events.keypress(message);
     break;
   case EVENT_KEYDOWN:
-    document.body.dispatchEvent(
-      new KeyboardEvent('keydown', { 'key': message.key }));
+    events.keydown(message);
     break;
   case EVENT_KEYUP:
-    document.body.dispatchEvent(
-      new KeyboardEvent('keyup', { 'key': message.key }));
+    events.keyup(message);
     break;
   case SCROLL_GET:
     return Promise.resolve(scrolls.get());