From a18aa76e67a9a268589965b1c6b2710bb8ec35db Mon Sep 17 00:00:00 2001 From: Neil Fraser Date: Wed, 5 Jun 2019 14:48:06 -0700 Subject: [PATCH] Update colour tests Blockly now normalizes colours lowercase. --- tests/jsunit/block_test.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/jsunit/block_test.js b/tests/jsunit/block_test.js index 81e49f947..a450e51a6 100644 --- a/tests/jsunit/block_test.js +++ b/tests/jsunit/block_test.js @@ -100,7 +100,7 @@ function setUpRowBlocks() { A: blockA, B: blockB, C: blockC - } + }; } function setUpStackBlocks() { @@ -117,7 +117,7 @@ function setUpStackBlocks() { A: blockA, B: blockB, C: blockC - } + }; } @@ -219,7 +219,7 @@ function test_block_row_unplug_multi_inputs_parent() { try { var blocks = setUpRowBlocks(); // Add extra input to parent - blocks.A.appendValueInput("INPUT").setCheck(null); + blocks.A.appendValueInput('INPUT').setCheck(null); // Parent block has multiple inputs. blocks.B.unplug(true); @@ -234,7 +234,7 @@ function test_block_row_unplug_multi_inputs_middle() { try { var blocks = setUpRowBlocks(); // Add extra input to middle block - blocks.B.appendValueInput("INPUT").setCheck(null); + blocks.B.appendValueInput('INPUT').setCheck(null); // Middle block has multiple inputs. blocks.B.unplug(true); @@ -249,7 +249,7 @@ function test_block_row_unplug_multi_inputs_child() { try { var blocks = setUpRowBlocks(); // Add extra input to child block - blocks.C.appendValueInput("INPUT").setCheck(null); + blocks.C.appendValueInput('INPUT').setCheck(null); // Child block input count doesn't matter. blocks.B.unplug(true); @@ -263,10 +263,10 @@ function test_set_style() { blockTest_setUp(); var styleStub = { getBlockStyle: function() { - return{ - "colourPrimary": "#FFFFFF", - "colourSecondary":"#AABBCC", - "colourTertiary":"#DDEEFF" + return { + "colourPrimary": "#ffffff", + "colourSecondary": "#aabbcc", + "colourTertiary": "#ddeeff" } } }; @@ -274,9 +274,9 @@ function test_set_style() { var blockA = workspace.newBlock('row_block'); blockA.setStyle('styleOne'); - assertEquals(blockA.colour_, '#FFFFFF'); - assertEquals(blockA.colourSecondary_, '#AABBCC'); - assertEquals(blockA.colourTertiary_, '#DDEEFF'); + assertEquals('#ffffff', blockA.colour_); + assertEquals('#aabbcc', blockA.colourSecondary_); + assertEquals('#ddeeff', blockA.colourTertiary_); blockTest_tearDown(); } @@ -292,9 +292,9 @@ function test_set_style_throw_exception() { var blockA = workspace.newBlock('row_block'); try { blockA.setStyle('styleOne'); - }catch(error) { - assertEquals(error.message, "Invalid style name: styleOne"); - }finally { + } catch(error) { + assertEquals(error.message, 'Invalid style name: styleOne'); + } finally { blockTest_tearDown(); } }