address feedback

Author: mmalerba

src/cdk-experimental/testing/protractor/protractor-element.ts

@@ -10,6 +10,7 @@ import {ModifierKeys} from '@angular/cdk/testing';
 import {browser, ElementFinder, Key} from 'protractor';
 import {TestElement, TestKey} from '../test-element';
 
+/** Maps the `TestKey` constants to Protractor's `Key` constants. */
 const keyMap = {
   [TestKey.BACKSPACE]: Key.BACK_SPACE,
   [TestKey.TAB]: Key.TAB,
@@ -43,6 +44,24 @@ const keyMap = {
   [TestKey.META]: Key.META
 };
 
+/** Converts a `ModifierKeys` object to a list of Protractor `Key`s. */
+function toProtractorModifierKeys(modifiers: ModifierKeys): string[] {
+  const result: string[] = [];
+  if (modifiers.control) {
+    result.push(Key.CONTROL);
+  }
+  if (modifiers.alt) {
+    result.push(Key.ALT);
+  }
+  if (modifiers.shift) {
+    result.push(Key.SHIFT);
+  }
+  if (modifiers.meta) {
+    result.push(Key.META);
+  }
+  return result;
+}
+
 /** A `TestElement` implementation for Protractor. */
 export class ProtractorElement implements TestElement {
   constructor(readonly element: ElementFinder) {}
@@ -87,12 +106,7 @@ export class ProtractorElement implements TestElement {
       rest = modifiersAndKeys;
     }
 
-    const modifierKeys = [
-        modifiers.control ? Key.CONTROL : '',
-        modifiers.alt ? Key.ALT : '',
-        modifiers.shift ? Key.SHIFT : '',
-        modifiers.meta ? Key.META : ''
-    ].filter(k => k);
+    const modifierKeys = toProtractorModifierKeys(modifiers);
     const keys = rest.map(k => typeof k === 'string' ? k.split('') : [keyMap[k]])
         .reduce((arr, k) => arr.concat(k), [])
         .map(k => Key.chord(...modifierKeys, k));

src/cdk-experimental/testing/testbed/unit-test-element.ts

@@ -6,17 +6,19 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import * as keyCodes from '@angular/cdk/keycodes';
 import {
   clearElement,
   dispatchMouseEvent,
-  isTextInput, ModifierKeys,
+  isTextInput,
+  ModifierKeys,
   triggerBlur,
   triggerFocus,
   typeInElement
 } from '@angular/cdk/testing';
 import {TestElement, TestKey} from '../test-element';
-import * as keyCodes from '@angular/cdk/keycodes';
 
+/** Maps `TestKey` constants to the `keyCode` and `key` values used by native browser events. */
 const keyMap = {
   [TestKey.BACKSPACE]: {keyCode: keyCodes.BACKSPACE, key: 'Backspace'},
   [TestKey.TAB]: {keyCode: keyCodes.TAB, key: 'Tab'},

src/cdk/testing/event-objects.ts

@@ -81,7 +81,9 @@ export function createKeyboardEvent(type: string, keyCode: number = 0, key: stri
     event.initKeyEvent(type, true, true, window, modifiers.control, modifiers.alt, modifiers.shift,
         modifiers.meta, keyCode);
   } else {
-    let modifiersStr = (modifiers.control ? 'Control ' : '' + modifiers.alt ? 'Alt ' : '' +
+    // `initKeyboardEvent` expects to receive modifiers as a whitespace-delimited string
+    // See https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/initKeyboardEvent
+    const modifiersStr = (modifiers.control ? 'Control ' : '' + modifiers.alt ? 'Alt ' : '' +
         modifiers.shift ? 'Shift ' : '' + modifiers.meta ? 'Meta' : '').trim();
     event.initKeyboardEvent(type, true, true, window, 0, key, 0, modifiersStr, false);
   }