Merge branch 'adamcarheden-write_line'

MarkusBordihn · MarkusBordihn · commit bfbf46724ebc · 2018-09-16T12:16:09.000+02:00
diff --git a/src/blocks/simple/blocks.js b/src/blocks/simple/blocks.js
@@ -38,6 +38,25 @@ Blockly.Blocks['simple_text_write'] = {
 };
 
 
+/**
+ * Write line.
+ */
+Blockly.Blocks['simple_text_write_line'] = {
+  init: function() {
+    this.setHelpUrl('');
+    this.setColour(290);
+    this.appendValueInput('text')
+      .setCheck('String')
+      .appendField(i18t('writeLine('));
+    this.appendDummyInput()
+      .appendField(')');
+    this.setPreviousStatement(true, ['Number', 'String']);
+    this.setNextStatement(true, ['Number', 'String']);
+    this.setTooltip(i18t('Writes the text on its own line on the screen.'));
+  },
+};
+
+
 /**
  * Draw circle.
  */
diff --git a/src/blocks/simple/javascript.js b/src/blocks/simple/javascript.js
@@ -31,6 +31,18 @@ Blockly.JavaScript['simple_text_write'] = function(block) {
 };
 
 
+/**
+ * Write line.
+ * @param {!Blockly.block} block
+ * @return {string}
+ */
+Blockly.JavaScript['simple_text_write_line'] = function(block) {
+  let text = Blockly.JavaScript.valueToCode(block, 'text',
+      Blockly.JavaScript.ORDER_ATOMIC);
+  return 'command.writeLine(' + text + ');\n';
+};
+
+
 /**
  * Draw circle.
  * @param {!Blockly.block} block
diff --git a/src/blocks/simple/toolbox.soy b/src/blocks/simple/toolbox.soy
@@ -32,6 +32,11 @@
           <block type="text"><field name="TEXT"></field></block>
         </value>
       </block>
+      <block type="simple_text_write_line">
+        <value name="text">
+          <block type="text"><field name="TEXT"></field></block>
+        </value>
+      </block>
     </category>
 
     <category name="Draw" colour="260">
diff --git a/src/config/config.js b/src/config/config.js
@@ -119,4 +119,4 @@ cwc.config.Sample = {
 /**
  * @return {string}
  */
-cwc.config.Version = '5.7.28';
+cwc.config.Version = '5.7.29';
diff --git a/src/frameworks/simple/command.js b/src/frameworks/simple/command.js
@@ -59,6 +59,15 @@ cwc.framework.simple.Command.prototype.write = function(text) {
   this.addNode_(goog.dom.createTextNode(text));
 };
 
