update karma tests to create one test bundle, add more test coverage

Author: connorwalsh

.babelrc

@@ -4,7 +4,8 @@
     "react",
     "es2017",
     "stage-0",
-    "stage-1"
+    "stage-1",
+    "flow"
   ],
   "plugins": [
   "transform-class-properties",

.flowconfig

@@ -0,0 +1,12 @@
+[ignore]
+./node_modules
+
+[include]
+./src
+./test
+
+[libs]
+
+[lints]
+
+[options]

.travis.yml

@@ -4,5 +4,4 @@ before_install:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 after_script:
-  - npm run coverage
   - cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js

karma.conf.js

@@ -9,11 +9,19 @@ module.exports = function(config) {
   var configuration = {
     port: 9876,
     basePath: '.',
+    // NOTE (cw|11.2.2017) we are bundling all tests into a single bundle because
+    // for some reason, importing ToneJS within each test breaks stuff when we are
+    // importing it more than 7 times (???). This must have something to do with using
+    // the WebAudio API and instantiating it too many times or something.
+    // The consequence is that there is no straightforward way to run individual tests
+    // other than overwrit
     files: [
-      {pattern: testPath + '**/*.js', included: true},
+      'test/index.js',
+      // {pattern: testPath + '**/*.js', included: true},
     ],
     preprocessors: {
-      [testPath + '**/*.js']: ['webpack'],
+      'test/index.js': ['webpack', 'sourcemap'],
+      // [testPath + '**/*.js']: ['webpack', 'sourcemap'],
     },
     webpack: webpackConfig,
     webpackServer: {
@@ -32,6 +40,7 @@ module.exports = function(config) {
     plugins: [
       'karma-webpack',
       'karma-coverage',
+      'karma-sourcemap-loader',
       'karma-mocha',
       'karma-mocha-reporter',
       'karma-chai',

package-lock.json

@@ -7,8 +7,8 @@
     "unitTests": "mocha-webpack test/unit --recursive",
     "karmaTests": "./node_modules/karma/bin/karma start",
     "lint": "eslint src",
-    "test": "cross-env NODE_ENV=test npm run karmaTests",
-    "coverage": ""
+    "test": "npm run typeCheck && cross-env NODE_ENV=test npm run karmaTests",
+    "typeCheck": "flow"
   },
   "repository": {
     "type": "git",
@@ -45,6 +45,7 @@
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-preset-es2015": "^6.0.15",
     "babel-preset-es2017": "^6.24.1",
+    "babel-preset-flow": "^6.23.0",
     "babel-preset-latest": "^6.24.1",
     "babel-preset-react": "^6.0.15",
     "babel-preset-stage-0": "^6.0.15",
@@ -54,13 +55,15 @@
     "css-loader": "^0.23.1",
     "eslint": "^1.10.3",
     "eslint-plugin-react": "^3.6.2",
+    "flow-bin": "^0.57.3",
     "istanbul": "^0.4.5",
     "karma": "^1.7.0",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^2.1.1",
     "karma-coverage": "^1.1.1",
     "karma-mocha": "^1.3.0",
     "karma-mocha-reporter": "^2.2.3",
+    "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^2.0.3",
     "mocha": "^3.4.1",
     "mocha-webpack": "^0.7.0",

package.json

@@ -8,7 +8,7 @@ import {MidiNote} from './note'
 import {
   consolidateNotes,
   normalizeOverdubTime,
-} from '../../../../../redux/reducers/recordings/midi/midi'
+} from '../../../../../redux/reducers/recordings/midi/masters'
 
 
 export class MidiNotes extends Component {
@@ -177,7 +177,7 @@ export class MidiNotes extends Component {
 
   transformInProgressRecordings() {
     const {inProgressRecordings} = this.props
-
+    
     const transformedNotes = flatMap(
       values(inProgressRecordings),
       inProgressRecording => map(

src/components/editor/panels/timeline/midi/notes.js

@@ -5,7 +5,7 @@ import {fromMidi} from 'tonal-note'
 import {play, playback} from '../../instruments/synth'
 import {getMidiEventTypeAndChannel, MIDI_NOTE_OFF, MIDI_NOTE_ON} from '../../types/midiEvent'
 import {recordMidiEvent} from '../../redux/actions/recordings/midi/midi'
-import {getUnmutedMasterRecordingsFromTimeline} from '../../redux/selectors/recordings/midi'
+import {getUnmutedMasterRecordingsFromTimeline} from '../../redux/selectors/timelines'
 
 
 // Since the MidiAccess object cannot change object reference
@@ -202,9 +202,9 @@ export class MidiEventBus {
   }
 
   record(deviceId, music) {
-    const {recordingId, overdubId} = this.recording[deviceId]
+    const {overdubId} = this.recording[deviceId]
 
-    this.dispatch(recordMidiEvent(recordingId, overdubId, music))
+    this.dispatch(recordMidiEvent(overdubId, music))
   }
 
   startPlayback(state, timelineId) {

src/middleware/midi/bus.js

@@ -1,10 +1,9 @@
 import uuidV4 from  'uuid/v4'
 import {map} from 'lodash'
-import {newRecording} from '../../../../types/recording'
+import {newRecording, newOverdub} from '../../../../types/recording'
 import {startPlayback, stopPlayback} from '../../timelines/timelines'
 
 
-
 export const MIDI_OVERDUB_RECORDING_STARTED = 'MIDI_OVERDUB_RECORDING_STARTED'
 export const MIDI_OVERDUB_RECORDING_STOPPED = 'MIDI_OVERDUB_RECORDING_STOPPED'
 export const MIDI_EVENT_RECORDED = 'MIDI_EVENT_RECORDED'
@@ -23,33 +22,15 @@ export const createNewMidiRecording = (recordingId = uuidV4()) => dispatch =>
     }
   })
 
-/**
- * startMidiOverdub creates a new overdub recording within a given recording.
- *
- * @param deviceId: the id of the input midi device being recorded. This is not
- *                  stored in the redux store, but rather intercepted by the midi
- *                  middleware.
- * @param recordingId: the id of the recording for which this is an overdub.
- * @param overdubId (optional)
- */
-// TODO (cw|2017.2017) get rid of this garbage, its not used anymore -____-
-export const startMidiOverdub = (deviceId, recordingId, overdubId = uuidV4(), timeOffset = 0) => dispatch => {
-  dispatch({
-    type: MIDI_OVERDUB_RECORDING_STARTED,
-    payload: {
-      input: deviceId,
-      recordingId,
-      overdub: newOverdub(overdubId, timeOffset)
-    }
-  })
-}
-
-export const startMidiOverdubs = (recordings, timelineId) => dispatch => {
+export const startMidiOverdubs = (recordingContexts, timelineId) => dispatch => {
   // start overdub recording
   dispatch({
     type: MIDI_OVERDUB_RECORDING_STARTED,
     payload: {
-      recordings: map(recordings, recording => ({...recording, overdubId: uuidV4()})),
+      recordingContexts: map(
+        recordingContexts,
+        recordingContext => ({...recordingContext, overdub: newOverdub(uuidV4(), 0)}), // TODO (cw|10.29.2017) parameterize timeOffset
+      ),
       timelineId,
     },
   })
@@ -58,12 +39,12 @@ export const startMidiOverdubs = (recordings, timelineId) => dispatch => {
   dispatch(startPlayback(timelineId))
 }
 
-export const stopMidiOverdubs = (recordings, timelineId) => dispatch => {
+export const stopMidiOverdubs = (recordingContexts, timelineId) => dispatch => {
   // stop overdub recording
   dispatch({
     type: MIDI_OVERDUB_RECORDING_STOPPED,
     payload: {
-      recordings,
+      recordingContexts,
       timelineId,
     },
   })
@@ -72,24 +53,6 @@ export const stopMidiOverdubs = (recordings, timelineId) => dispatch => {
   dispatch(stopPlayback(timelineId))
 }
 
-/**
- * stopMidiOverdub stops recording an overdub.
- *
- * @param deviceId
- * @param recordingId
- * @param overdubId
- */
-export const stopMidiOverdub = (deviceId, recordingId, overdubId) => dispatch => {
-  dispatch({
-    type: MIDI_OVERDUB_RECORDING_STOPPED,
-    payload: {
-      input: deviceId,
-      recordingId,
-      overdubId,
-    }
-  })
-}
-
 /**
  * recordMidiEvent records a midi event to a recording overdub. This action should
  * only be used by the midi-middleware.
@@ -98,11 +61,10 @@ export const stopMidiOverdub = (deviceId, recordingId, overdubId) => dispatch =>
  * @param overdubId
  * @param midiEvent
  */
-export const recordMidiEvent = (recordingId, overdubId, midiEvent) => dispatch => {
+export const recordMidiEvent = (overdubId, midiEvent) => dispatch => {
   dispatch({
     type: MIDI_EVENT_RECORDED,
     payload: {
-      recordingId,
       overdubId,
       event: midiEvent,
     }

src/redux/actions/recordings/midi/midi.js

@@ -1,5 +1,5 @@
 import {combineReducers} from 'redux'
-import {midi} from './midi/midi'
+import {midi} from './midi'
 
 export const recordings = combineReducers({
   midi,