Add userDestroy when block is not added to morphic tree. Fix #1097

NetsBlox · Oct 2, 2020 · 6685820 · 6685820
1 parent 47c80e1
commit 6685820
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/blocks.js b/src/blocks.js
@@ -6063,7 +6063,9 @@ ReporterBlockMorph.prototype.prepareToBeGrabbed = function (handMorph) {
         this.setPosition(oldPos);
     }
     ReporterBlockMorph.uber.prepareToBeGrabbed.call(this, handMorph);
-    handMorph.alpha = this.alpha < 1 ? 1 : 0.85;
+    if (handMorph) {
+        handMorph.alpha = this.alpha < 1 ? 1 : 0.85;
+    }
     this.cachedSlotSpec = null;
 };
 

diff --git a/test/blocks.spec.js b/test/blocks.spec.js
@@ -596,6 +596,25 @@ describe('blocks', function() {
     describe('rpc', function() {
         beforeEach(() => driver.reset());
 
+        it('should show help when RPC inputs exist', async function() {
+            const block = await driver.addBlock('getJSFromRPCStruct');
+            const [serviceField, rpcField] = block.inputs();
+            await SnapActions.setField(serviceField, 'Dev');
+            await SnapActions.setField(rpcField, 'echo');
+            const [/*serviceField*/, /*rpcField*/, input] = block.inputs();
+            const messageBlock = driver.palette().contents.children.find(
+                block => block.selector === 'getLastMessage'
+            );
+            driver.dragAndDrop(messageBlock, input.center());
+
+            await block.showHelp();
+            const dialog = driver.dialog();
+            assert(
+                dialog && dialog.key.includes('Help'),
+                'Help dialog did not appear'
+            );
+        });
+
         it('should populate method with `setField`', async function() {
             // create rpc block
             const block = await driver.addBlock('getJSFromRPCStruct');