diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 00000000..d9391185 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,2 @@ +Gruntfile.js +test/test.js diff --git a/src/.eslintrc b/.eslintrc similarity index 100% rename from src/.eslintrc rename to .eslintrc diff --git a/Gruntfile.js b/Gruntfile.js index 0e97715d..38f26842 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -6,8 +6,8 @@ module.exports = function(grunt) { // Configure style consistency eslint: { source: { - options: {configFile: './src/.eslintrc'}, - src: ['src/**/*.js'] + options: {configFile: './.eslintrc'}, + src: ['src/**/*.js', 'test/tests/**/*.js'] } }, watch: { diff --git a/test/tests/p5.Amplitude.js b/test/tests/p5.Amplitude.js index 685b8d7e..0ea20522 100644 --- a/test/tests/p5.Amplitude.js +++ b/test/tests/p5.Amplitude.js @@ -1,6 +1,6 @@ -define(['chai'], - function(chai) { +'use strict'; +define(['chai'], function(chai) { var expect = chai.expect; describe('p5.Amplitude', function() { @@ -8,11 +8,11 @@ define(['chai'], var sf, amp; - it('can be created', function(){ + it('can be created', function() { amp = new p5.Amplitude(); }); - after(function(done){ + after(function(done) { expect( amp.getLevel() ).to.not.equal(1.0); osc.dispose(); sf.dispose(); @@ -37,7 +37,7 @@ define(['chai'], }); it('gets normalized osc level', function(done) { - setTimeout(function(cleanup) { + setTimeout(function() { oAmp.toggleNormalize(true); // console.log( 'normalized: ' + oAmp.getLevel() ); expect( oAmp.getLevel() ).to.be.closeTo(1.0, 0.4); @@ -46,9 +46,9 @@ define(['chai'], }); - it('loop a SoundFile with params, disconnected from master, setInput()', function(done){ + it('loop a SoundFile with params, disconnected from master, setInput()', function(done) { p5.prototype.soundFormats('ogg', 'mp3'); - sf = p5.prototype.loadSound('./testAudio/drum', function(){ + sf = p5.prototype.loadSound('./testAudio/drum', function() { sf.disconnect(); sf.loop(1,1,0.0, 0.05); sf.connect(amp); @@ -67,4 +67,4 @@ define(['chai'], }); }); -}); \ No newline at end of file +}); diff --git a/test/tests/p5.AudioIn.js b/test/tests/p5.AudioIn.js index e29b3185..43e1dde2 100644 --- a/test/tests/p5.AudioIn.js +++ b/test/tests/p5.AudioIn.js @@ -1,10 +1,11 @@ -define(['chai'], - function(chai) { +'use strict'; + +define(['chai'], function(chai) { var expect = chai.expect; describe('p5.AudioIn', function() { - it('can be created and disposed', function(){ + it('can be created and disposed', function() { var mic = new p5.AudioIn(); mic.dispose(); }); @@ -29,7 +30,7 @@ define(['chai'], var mic = new p5.AudioIn(); expect(mic.currentSource).to.be.null; - return mic.getSources().then(function(sources) { + return mic.getSources().then(function() { mic.setSource(0); expect(mic.currentSource).to.equal(0); done(); diff --git a/test/tests/p5.AudioVoice.js b/test/tests/p5.AudioVoice.js index abef234c..06171f2f 100644 --- a/test/tests/p5.AudioVoice.js +++ b/test/tests/p5.AudioVoice.js @@ -1,6 +1,6 @@ -define(['chai'], - function(chai) { +'use strict'; +define(['chai'], function(chai) { var expect = chai.expect; describe('p5.AudioVoice', function() { @@ -12,7 +12,7 @@ define(['chai'], it('can convert strings to frequency values', function() { var av = new p5.AudioVoice(); - var freq = av._setNote("A4"); + var freq = av._setNote('A4'); expect(freq).to.equal(440); av.dispose(); }); diff --git a/test/tests/p5.Compressor.js b/test/tests/p5.Compressor.js index 82082baf..fcfaf9c0 100644 --- a/test/tests/p5.Compressor.js +++ b/test/tests/p5.Compressor.js @@ -1,6 +1,6 @@ -define(['chai'], - function(chai) { +'use strict'; +define(['chai'], function(chai) { var expect = chai.expect; describe('p5.Compressor', function() { @@ -10,12 +10,12 @@ define(['chai'], compressor.dispose(); }); - it('wet dry value can be changed', function(){ + it('wet dry value can be changed', function() { var compressor = new p5.Compressor(); expect(compressor.drywet(0.5)).to.equal(0.5); }); - it('can set params', function(){ + it('can set params', function() { var compressor = new p5.Compressor(); compressor.set(0.5, 20, 15, -50, 0.75); expect(compressor.attack()).to.equal(0.5); diff --git a/test/tests/p5.Delay.js b/test/tests/p5.Delay.js index abc953e8..12af0468 100644 --- a/test/tests/p5.Delay.js +++ b/test/tests/p5.Delay.js @@ -1,5 +1,6 @@ -define(['chai'], - function(chai) { +'use strict'; + +define(['chai'], function(chai) { var expect = chai.expect; @@ -10,22 +11,21 @@ define(['chai'], delay.dispose(); }); - it('has initial feedback value of 0.5', function(){ + it('has initial feedback value of 0.5', function() { var delay = new p5.Delay(); expect(delay.feedback()).to.equal(0.5); }); - it('can set feedback', function(){ + it('can set feedback', function() { var delay = new p5.Delay(); delay.feedback(0.7); expect(delay.feedback()).to.be.closeTo(0.7, 0.001); }); - it('drywet value can be changed', function(){ + it('drywet value can be changed', function() { var effect = new p5.Effect(); - expect(effect.drywet(0.5)).to.equal(0.5); }); }); -}); \ No newline at end of file +}); diff --git a/test/tests/p5.Distortion.js b/test/tests/p5.Distortion.js index 010cff93..783ddd5f 100644 --- a/test/tests/p5.Distortion.js +++ b/test/tests/p5.Distortion.js @@ -1,24 +1,24 @@ -define(['chai'], - function(chai) { +'use strict'; - var expect = chai.expect; +define(['chai'], function(chai) { + var expect = chai.expect; - describe('p5.Distortion', function() { - this.timeout(1000); + describe('p5.Distortion', function() { + this.timeout(1000); - var dist = new p5.Distortion(); + var dist = new p5.Distortion(); - it('can be created and disposed', function() { - var d = new p5.Distortion(); - d.dispose(); - }); + it('can be created and disposed', function() { + var d = new p5.Distortion(); + d.dispose(); + }); - it('can set the amount and oversample', function() { - var initialAmt = dist.getAmount(); - var initialOS = dist.getOversample(); - dist.set(1000, '4x'); - expect(dist.getAmount()).not.equal(initialAmt); - expect(dist.getOversample()).not.equal(initialOS); - }); + it('can set the amount and oversample', function() { + var initialAmt = dist.getAmount(); + var initialOS = dist.getOversample(); + dist.set(1000, '4x'); + expect(dist.getAmount()).not.equal(initialAmt); + expect(dist.getOversample()).not.equal(initialOS); }); + }); }); diff --git a/test/tests/p5.EQ.js b/test/tests/p5.EQ.js index 492ba81c..6a0c3d2b 100644 --- a/test/tests/p5.EQ.js +++ b/test/tests/p5.EQ.js @@ -1,5 +1,6 @@ -define(['chai'], - function(chai) { +'use strict'; + +define(['chai'], function(chai) { var expect = chai.expect; @@ -32,7 +33,7 @@ define(['chai'], }); it('a band can be toggled on and off', function() { - var eq = new p5.EQ(8); + var eq = new p5.EQ(8); expect(eq.bands[2].biquad.type).to.equal('peaking'); eq.bands[2].toggle(); expect(eq.bands[2].biquad.type).to.equal('allpass'); @@ -57,12 +58,12 @@ define(['chai'], it('a bands type can be changed', function() { var eq = new p5.EQ(); - expect(eq.bands[2]._untoggledType=='peaking'); + expect(eq.bands[2]._untoggledType).to.equal('peaking'); eq.bands[2].setType('highshelf'); - expect(eq.bands[2]._untoggledType=='highshelf'); + expect(eq.bands[2]._untoggledType).to.equal('highshelf'); }); - it('drywet value can be changed', function(){ + it('drywet value can be changed', function() { var eq = new p5.EQ(); expect(eq.drywet(0.5)).to.equal(0.5); }); diff --git a/test/tests/p5.Effect.js b/test/tests/p5.Effect.js index f64a0990..d5c10bff 100644 --- a/test/tests/p5.Effect.js +++ b/test/tests/p5.Effect.js @@ -1,5 +1,6 @@ -define(['chai'], - function(chai) { +'use strict'; + +define(['chai'], function(chai) { var expect = chai.expect; @@ -14,12 +15,12 @@ define(['chai'], expect(effect.output).to.equal(undefined); }); - it('drywet value can be changed', function(){ + it('drywet value can be changed', function() { var effect = new p5.Effect(); expect(effect.drywet(0.5)).to.equal(0.5); }); - it('drywet value can be used as getter and setter', function(){ + it('drywet value can be used as getter and setter', function() { var effect = new p5.Effect(); expect(effect.drywet(0.5)).to.equal(0.5); expect(effect.drywet()).to.equal(0.5); diff --git a/test/tests/p5.FFT.js b/test/tests/p5.FFT.js index 7fb04d8a..c9c7d210 100644 --- a/test/tests/p5.FFT.js +++ b/test/tests/p5.FFT.js @@ -1,6 +1,6 @@ -define(['chai'], - function(chai) { +'use strict'; +define(['chai'], function(chai) { var expect = chai.expect; describe('p5.FFT', function() { diff --git a/test/tests/p5.Filter.js b/test/tests/p5.Filter.js index 7f6ad2ad..0390ba5d 100644 --- a/test/tests/p5.Filter.js +++ b/test/tests/p5.Filter.js @@ -1,5 +1,6 @@ -define(['chai'], - function(chai) { +'use strict'; + +define(['chai'], function(chai) { var expect = chai.expect; @@ -10,12 +11,12 @@ define(['chai'], filter.dispose(); }); - it('has initial drywet value of 0.5', function(){ + it('has initial drywet value of 0.5', function() { var filter = new p5.Filter(); expect(filter.drywet(0.5)).to.equal(0.5); }); - it('audio can be processed', function(){ + it('audio can be processed', function() { var filter = new p5.Filter(); var sound = new p5.SoundFile('./testAudio/drum.mp3'); filter.process(sound, 500, 5); diff --git a/test/tests/p5.MonoSynth.js b/test/tests/p5.MonoSynth.js index ebdc3b40..79eb5cad 100644 --- a/test/tests/p5.MonoSynth.js +++ b/test/tests/p5.MonoSynth.js @@ -1,5 +1,6 @@ -define(['chai'], - function(chai) { +'use strict'; + +define(['chai'], function(chai) { var expect = chai.expect; diff --git a/test/tests/p5.Oscillator.js b/test/tests/p5.Oscillator.js index 28bcedf1..da2c92f3 100644 --- a/test/tests/p5.Oscillator.js +++ b/test/tests/p5.Oscillator.js @@ -1,5 +1,6 @@ -define(['chai'], - function(chai) { +'use strict'; + +define(['chai'], function(chai) { var expect = chai.expect; @@ -18,7 +19,7 @@ define(['chai'], o.dispose(); }); - it('starts and stops', function(done){ + it('starts and stops', function(done) { expect(osc.started).to.equal(false); osc.start(); expect(osc.started).to.equal(true); @@ -28,7 +29,7 @@ define(['chai'], }, 100); }); - it('can be scheduled to stop', function(done){ + it('can be scheduled to stop', function(done) { osc.stop(); expect(osc.started).to.equal(false); osc.start(); @@ -86,7 +87,5 @@ define(['chai'], }, 55); }); - - }); }); diff --git a/test/tests/p5.PolySynth.js b/test/tests/p5.PolySynth.js index 22abc056..7ccd2b81 100644 --- a/test/tests/p5.PolySynth.js +++ b/test/tests/p5.PolySynth.js @@ -1,5 +1,6 @@ -define(['chai'], - function(chai) { +'use strict'; + +define(['chai'], function(chai) { var expect = chai.expect; diff --git a/test/tests/p5.Reverb.js b/test/tests/p5.Reverb.js index 95fbc92e..8446a2d4 100644 --- a/test/tests/p5.Reverb.js +++ b/test/tests/p5.Reverb.js @@ -1,5 +1,6 @@ -define(['chai'], - function(chai) { +'use strict'; + +define(['chai'], function(chai) { var expect = chai.expect; @@ -10,27 +11,27 @@ define(['chai'], reverb.dispose(); }); - it('default parmams-> seconds:3, decay: 2, reverse: false', function(){ + it('default parmams-> seconds:3, decay: 2, reverse: false', function() { var reverb = new p5.Reverb(); - expect(reverb._seconds.to.equal(3); - expect(reverb._decay.to.equal(2); - expect(reverb._reverse.to.equal(false); + expect(reverb._seconds).to.equal(3); + expect(reverb._decay).to.equal(2); + expect(reverb._reverse).to.equal(false); }); - it('can set seconds, decayRate, reverse', function(){ + it('can set seconds, decayRate, reverse', function() { var reverb = new p5.Reverb(); reverb.set(5,6,true); - expect(reverb._seconds.to.equal(5); - expect(reverb._decay.to.equal(6); - expect(reverb._reverse.to.equal(true); + expect(reverb._seconds).to.equal(5); + expect(reverb._decay).to.equal(6); + expect(reverb._reverse).to.equal(true); }); - it('drywet value can be changed', function(){ + it('drywet value can be changed', function() { var effect = new p5.Effect(); expect(effect.drywet(0.5)).to.equal(0.5); }); }); -}); \ No newline at end of file +}); diff --git a/test/tests/p5.SoundFile.js b/test/tests/p5.SoundFile.js index a0129ba2..b0b19150 100644 --- a/test/tests/p5.SoundFile.js +++ b/test/tests/p5.SoundFile.js @@ -1,27 +1,27 @@ -define(['chai'], - function(chai) { +'use strict'; +define(['chai'], function(chai) { var expect = chai.expect; - describe("p5.SoundFile", function() { + describe('p5.SoundFile', function() { this.timeout(1000); var sf; var a = new p5.Amplitude(); - after(function(done){ + after(function(done) { sf.dispose(); done(); }); - it('loads a file with soundFormats', function(done){ + it('loads a file with soundFormats', function(done) { p5.prototype.soundFormats('ogg', 'mp3'); - sf = p5.prototype.loadSound('./testAudio/drum', function(){ + sf = p5.prototype.loadSound('./testAudio/drum', function() { done(); }); }); - it('can be created and disposed', function(){ + it('can be created and disposed', function() { var p = new p5.SoundFile('./testAudio/drum', function() { p.dispose(); }); @@ -65,7 +65,7 @@ define(['chai'], setTimeout(function() { expect( sf.currentTime() ).not.equal(0.0); - }, 100) + }, 100); }); it('can getLevel', function(done) { @@ -73,29 +73,29 @@ define(['chai'], setTimeout(function() { expect(sf.getLevel()).not.equal(0.0); done(); - }, 100) + }, 100); }); var peaks, firstPeak; - it('can get peaks', function(){ + it('can get peaks', function() { peaks = sf.getPeaks(sf.buffer.length); expect(peaks.length).to.equal(sf.buffer.length); firstPeak = peaks[0]; }); - it('can reverse buffer with playbackRate', function(){ + it('can reverse buffer with playbackRate', function() { sf.rate(-1); var reversePeaks = sf.getPeaks(sf.buffer.length); expect(reversePeaks[reversePeaks.length - 1]).to.equal(firstPeak); }); - it('can revert buffer to normal with positive playbackRate', function(){ + it('can revert buffer to normal with positive playbackRate', function() { sf.rate(1); var revertPeaks = sf.getPeaks(sf.buffer.length); expect(revertPeaks[0]).to.equal(firstPeak); }); - it('can handle multiple restarts', function(){ + it('can handle multiple restarts', function() { expect( sf.isPlaying() ).to.equal(true); sf.play(); sf.play(); @@ -114,14 +114,14 @@ define(['chai'], }, 50); }); - it('can set volume', function(done){ + it('can set volume', function(done) { sf.stop(); sf.play(); sf.setVolume(0); setTimeout(function() { expect( a.getLevel() ).to.be.closeTo(0.0, 0.3); done(); - }, 100) + }, 100); }); });