Add computer keyboard tests

zxqx · Jun 18, 2018 · 2cd51e9 · 2cd51e9
1 parent fb23920
commit 2cd51e9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/src/helpers/keyboardTracking.js b/src/helpers/keyboardTracking.js
@@ -9,8 +9,6 @@ const NOTE_HOLD_DELAY_TIME = 500;
  * @param {string} note
  */
 export function triggerOnPressCallbacks(note) {
-  if (!note) return;
-
   if (!Array.isArray(this.notesBeingHeld)) {
     this.notesBeingHeld = [];
   }

diff --git a/src/modules/ComputerKeyboard.js b/src/modules/ComputerKeyboard.js
@@ -98,7 +98,9 @@ export default class ComputerKeyboard {
     if (octaveChangeDirection === OCTAVE_UP) {
       if (this.octave === 8) return;
       this.setOctave(this.octave + 1);
-    } else if (octaveChangeDirection === OCTAVE_DOWN) {
+    }
+
+    if (octaveChangeDirection === OCTAVE_DOWN) {
       if (this.octave === 1) return;
       this.setOctave(this.octave - 1);
     }

diff --git a/src/modules/ComputerKeyboard.test.js b/src/modules/ComputerKeyboard.test.js
@@ -168,6 +168,23 @@ describe('ComputerKeyboard', () => {
     expect(kb.justReleased).toEqual(false);
   });
 
+  it('should not re-trigger on press callbacks if note is being held', () => {
+    const kb = new ComputerKeyboard();
+
+    const callback = jest.fn();
+
+    kb.triggerOnPress([
+      callback,
+    ]);
+
+    kb.triggerOnPressCallbacks('C#2');
+    kb.triggerOnPressCallbacks('C#2');
+    kb.triggerOnPressCallbacks('C#2');
+
+    expect(callback.mock.calls).toHaveLength(1);
+  });
+
+
   it('should trigger on release callbacks', () => {
     const kb = new ComputerKeyboard();
 
@@ -215,6 +232,7 @@ describe('ComputerKeyboard', () => {
     expect(kb.octave).toEqual(2);
 
     kb.triggerOctaveChange('octaveDown');
+    expect(kb.octave).toEqual(1);
     kb.triggerOctaveChange('octaveDown');
     kb.triggerOctaveChange('octaveDown');
     kb.triggerOctaveChange('octaveDown');