+/**
+ * Writes a text and line break on screen.
+ * @param {string} text
+ * @export
+ */
+cwc.framework.simple.Command.prototype.writeLine = function(text) {
+  this.addNode_(goog.dom.createTextNode(text));
+  this.addNode_(goog.dom.createElement('br'));
+};
 
 /**
  * @param {string} title
@@ -105,6 +114,7 @@ cwc.framework.simple.Command.prototype.mapGlobal = function() {
   }
   window['command'] = {
     'write': this.write.bind(this),
+    'writeLine': this.writeLine.bind(this),
     'showAlert': this.showAlert.bind(this),
     'showPrompt': this.showPrompt.bind(this),
     'showActionCancel': this.showActionCancel.bind(this),
diff --git a/test/.eslintrc b/test/.eslintrc
@@ -7,6 +7,7 @@
     'describe': true,
     'expect': true,
     'getTestBlockCode': true,
+    'getTestBlockWorkspace': true,
     'getTestBuffer': true,
     'it': true,
     'loadExampleFile': true,
diff --git a/test/block_tests/general_block_test.js b/test/block_tests/general_block_test.js
@@ -20,12 +20,7 @@
 
 
 describe('General Blocks', function() {
-  document.body.insertAdjacentHTML('afterbegin',
-    '<div id="test-workspace"></div>');
-  window['i18t'] = function(msg) {
-return msg;
-};
-
+  getTestBlockWorkspace();
   let blockPrefix = 'general_';
   let blocks = [];
   for (let block in Blockly.Blocks) {
diff --git a/test/block_tests/lego_ev3_block_test.js b/test/block_tests/lego_ev3_block_test.js
@@ -20,12 +20,7 @@
 
 
 describe('EV3 Blocks', function() {
-  document.body.insertAdjacentHTML('afterbegin',
-    '<div id="test-workspace"></div>');
-  window['i18t'] = function(msg) {
-return msg;
-};
-
+  getTestBlockWorkspace();
   let blockPrefix = 'ev3_';
   let blocks = [];
   for (let block in Blockly.Blocks) {
diff --git a/test/block_tests/makeblock_mbot_block_test.js b/test/block_tests/makeblock_mbot_block_test.js
@@ -20,12 +20,7 @@
 
 
 describe('mBot Blocks', function() {
-  document.body.insertAdjacentHTML('afterbegin',
-    '<div id="test-workspace"></div>');
-  window['i18t'] = function(msg) {
-return msg;
-};
-
+  getTestBlockWorkspace();
   let blockPrefix = 'mbot_';
   let blocks = [];
   for (let block in Blockly.Blocks) {
diff --git a/test/block_tests/phaser_block_test.js b/test/block_tests/phaser_block_test.js
@@ -20,12 +20,7 @@
 
 
 describe('Phaser Blocks', function() {
-  document.body.insertAdjacentHTML('afterbegin',
-    '<div id="test-workspace"></div>');
-  window['i18t'] = function(msg) {
-return msg;
-};
-
+  getTestBlockWorkspace();
   let blockPrefix = 'phaser_';
   let blocks = [];
   for (let block in Blockly.Blocks) {
diff --git a/test/block_tests/simple_block_test.js b/test/block_tests/simple_block_test.js
@@ -20,12 +20,7 @@
 
 
 describe('Simple Blocks', function() {
-  document.body.insertAdjacentHTML('afterbegin',
-    '<div id="test-workspace"></div>');
-  window['i18t'] = function(msg) {
-return msg;
-};
-
+  getTestBlockWorkspace();
   let blockPrefix = 'simple_';
   let blocks = [];
   for (let block in Blockly.Blocks) {
diff --git a/test/block_tests/sphero_block_test.js b/test/block_tests/sphero_block_test.js
@@ -20,12 +20,7 @@
 
 
 describe('Sphero Blocks', function() {
-  document.body.insertAdjacentHTML('afterbegin',
-    '<div id="test-workspace"></div>');
-  window['i18t'] = function(msg) {
-return msg;
-};
-
+  getTestBlockWorkspace();
   let blockPrefix = 'sphero_';
   let blocks = [];
   for (let block in Blockly.Blocks) {
diff --git a/test/block_tests/sphero_sprk_plus_test.js b/test/block_tests/sphero_sprk_plus_test.js
@@ -0,0 +1,58 @@
+/**
+ * @fileoverview Sphero SPRK+ block tests.
+ *
+ * @license Copyright 2018 The Coding with Chrome Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @author mbordihn@google.com (Markus Bordihn)
+ */
+
+
+describe('Sphero SPRK+ Blocks', function() {
+  getTestBlockWorkspace();
+  let blockPrefix = 'sphero_sprk_plus_';
+  let blocks = [];
+  for (let block in Blockly.Blocks) {
+    if (block.startsWith(blockPrefix)) {
+      blocks.push(block);
+    }
+  }
+
+  let blockScripts = [];
+  for (let blockScript in Blockly.JavaScript) {
+    if (blockScript.startsWith(blockPrefix)) {
+      blockScripts.push(blockScript);
+    }
+  }
+
+  it('Block definition', function() {
+    expect(typeof Blockly.Blocks).toEqual('object');
+    expect(typeof blocks).toEqual('object');
+    expect(blocks.length > 0).toBe(true);
+  });
+
+  it('JavaScript definition', function() {
+    expect(typeof Blockly.JavaScript).toEqual('object');
+    expect(typeof blockScripts).toEqual('object');
+    expect(blockScripts.length > 0).toBe(true);
+    expect(blockScripts.length).toEqual(blocks.length);
+  });
+
+  blocks.forEach(function(block) {
+    it('Block ' + block + ' to workspace', function() {
+      let code = getTestBlockCode(block);
+      expect(code && code.length > 1).toBe(true);
+    });
+  });
+});
diff --git a/test/core_tests/tutorial_test.js b/test/core_tests/tutorial_test.js
@@ -18,6 +18,7 @@
  * @author carheden@google.com (Adam Carheden)
  */
 
+
 describe('Tutorial', function() {
   let sidebarId = 'cwc-sidebar';
   document.body.insertAdjacentHTML('afterbegin', `
diff --git a/test/global.js b/test/global.js
@@ -31,8 +31,19 @@ let prepareEditor = function() {
   }
 };
 
+let getTestBlockWorkspace = function() {
+  let workspace = document.getElementById('test-block-workspace');
+  if (!workspace) {
+    document.body.insertAdjacentHTML('afterbegin',
+      '<div id="test-block-workspace"></div>');
+    window['i18t'] = function(msg) {
+      return msg;
+    };
+  }
+};
+
 let getTestBlockCode = function(block) {
-  let blocklyDiv = document.getElementById('test-workspace');
+  let blocklyDiv = document.getElementById('test-block-workspace');
   let workspace = Blockly.inject(blocklyDiv);
   let xmlCode = '<xml xmlns="http://www.w3.org/1999/xhtml">\n' +
     '<block type="' + block + '"></block>\n</xml>';
