fix tests

dlepaux · Sep 23, 2018 · 65e7dc9 · 65e7dc9
1 parent a8f3120
commit 65e7dc9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/src/index.js b/src/index.js
@@ -35,16 +35,12 @@ class RealTimeBPMAnalyzer {
       pushTime: 2000,
       pushCallback: (err, bpm) => {
         console.log('bpm', bpm);
-<<<<<<< HEAD
       },
       onBpmStabilized: (thresold) => {
         this.clearValidPeaks(thresold);
-||||||| parent of acaddf8... fix tests with web-audio-engine <3
-=======
       },
       webAudioAPI: {
         OfflineAudioContext: typeof window == 'object' && (window.OfflineAudioContext || window.webkitOfflineAudioContext);
->>>>>>> acaddf8... fix tests with web-audio-engine <3
       }
     }
 

diff --git a/test/index_test.js b/test/index_test.js
@@ -37,7 +37,7 @@ describe('RealTime BPM Analyzer', () => {
     });
 
     it('Test callback (second param) without onLoop', (done) => {
-      utils.loopOnThresolds(null, (object) => {
+      utils.loopOnThresolds(() => {}, (object) => {
       	expect(JSON.stringify(object)).to.be.equal('{}');
       	done();
       });