Re-enabled block tests and fixed block specific issues.

Move namespace for some implementations and added fallback for former implementations for compability reasons.

Author: MarkusBordihn

app/chrome_app/manifest.json

@@ -9,7 +9,7 @@
   "short_name": "Coding with Chrome",
   "description": "Learn, improve, or teach coding skills within a Chrome browser.",
   "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgSWdCJSwkgFTY9d993Quot277oCS2PCM2H/F6U28NE8D3Z21GXS/7qW8XCGShB054Wboq62pP679f9tB9F+GRHzOh/an4zIu+Uhb3ZKVzZLJbHsP8N+E5wk3wgwOBgE+UXCy9I8i1RpfzutJ4aha+YEzvCsVpo6UwsuWiXORB9yRU5NuooYX+fhVpWZmrZJo4vqzQhuoJ/uWiQujABXXo4qdrclwSw8+JlpWLMqHHQ6HE8Sf7VWDdGvRdYP6LRZobWqovb659qEumJ0bxhwXtHkWgPHQWtW35T/r/oH8uuke35pH+YtBtaOqN5U3bYGPinP0bYrI33OSLUJx/DrC1wIDAQAB",
-  "version": "5.8.12",
+  "version": "5.8.16",
   "oauth2": {
     "client_id": "418162477970-2qmsb2sp3m522hf292154favsjgpsj9n.apps.googleusercontent.com",
     "scopes": [

app/nw_app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "binary",
-  "version": "5.8.12",
+  "version": "5.8.16",
   "main": "js/background.js",
   "window": {
     "title": "Coding with Chrome",

build/cwc/frameworks.js

@@ -218,19 +218,36 @@ closureBuilder.build({
 
 
 /**
- * Sphero Framework
+ * Sphero 2.0 Framework
  */
 closureBuilder.build({
-  name: 'cwc.framework.Sphero',
+  name: 'cwc.framework.sphero.Sphero2',
   compress: true,
   srcs: glob([
-    'src/frameworks/sphero/*.js',
+    'src/frameworks/sphero/sphero2/*.js',
   ]),
   deps: glob([
     'src/frameworks/messenger/*.js',
     'third_party/coding-with-chrome-libraries/src/utils/stack/stack.js',
   ]),
-  out: 'genfiles/core/frameworks/internal/sphero_framework.js',
+  out: 'genfiles/core/frameworks/internal/sphero2_framework.js',
+});
+
+
+/**
+ * Sphero SPRK+ Framework
+ */
+closureBuilder.build({
+  name: 'cwc.framework.sphero.SprkPlus',
+  compress: true,
+  srcs: glob([
+    'src/frameworks/sphero/sprk_plus/*.js',
+  ]),
+  deps: glob([
+    'src/frameworks/messenger/*.js',
+    'third_party/coding-with-chrome-libraries/src/utils/stack/stack.js',
+  ]),
+  out: 'genfiles/core/frameworks/internal/sprk_plus_framework.js',
 });
 
 

build/cwc/main-debug.js

@@ -31,7 +31,8 @@ closureBuilder.build({
     'gensoyfiles/**/!(*_test).js',
     '!src/{blocks,blocks/**.js}',
     '!src/{frameworks,frameworks/**.js}',
-     'third_party/coding-with-chrome-libraries/src/**/!(*_test).js',
+    '../coding-with-chrome-libraries/src/**/!(*_test).js',
+    // 'third_party/coding-with-chrome-libraries/src/**/!(*_test).js',
   ]),
   externs: [
     'build/externs/blockly.js',

package.json

@@ -1,7 +1,7 @@
 {
   "name": "coding-with-chrome",
   "description": "Coding with Chrome",
-  "version": "5.8.12",
+  "version": "5.8.16",
   "author": "Markus Bordihn ([email protected])",
   "license": "Apache-2.0",
   "private": true,
@@ -122,10 +122,10 @@
     "publish:prepare": "npm run test && npm run clean && npm run build && npm run build:cwc-main",
     "show-updates": "ncu",
     "sync": "echo Syncing. Please wait ... && git pull && git submodule init && git submodule update && npm run update",
-    "test": "npm run test:soy && npm run test:units && npm run test:core-mode",
+    "test": "npm run test:block && npm run test:soy && npm run test:units && npm run test:core-mode",
     "test:block": "echo Starting block tests ... && karma start test/block_tests.conf",
     "test:core": "echo Starting core tests ... && karma start test/core_tests.conf",
-    "test:core-mode": "karma start test/core_tests.conf && karma start test/mode_tests.conf",
+    "test:core-mode": "echo Starting combined core and mode tests ... && karma start test/core_tests.conf && karma start test/mode_tests.conf",
     "test:depswriter": "python third_party/closure-library/closure/bin/build/depswriter.py --root_with_prefix=\"src/ ../../../../src/\" --root_with_prefix=\"node_modules/closure-templates// ../../../../node_modules/closure-templates/\" --root_with_prefix=\"test/genfiles/soy/ ../../../../test/genfiles/soy/\" --root_with_prefix=\"third_party/coding-with-chrome-libraries/src/ ../../../../third_party/coding-with-chrome-libraries/src/\" > test/deps.js",
     "test:mode": "echo Starting mode tests ... && karma start test/mode_tests.conf",
     "test:soy": "echo Starting soy tests ... && karma start test/soy_tests.conf",

src/blocks/phaser/audio/blocks.js

@@ -36,8 +36,8 @@ Blockly.Blocks['phaser_audio_add_bgm'] = {
         .appendField(new Blockly.FieldNumber(100, 0, 200), 'volume')
         .appendField('%')
         .appendField(new Blockly.FieldDropdown([
-          ['no loop', false],
-          ['loop', true],
+          ['no loop', 'false'],
+          ['loop', 'true'],
         ]), 'loop');
     this.setPreviousStatement(true, 'Create');
     this.setNextStatement(true, 'Create');
@@ -65,8 +65,8 @@ Blockly.Blocks['phaser_audio_add'] = {
         .appendField(new Blockly.FieldNumber(100, 0, 200), 'volume')
         .appendField('%')
         .appendField(new Blockly.FieldDropdown([
-          ['no loop', false],
-          ['loop', true],
+          ['no loop', 'false'],
+          ['loop', 'true'],
         ]), 'loop');
     this.setPreviousStatement(true, 'Create');
     this.setNextStatement(true, 'Create');

src/blocks/phaser/audio/javascript.js

@@ -32,7 +32,7 @@ Blockly.JavaScript['phaser_audio_add_bgm'] = function(block) {
     'variable', Blockly.JavaScript.ORDER_ATOMIC);
   return 'if (typeof ' + variable + ' === \'undefined\') {\n' +
     '  ' + variable + ' = game.add.audio(\'' + text_audio + '\', ' +
-    number_volume / 100 + ', ' + (dropdown_loop || 'false') + ');\n' +
+    number_volume / 100 + ', ' + dropdown_loop + ');\n' +
     '} else {\n  ' + variable + '.stop();\n}\n' +
     variable + '.play();\n';
 };
@@ -50,7 +50,7 @@ Blockly.JavaScript['phaser_audio_add'] = function(block) {
   let variable = Blockly.JavaScript.valueToCode(block,
     'variable', Blockly.JavaScript.ORDER_ATOMIC);
   return variable + ' = game.add.audio(\'' + text_audio + '\', ' +
-    number_volume / 100 + ', ' + (dropdown_loop || 'false') + ');\n';
+    number_volume / 100 + ', ' + dropdown_loop + ');\n';
 };
 
 

src/blocks/phaser/world/blocks.js

@@ -125,11 +125,11 @@ Blockly.Blocks['phaser_world_sort_direction'] = {
         .appendField(i18t('@@BLOCKS__SET'))
         .appendField(i18t('@@BLOCKS_PHASER__WORLD_SORT_DIRECTION'))
         .appendField(new Blockly.FieldDropdown([
-          [i18t('none'), 0],
-          [i18t('left to right'), 1],
-          [i18t('right to left'), 2],
-          [i18t('top to bottom'), 3],
-          [i18t('bottom to top'), 4],
+          [i18t('none'), '0'],
+          [i18t('left to right'), '1'],
+          [i18t('right to left'), '2'],
+          [i18t('top to bottom'), '3'],
+          [i18t('bottom to top'), '4'],
         ]), 'property');
     this.setPreviousStatement(true, 'Create');
     this.setNextStatement(true, 'Create');

src/blocks/phaser/world/javascript.js

@@ -79,5 +79,6 @@ Blockly.JavaScript['phaser_world_arcade_physics'] = function(block) {
  */
 Blockly.JavaScript['phaser_world_sort_direction'] = function(block) {
   let dropdown_property = block.getFieldValue('property');
-  return 'game.physics.arcade.sortDirection = ' + dropdown_property + ';\n';
+  return 'game.physics.arcade.sortDirection = ' +
+    Number(dropdown_property) || 0 + ';\n';
 };

src/blocks/simple/javascript.js

@@ -210,6 +210,7 @@ Blockly.JavaScript['simple_draw_text'] = function(block) {
     Blockly.JavaScript.ORDER_ATOMIC);
   let y = Blockly.JavaScript.valueToCode(block, 'y',
     Blockly.JavaScript.ORDER_ATOMIC);
-  let fillColor = Blockly.JavaScript.valueToCode(block, 'fillColor');
+  let fillColor = Blockly.JavaScript.valueToCode(block, 'fillColor',
+    Blockly.JavaScript.ORDER_ATOMIC);
   return 'draw.text(' + text + ', ' + x + ', ' + y + ', ' + fillColor + ');\n';
 };