Merge pull request #62 from thisandagain/testing

Test Suite Adjustments

.jscsrc

@@ -0,0 +1,26 @@
+{
+    "requireCurlyBraces": [
+        "for",
+        "while",
+        "do",
+        "try",
+        "catch"
+    ],
+    "requireSpaceAfterKeywords": [
+        "default"
+    ],
+    "requireSpacesInFunctionExpression": {
+        "beforeOpeningCurlyBrace": true
+    },
+    "disallowSpacesInFunctionExpression": {
+        "beforeOpeningRoundBrace": true
+    },
+    "disallowEmptyBlocks": true,
+    "disallowSpaceAfterObjectKeys": true,
+    "requireCommaBeforeLineBreak": true,
+    "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
+    "validateIndentation": 4,
+    "disallowMixedSpacesAndTabs": true,
+    "disallowTrailingWhitespace": true,
+    "safeContextKeyword": "self"
+}

README.md

@@ -28,41 +28,18 @@ The tests are written using Karma and there should be a 100% passing rate in ord
 The expectation is to add a unit test for any code that you contribute to the project.
 
 
-Install Node (NPM) (https://npmjs.org/)
+Install Node
 ---------------------------------------
 
-Brew:
+To install [Node.js](http://nodejs.org) and [NPM](http://npmjs.org) simply go to [http://nodejs.org](http://nodejs.org/), download the package for your operating system and install. Once installed, navigate to your local scratch directory and run:
-```
-$ brew install npm
-```
 
-Mac Ports:
+```bash
-```
+npm install
-$ port install npm
-```
-
-In your local scratch directory
-
-```
-$ npm install
-```
-
-Local copy of jQuery
---------------------
-
-```
-$ cd test/lib
-$ curl http://code.jquery.com/jquery-1.11.0.min.js > jquery-1.11.0.min.js
 ```
 
 To Run the tests
 ----------------
 
+```bash
+npm test
 ```
-$ ./scripts/test.sh
-```
-
-
-To configure the unit tests
----------------------------
-The karam.conf.js file is location in the config directory

js/IO.js

@@ -37,12 +37,12 @@ var IO = function() {
 };
 
 IO.prototype.loadProject = function(project_id) {
-    var runningIO = this;
+    var self = this;
     $.getJSON(this.project_base + project_id + this.project_suffix, function(data) {
-        runningIO.data = data;
+        self.data = data;
-        runningIO.makeObjects();
+        self.makeObjects();
-        runningIO.loadThreads();
+        self.loadThreads();
-        runningIO.loadNotesDrums();
+        self.loadNotesDrums();
         runtime.loadStart(); // Try to run the project.
     });
 };
@@ -126,8 +126,8 @@ IO.prototype.makeObjects = function() {
     $.each(this.data.children, function(index, obj) {
         createObj(obj, runtime.stage); // create children of stage - sprites, watchers, and stage's lists
     });
-    $.each(runtime.sprites.filter(function(sprite){return sprite instanceof Sprite}), function(index, sprite) { // list of sprites
+    $.each(runtime.sprites.filter(function(sprite) {return sprite instanceof Sprite}), function(index, sprite) { // list of sprites
-        $.each(sprite.lists, function(index, list){
+        $.each(sprite.lists, function(index, list) {
             createObj(list, sprite); // create local lists
         });
     });

js/Interpreter.js

@@ -319,8 +319,11 @@ Interpreter.prototype.lookupPrim = function(op) {
 Interpreter.prototype.primNoop = function(b) { console.log(b.op); };
 
 Interpreter.prototype.primWait = function(b) {
-    if (interp.activeThread.firstTime) interp.startTimer(interp.numarg(b, 0));
+    if (interp.activeThread.firstTime) {
-    else interp.checkTimer();
+        interp.startTimer(interp.numarg(b, 0));
+    } else {
+        interp.checkTimer();
+    }
 };
 
 Interpreter.prototype.primRepeat = function(b) {
@@ -348,7 +351,9 @@ Interpreter.prototype.broadcast = function(b, waitFlag) {
             }
         }
         runtime.allStacksDo(findReceivers);
-        for (pair in receivers) interp.restartThread(receivers[pair][0], receivers[pair][1]);
+        for (pair in receivers) {
+            interp.restartThread(receivers[pair][0], receivers[pair][1]);
+        }
         if (!waitFlag) return;
         interp.activeThread.tmpObj = receivers;
         interp.activeThread.firstTime = false;

js/Reporter.js

@@ -38,13 +38,9 @@ var Reporter = function(data) {
 };
 
 Reporter.prototype.determineReporterLabel = function() {
-  if (this.target === 'Stage' && this.cmd === "getVar:") {
+    if (this.target === 'Stage' && this.cmd === "getVar:") return this.param;
-    return this.param;
+    if (this.target === 'Stage' && this.param === null) return this.cmd;
-  } else if (this.target === 'Stage' && this.param === null) {
-    return this.cmd;
-  } else {
     return this.target + ': ' + this.param;
-  }
 }
 
 Reporter.prototype.attach = function(scene) {
@@ -164,10 +160,10 @@ List.prototype.attach = function(scene) {
     var c = this.containerEl = $('<div style="overflow:hidden;float:left;position:relative">').appendTo(this.el).width(this.width-13).height(this.height-34);
     var s = this.scrollbar = $('<div class="list-scrollbar-container"><div class="list-scrollbar">').appendTo(this.el);
     var sb = s.children('.list-scrollbar');
-    sb.mousedown(function(e){
+    sb.mousedown(function(e) {
         if (e.which===1) $(this).data({scrolling:true,startY:e.pageY}); // left button
     });
-    $('body').mousemove(function(e){
+    $('body').mousemove(function(e) {
         if (sb.data('scrolling')) {
             var offset = parseInt(sb.css('top'))+e.pageY-sb.data('startY');
             if (offset < 0) {
@@ -179,7 +175,7 @@ List.prototype.attach = function(scene) {
             sb.css('top',offset);
             c.scrollTop(c.height()/sb.height()*offset);
         }
-    }).mouseup(function(){
+    }).mouseup(function() {
         if ($.hasData(sb[0],'scrolling')) sb.removeData(['scrolling','startY']);
     });
 //    this.el.append('<div class="list-add">+'); // disabled because it doesn't do anything even in the original
@@ -194,14 +190,14 @@ List.prototype.attach = function(scene) {
     this.el.css('display', this.visible ? 'inline-block' : 'none');
 };
 
-List.prototype.update = function(){
+List.prototype.update = function() {
     this.contents = findList(runtime.spriteNamed(this.target),this.listName);
 
     this.el.css('display', this.visible ? 'inline-block' : 'none');
     if (!this.visible) return;
 
     var c = this.containerEl.html(''); // so that it can be used inside the forEach
-    this.contents.forEach(function(val,i){
+    this.contents.forEach(function(val,i) {
         $('<div style="clear:both">').appendTo(c).append('<div class="list-index">'+(i+1),'<div class="list-item">'+val);
     });
     c.find('.list-index').width(c.find('.list-index').last().width());

js/Runtime.js

@@ -42,9 +42,9 @@ Runtime.prototype.init = function() {
     this.scene = $('#container');
     window.AudioContext = window.AudioContext || window.webkitAudioContext;
     this.audioContext = new AudioContext();
-		try{
+    try {
         this.audioGain = this.audioContext.createGain();
-		}catch(err){
+    } catch(err) {
         this.audioGain = this.audioContext.createGainNode();
     }
     this.audioGain.connect(runtime.audioContext.destination);

js/Sprite.js

@@ -173,9 +173,9 @@ Sprite.prototype.attach = function(scene) {
 
 // Load sounds from the server and buffer them
 Sprite.prototype.loadSounds = function() {
-    var spr = this;
+    var self = this;
     $.each(this.sounds, function(index, sound) {
-        io.soundRequest(sound, spr);
+        io.soundRequest(sound, self);
     });
 };
 
@@ -308,21 +308,27 @@ Sprite.prototype.updateTransform = function() {
         // sign to the X scale.
     }
 
-    $(this.mesh).css('transform',
+    $(this.mesh).css(
-                'translatex(' + drawX + 'px) \
+        'transform',
-                 translatey(' + drawY + 'px) \
+        'translatex(' + drawX + 'px) ' +
-                 rotate(' + this.rotation + 'deg) \
+        'translatey(' + drawY + 'px) ' +
-                 scaleX(' + scaleXprepend + (this.scale / resolution) + ') scaleY(' +  (this.scale / resolution) + ')');
+        'rotate(' + this.rotation + 'deg) ' +
-    $(this.mesh).css('-moz-transform',
+        'scaleX(' + scaleXprepend + (this.scale / resolution) + ') scaleY(' +  (this.scale / resolution) + ')'
-                'translatex(' + drawX + 'px) \
+    );
-                 translatey(' + drawY + 'px) \
+    $(this.mesh).css(
-                 rotate(' + this.rotation + 'deg) \
+        '-moz-transform',
-                 scaleX(' + scaleXprepend + this.scale + ') scaleY(' +  this.scale / resolution + ')');
+        'translatex(' + drawX + 'px) ' +
-    $(this.mesh).css('-webkit-transform',
+        'translatey(' + drawY + 'px) ' +
-                'translatex(' + drawX + 'px) \
+        'rotate(' + this.rotation + 'deg) ' +
-                 translatey(' + drawY + 'px) \
+        'scaleX(' + scaleXprepend + this.scale + ') scaleY(' +  this.scale / resolution + ')'
-                 rotate(' + this.rotation + 'deg) \
+    );
-                 scaleX(' + scaleXprepend + (this.scale / resolution) + ') scaleY(' +  (this.scale / resolution) + ')');
+    $(this.mesh).css(
+        '-webkit-transform',
+        'translatex(' + drawX + 'px) ' +
+        'translatey(' + drawY + 'px) ' +
+        'rotate(' + this.rotation + 'deg) ' +
+        'scaleX(' + scaleXprepend + (this.scale / resolution) + ') scaleY(' +  (this.scale / resolution) + ')'
+    );
 
     $(this.mesh).css('-webkit-transform-origin', rotationCenterX + 'px ' + rotationCenterY + 'px');
     $(this.mesh).css('-moz-transform-origin', rotationCenterX + 'px ' + rotationCenterY + 'px');
@@ -342,9 +348,11 @@ Sprite.prototype.updateTransform = function() {
 
 Sprite.prototype.updateFilters = function() {
     $(this.mesh).css('opacity', 1 - this.filters.ghost / 100);
-    $(this.mesh).css('-webkit-filter',
+    $(this.mesh).css(
-        'hue-rotate(' + (this.filters.color * 1.8) + 'deg) \
+        '-webkit-filter',
-        brightness(' + (this.filters.brightness < 0 ? this.filters.brightness / 100 + 1 : Math.min(2.5, this.filters.brightness * .015 + 1)) + ')');
+        'hue-rotate(' + (this.filters.color * 1.8) + 'deg) ' +
+        'brightness(' + (this.filters.brightness < 0 ? this.filters.brightness / 100 + 1 : Math.min(2.5, this.filters.brightness * .015 + 1)) + ')'
+    );
 };
 
 Sprite.prototype.getTalkBubbleXY = function() {
@@ -416,7 +424,7 @@ Sprite.prototype.hideAsk = function() {
 
 Sprite.prototype.bindDoAskButton = function() {
     var self = this;
-  this.askInputButton.on("keypress click", function(e){
+    this.askInputButton.on("keypress click", function(e) {
         var eType = e.type;
         if (eType === 'click' || (eType === 'keypress' && e.which === 13)) {
             var stage = interp.targetStage();

js/primitives/SensingPrims.js

@@ -33,7 +33,7 @@ SensingPrims.prototype.addPrimsTo = function(primTable) {
 
     primTable['getAttribute:of:'] = this.primGetAttribute;
 
-    primTable['timeAndDate']  = function(b){ return runtime.getTimeString(interp.arg(b, 0)); };
+    primTable['timeAndDate']  = function(b) { return runtime.getTimeString(interp.arg(b, 0)); };
     primTable['timestamp'] = this.primTimestamp;
 };
 

js/primitives/VarListPrims.js

@@ -123,9 +123,13 @@ VarListPrims.prototype.primListDeleteLine = function(b) {
     var list = findList(interp.targetSprite(), interp.arg(b, 1));
     if (!list) return;
     var line = interp.arg(b, 0);
-    if (line == 'all' || list.length == 0) list.length = 0;
+    if (line == 'all' || list.length == 0) {
-    else if (line == 'last') list.splice(list.length - 1, 1);
+        list.length = 0;
-    else if (parseInt(line, 10) - 1 in list) list.splice(parseInt(line, 10) - 1, 1);
+    } else if (line == 'last') {
+        list.splice(list.length - 1, 1);
+    } else if (parseInt(line, 10) - 1 in list) {
+        list.splice(parseInt(line, 10) - 1, 1);
+    }
 };
 
 VarListPrims.prototype.primListInsertAt = function(b) {
@@ -134,9 +138,13 @@ VarListPrims.prototype.primListInsertAt = function(b) {
     var newItem = interp.arg(b, 0);
 
     var position = interp.arg(b, 1);
-    if (position == 'last') position = list.length;
+    if (position == 'last') {
-    else if (position == 'random') position = Math.round(Math.random() * list.length);
+        position = list.length;
-    else position = parseInt(position, 10) - 1;
+    } else if (position == 'random') {
+        position = Math.round(Math.random() * list.length);
+    } else {
+        position = parseInt(position, 10) - 1;
+    }
     if (position > list.length) return;
 
     list.splice(position, 0, newItem);
@@ -148,12 +156,15 @@ VarListPrims.prototype.primListSetLine = function(b) {
     var newItem = interp.arg(b, 2);
     var position = interp.arg(b, 0);
 
-    if (position == 'last') position = list.length - 1;
+    if (position == 'last') {
-    else if (position == 'random') position = Math.floor(Math.random() * list.length);
+        position = list.length - 1;
-    else position = parseInt(position, 10) - 1;
+    } else if (position == 'random') {
+        position = Math.floor(Math.random() * list.length);
+    } else {
+        position = parseInt(position, 10) - 1;
+    }
 
     if (position > list.length - 1) return;
-
     list[position] = newItem;
 };
 

js/sound/NotePlayer.js

@@ -107,8 +107,8 @@ NotePlayer.prototype.interpolatedSample = function() {
 
 NotePlayer.prototype.rawSample = function(sampleIndex) {
     if (sampleIndex >= this.endOffset) {
-        if (this.isLooped) sampleIndex = this.loopPoint;
+        if (!this.isLooped) return 0;
-        else return 0;
+        sampleIndex = this.loopPoint;
     }
     var byteIndex = 2 * sampleIndex;
     var result = (this.soundData[byteIndex + 1] << 8) + this.soundData[byteIndex];

js/sound/SoundBank.js

@@ -32,7 +32,8 @@ var SoundBank = function() {};
 // The loop points are -1 if the sound is unlooped (e.g. Marimba).
 // The three-element envelop array may be omitted if the instrument has no envelope.
 SoundBank.instruments = [
-    [[38, 'AcousticPiano_As3', 58, 10266, 17053, [0, 100, 22]],
+    [
+        [38, 'AcousticPiano_As3', 58, 10266, 17053, [0, 100, 22]],
         [44, 'AcousticPiano_C4', 60, 13968, 18975, [0, 100, 20]],
         [51, 'AcousticPiano_G4', 67, 12200, 12370, [0, 80, 18]],
         [62, 'AcousticPiano_C6', 84, 13042, 13276, [0, 80, 16]],
@@ -41,105 +42,126 @@ SoundBank.instruments = [
         [85, 'AcousticPiano_Ds6', 87, 12368, 12869, [0, 0, 8]],
         [90, 'AcousticPiano_Ds6', 87, 12368, 12869, [0, 0, 6]],
         [96, 'AcousticPiano_D7', 98, 7454, 7606, [0, 0, 3]],
-     [128, 'AcousticPiano_D7', 98, 7454, 7606, [0, 0, 2]]],
+        [128, 'AcousticPiano_D7', 98, 7454, 7606, [0, 0, 2]]
-
+    ],
-    [[48, 'ElectricPiano_C2', 36, 15338, 17360, [0, 80, 10]],
+    [
+        [48, 'ElectricPiano_C2', 36, 15338, 17360, [0, 80, 10]],
         [74, 'ElectricPiano_C4', 60, 11426, 12016, [0, 40, 8]],
-     [128, 'ElectricPiano_C4', 60, 11426, 12016, [0, 0, 6]]],
+        [128, 'ElectricPiano_C4', 60, 11426, 12016, [0, 0, 6]]
-
+    ],
-    [[128, 'Organ_G2', 43, 1306, 3330]],
+    [
-
+        [128, 'Organ_G2', 43, 1306, 3330]
-    [[40, 'AcousticGuitar_F3', 53, 36665, 36791, [0, 0, 15]],
+    ],
+    [
+        [40, 'AcousticGuitar_F3', 53, 36665, 36791, [0, 0, 15]],
         [56, 'AcousticGuitar_F3', 53, 36665, 36791, [0, 0, 13.5]],
         [60, 'AcousticGuitar_F3', 53, 36665, 36791, [0, 0, 12]],
         [67, 'AcousticGuitar_F3', 53, 36665, 36791, [0, 0, 8.5]],
         [72, 'AcousticGuitar_F3', 53, 36665, 36791, [0, 0, 7]],
         [83, 'AcousticGuitar_F3', 53, 36665, 36791, [0, 0, 5.5]],
-     [128, 'AcousticGuitar_F3', 53, 36665, 36791, [0, 0, 4.5]]],
+        [128, 'AcousticGuitar_F3', 53, 36665, 36791, [0, 0, 4.5]]
-
+    ],
-    [[40, 'ElectricGuitar_F3', 53, 34692, 34945, [0, 0, 15]],
+    [
+        [40, 'ElectricGuitar_F3', 53, 34692, 34945, [0, 0, 15]],
         [56, 'ElectricGuitar_F3', 53, 34692, 34945, [0, 0, 13.5]],
         [60, 'ElectricGuitar_F3', 53, 34692, 34945, [0, 0, 12]],
         [67, 'ElectricGuitar_F3', 53, 34692, 34945, [0, 0, 8.5]],
         [72, 'ElectricGuitar_F3', 53, 34692, 34945, [0, 0, 7]],
         [83, 'ElectricGuitar_F3', 53, 34692, 34945, [0, 0, 5.5]],
-     [128, 'ElectricGuitar_F3', 53, 34692, 34945, [0, 0, 4.5]]],
+        [128, 'ElectricGuitar_F3', 53, 34692, 34945, [0, 0, 4.5]]
-
+    ],
-    [[34, 'ElectricBass_G1', 31, 41912, 42363, [0, 0, 17]],
+    [
+        [34, 'ElectricBass_G1', 31, 41912, 42363, [0, 0, 17]],
         [48, 'ElectricBass_G1', 31, 41912, 42363, [0, 0, 14]],
         [64, 'ElectricBass_G1', 31, 41912, 42363, [0, 0, 12]],
-     [128, 'ElectricBass_G1', 31, 41912, 42363, [0, 0, 10]]],
+        [128, 'ElectricBass_G1', 31, 41912, 42363, [0, 0, 10]]
-
+    ],
-    [[38, 'Pizz_G2', 43, 8554, 8782, [0, 0, 5]],
+    [
+        [38, 'Pizz_G2', 43, 8554, 8782, [0, 0, 5]],
         [45, 'Pizz_G2', 43, 8554, 8782, [0, 12, 4]],
         [56, 'Pizz_A3', 57, 11460, 11659, [0, 0, 4]],
         [64, 'Pizz_A3', 57, 11460, 11659, [0, 0, 3.2]],
         [72, 'Pizz_E4', 64, 17525, 17592, [0, 0, 2.8]],
         [80, 'Pizz_E4', 64, 17525, 17592, [0, 0, 2.2]],
-     [128, 'Pizz_E4', 64, 17525, 17592, [0, 0, 1.5]]],
+        [128, 'Pizz_E4', 64, 17525, 17592, [0, 0, 1.5]]
-
+    ],
-    [[41, 'Cello_C2', 36, 8548, 8885],
+    [
+        [41, 'Cello_C2', 36, 8548, 8885],
         [52, 'Cello_As2', 46, 7465, 7845],
         [62, 'Violin_D4', 62, 10608, 11360],
         [75, 'Violin_A4', 69, 3111, 3314, [70, 0, 0]],
-     [128, 'Violin_E5', 76, 2383, 2484]],
+        [128, 'Violin_E5', 76, 2383, 2484]
-
+    ],
-    [[30, 'BassTrombone_A2_3', 45, 1357, 2360],
+    [
+        [30, 'BassTrombone_A2_3', 45, 1357, 2360],
         [40, 'BassTrombone_A2_2', 45, 1893, 2896],
         [55, 'Trombone_B3', 59, 2646, 3897],
         [88, 'Trombone_B3', 59, 2646, 3897, [50, 0, 0]],
-     [128, 'Trumpet_E5', 76, 2884, 3152]],
+        [128, 'Trumpet_E5', 76, 2884, 3152]
-
+    ],
-    [[128, 'Clarinet_C4', 60, 14540, 15468]],
+    [
-
+        [128, 'Clarinet_C4', 60, 14540, 15468]
-    [[40, 'TenorSax_C3', 48, 8939, 10794],
+    ],
+    [
+        [40, 'TenorSax_C3', 48, 8939, 10794],
         [50, 'TenorSax_C3', 48, 8939, 10794, [20, 0, 0]],
         [59, 'TenorSax_C3', 48, 8939, 10794, [40, 0, 0]],
         [67, 'AltoSax_A3', 57, 8546, 9049],
         [75, 'AltoSax_A3', 57, 8546, 9049, [20, 0, 0]],
         [80, 'AltoSax_A3', 57, 8546, 9049, [20, 0, 0]],
-     [128, 'AltoSax_C6', 84, 1258, 1848]],
+        [128, 'AltoSax_C6', 84, 1258, 1848]
-
+    ],
-    [[61, 'Flute_B5_2', 83, 1859, 2259],
+    [
-     [128, 'Flute_B5_1', 83, 2418, 2818]],
+        [61, 'Flute_B5_2', 83, 1859, 2259],
-
+        [128, 'Flute_B5_1', 83, 2418, 2818]
-    [[128, 'WoodenFlute_C5', 72, 11426, 15724]],
+    ],
-
+    [
-    [[57, 'Bassoon_C3', 48, 2428, 4284],
+        [128, 'WoodenFlute_C5', 72, 11426, 15724]
+    ],
+    [
+        [57, 'Bassoon_C3', 48, 2428, 4284],
         [67, 'Bassoon_C3', 48, 2428, 4284, [40, 0, 0]],
         [76, 'Bassoon_C3', 48, 2428, 4284, [80, 0, 0]],
         [84, 'EnglishHorn_F3', 53, 7538, 8930, [40, 0, 0]],
-     [128, 'EnglishHorn_D4', 62, 4857, 5231]],
+        [128, 'EnglishHorn_D4', 62, 4857, 5231]
-
+    ],
-    [[39, 'Choir_F3', 53, 14007, 41281],
+    [
+        [39, 'Choir_F3', 53, 14007, 41281],
         [50, 'Choir_F3', 53, 14007, 41281, [40, 0, 0]],
         [61, 'Choir_F3', 53, 14007, 41281, [60, 0, 0]],
         [72, 'Choir_F4', 65, 16351, 46436],
-     [128, 'Choir_F5', 77, 18440, 45391]],
+        [128, 'Choir_F5', 77, 18440, 45391]
-
+    ],
-    [[38, 'Vibraphone_C3', 48, 6202, 6370, [0, 100, 8]],
+    [
+        [38, 'Vibraphone_C3', 48, 6202, 6370, [0, 100, 8]],
         [48, 'Vibraphone_C3', 48, 6202, 6370, [0, 100, 7.5]],
         [59, 'Vibraphone_C3', 48, 6202, 6370, [0, 60, 7]],
         [70, 'Vibraphone_C3', 48, 6202, 6370, [0, 40, 6]],
         [78, 'Vibraphone_C3', 48, 6202, 6370, [0, 20, 5]],
         [86, 'Vibraphone_C3', 48, 6202, 6370, [0, 0, 4]],
-     [128, 'Vibraphone_C3', 48, 6202, 6370, [0, 0, 3]]],
+        [128, 'Vibraphone_C3', 48, 6202, 6370, [0, 0, 3]]
-
+    ],
-    [[128, 'MusicBox_C4', 60, 14278, 14700, [0, 0, 2]]],
+    [
-
+        [128, 'MusicBox_C4', 60, 14278, 14700, [0, 0, 2]]
-    [[128, 'SteelDrum_D5', 74.4, -1, -1, [0, 0, 2]]],
+    ],
-
+    [
-    [[128, 'Marimba_C4', 60, -1, -1]],
+        [128, 'SteelDrum_D5', 74.4, -1, -1, [0, 0, 2]]
-
+    ],
-    [[80, 'SynthLead_C4', 60, 135, 1400],
+    [
-     [128, 'SynthLead_C6', 84, 124, 356]],
+        [128, 'Marimba_C4', 60, -1, -1]
-
+    ],
-    [[38, 'SynthPad_A3', 57, 4212, 88017, [50, 0, 0]],
+    [
+        [80, 'SynthLead_C4', 60, 135, 1400],
+        [128, 'SynthLead_C6', 84, 124, 356]
+    ],
+    [
+        [38, 'SynthPad_A3', 57, 4212, 88017, [50, 0, 0]],
         [50, 'SynthPad_A3', 57, 4212, 88017, [80, 0, 0]],
         [62, 'SynthPad_A3', 57, 4212, 88017, [110, 0, 0]],
         [74, 'SynthPad_A3', 57, 4212, 88017, [150, 0, 0]],
         [86, 'SynthPad_A3', 57, 4212, 88017, [200, 0, 0]],
-     [128, 'SynthPad_C6', 84, 2575, 9202]],
+        [128, 'SynthPad_C6', 84, 2575, 9202]
+    ]
 ];
 
 // -----------------------------

makefile

@@ -0,0 +1,20 @@
+JSCS_PATH = ./node_modules/.bin/jscs
+KARMA_PATH = ./node_modules/.bin/karma
+KARMA_CONFIG = ./test/fixtures/karma.conf.js
+
+# Performs code governance (lint + style) test
+lint:
+	@$(JSCS_PATH) ./js/*
+	@$(JSCS_PATH) ./test/unit/*
+
+# Performs unit tests
+unit:
+	@$(KARMA_PATH) start $(KARMA_CONFIG) $*
+
+# Run all test targets
+test:
+	@make lint
+	@make unit
+
+# Ignore directory structure
+.PHONY: lint unit test

package.json

@@ -2,10 +2,19 @@
   "name": "scratch-html5",
   "description": "HTML 5 based Scratch project player",
   "repository": "https://github.com/LLK/scratch-html5",
+  "scripts": {
+    "postinstall": "curl http://code.jquery.com/jquery-1.11.0.min.js > ./test/lib/jquery-1.11.0.min.js",
+    "test": "make test"
+  },
+  "engines": {
+    "node": ">=0.10"
+  },
+  "dependencies": {},
   "devDependencies": {
-      "karma" : "~0.10",
+    "jasmine-jquery": "~1.3.3",
-      "jasmine-jquery" : "1.3.3",
+    "jscs": "~1.3.0",
-      "karma-html2js-preprocessor" : "~0.1.0",
+    "karma": "~0.10",
-      "underscore" : "~1.6.0"
+    "karma-html2js-preprocessor": "~0.1.0",
+    "underscore": "~1.6.0"
   }
 }

scripts/test.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-BASE_DIR=`dirname $0`
-
-echo ""
-echo "Starting Karma Server (http://karma-runner.github.io)"
-echo "-------------------------------------------------------------------"
-
-$BASE_DIR/../node_modules/karma/bin/karma start $BASE_DIR/../config/karma.conf.js $*

test/fixtures/karma.conf.js

@@ -1,6 +1,6 @@
 module.exports = function(config){
     config.set({
-    basePath : '../',
+    basePath : '../../',
 
     files : [
       'test/artifacts/**/*.js',

test/unit/ioSpec.js

@@ -2,7 +2,7 @@
 
 /* jasmine specs for IO.js go here */
 
-describe('IO', function(){
+describe('IO', function() {
     var io;
 
     beforeEach(function() {

test/unit/looksPrimitiveSpec.js

@@ -7,7 +7,7 @@ describe('LooksPrims', function() {
         targetSpriteMock = targetMock();
     });
 
-  describe('showBubble for say', function(){
+    describe('showBubble for say', function() {
         var sayBlock;
         beforeEach(function() {
             sayBlock = {'args': ['what to say']};
@@ -21,7 +21,7 @@ describe('LooksPrims', function() {
         });
     });
 
-  describe('showBubble for think', function(){
+    describe('showBubble for think', function() {
         var thinkBlock;
         beforeEach(function() {
             thinkBlock = {'args': ['what to think']};
@@ -35,7 +35,7 @@ describe('LooksPrims', function() {
         });
     });
 
-  describe('showBubble for ask', function(){
+    describe('showBubble for ask', function() {
         var askBlock;
         beforeEach(function() {
             askBlock = {'args': ['what to ask']};

test/unit/scratchSpec.js

@@ -10,7 +10,7 @@ describe('Scratch', function() {
         scratch = Scratch;
     });
 
-    describe('Scratch - Load Project', function(){
+    describe('Scratch - Load Project', function() {
         beforeEach(function() {
             scratch(project_id);
         });
@@ -28,7 +28,7 @@ describe('Scratch', function() {
         });
     });
 
-    describe('Scratch - Click Green Flag', function(){
+    describe('Scratch - Click Green Flag', function() {
         beforeEach(function() {
             setFixtures('<button id=trigger-green-flag tabindex=2></button><div id="overlay"></div>');
             scratch(project_id);
@@ -51,7 +51,7 @@ describe('Scratch', function() {
         });
     });
 
-    describe('Scratch - Click Stop', function(){
+    describe('Scratch - Click Stop', function() {
         beforeEach(function() {
             setFixtures('<button id=trigger-stop tabindex=3></button>');
             scratch(project_id);

test/unit/sensingPrimitiveSpec.js

@@ -7,16 +7,16 @@ describe('SensingPrims', function() {
         realDate = Date;
     });
 
-  afterEach(function () {
+    afterEach(function() {
         Date = realDate;
     });
 
-  describe('primTimestamp', function(){
+    describe('primTimestamp', function() {
         beforeEach(function() {
             /* MonkeyPatching the built-in Javascript Date */
             var epochDate = new Date(2000, 0, 1);
             var nowDate = new Date(2014, 5, 16);
-      Date = function () {
+            Date = function() {
                 return (arguments.length ? epochDate : nowDate);
             };
         });
@@ -26,60 +26,60 @@ describe('SensingPrims', function() {
         });
     });
 
-  describe('primTimeDate', function(){
+    describe('primTimeDate', function() {
         beforeEach(function() {
             /* MonkeyPatching the built-in Javascript Date */
-      Date = function () {
+            Date = function() {
                 return {
-          'getFullYear' : function() { return 2014;},
+                    'getFullYear': function() { return 2014;},
-          'getMonth' : function() { return 4;},
+                    'getMonth': function() { return 4;},
-          'getDate' : function() { return 16;},
+                    'getDate': function() { return 16;},
-          'getDay' : function() { return 4;},
+                    'getDay': function() { return 4;},
-          'getHours' : function() { return 9;},
+                    'getHours': function() { return 9;},
-          'getMinutes' : function() { return 18;},
+                    'getMinutes': function() { return 18;},
-          'getSeconds' : function() { return 36;},
+                    'getSeconds': function() { return 36;},
-          'getTime' : function() {}
+                    'getTime': function() {}
                 };
             };
         });
 
         it('should return the year', function() {
-      var block = {'args' : ['year']};
+            var block = {'args': ['year']};
             expect(sensingPrims.prototype.primTimeDate(block)).toEqual(2014);
         });
 
         it('should return the month of the year', function() {
-      var block = {'args' : ['month']};
+            var block = {'args': ['month']};
             expect(sensingPrims.prototype.primTimeDate(block)).toEqual(5);
         });
 
         it('should return the day of the week', function() {
-      var block = {'args' : ['day of week']};
+            var block = {'args': ['day of week']};
             expect(sensingPrims.prototype.primTimeDate(block)).toEqual(5);
         });
 
         it('should return the hour of the day', function() {
-      var block = {'args' : ['hour']};
+            var block = {'args': ['hour']};
             expect(sensingPrims.prototype.primTimeDate(block)).toEqual(9);
         });
 
         it('should return the minute of the hour', function() {
-      var block = {'args' : ['minute']};
+            var block = {'args': ['minute']};
             expect(sensingPrims.prototype.primTimeDate(block)).toEqual(18);
         });
 
         it('should return the second of the minute', function() {
-      var block = {'args' : ['second']};
+            var block = {'args': ['second']};
             expect(sensingPrims.prototype.primTimeDate(block)).toEqual(36);
         });
 
         it('should return the 0 on year', function() {
-      var block = {'args' : ['anythingElse']};
+            var block = {'args': ['anythingElse']};
             expect(sensingPrims.prototype.primTimeDate(block)).toEqual(0);
         });
     });
 
-  describe('primAnswer', function(){
+    describe('primAnswer', function() {
         beforeEach(function() {
             interp = interpreterMock({'targetSprite': new targetMock()});
         });
@@ -89,13 +89,12 @@ describe('SensingPrims', function() {
         });
     });
 
-  describe('primDoAsk', function(){
+    describe('primDoAsk', function() {
         var askBlock, targetSpriteMock;
         beforeEach(function() {
             targetSpriteMock = targetMock();
             askBlock = {'args': 'what to ask'};
             interp = interpreterMock({'targetSprite': targetSpriteMock}, {'arg': askBlock});
-
         });
 
         it('should call the showBubble method on the targetedSprite', function() {
@@ -107,6 +106,4 @@ describe('SensingPrims', function() {
             expect(interp.activeThread.paused).toBe(true);
         });
     });
-
-
 });

test/unit/spriteSpec.js

@@ -75,7 +75,7 @@ describe('Sprite', function() {
             spriteProto.talkBubble.append(spriteProto.talkBubbleStyler);
         });
 
-    describe('Say', function(){
+        describe('Say', function() {
             it('should call the showBubble method on the Sprite', function() {
                 var text = "What to say";
                 spyOn(spriteProto, "getTalkBubbleXY").andReturn([50,50]);;
@@ -87,7 +87,7 @@ describe('Sprite', function() {
             });
         });
 
-    describe('Think', function(){
+        describe('Think', function() {
             it('should call the showBubble method on the Sprite', function() {
                 var text = "What to think";
                 spyOn(spriteProto, "getTalkBubbleXY").andReturn([50,50]);;
@@ -99,7 +99,7 @@ describe('Sprite', function() {
             });
         });
 
-    describe('Ask', function(){
+        describe('Ask', function() {
             it('should call the showBubble method on the Sprite', function() {
                 var text = "What to Ask";
                 spyOn(spriteProto, "getTalkBubbleXY").andReturn([50,50]);;
@@ -111,7 +111,7 @@ describe('Sprite', function() {
             });
         });
 
-    describe('Any Bubble with visible false', function(){
+        describe('Any Bubble with visible false', function() {
             it('should call the showBubble method on the Sprite and not display it', function() {
                 spriteProto.visible = false;
                 var text = "What to Ask";