From 68528c2887447c71bf811cef149ba9111c14f276 Mon Sep 17 00:00:00 2001
From: Monica Kozbial <kozbial@google.com>
Date: Thu, 13 Aug 2020 10:54:40 -0700
Subject: [PATCH] Use event dispatching to test trashcan click. (#4156)

---
 tests/mocha/trashcan_test.js | 46 +++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/tests/mocha/trashcan_test.js b/tests/mocha/trashcan_test.js
index 458d21946..93833021e 100644
--- a/tests/mocha/trashcan_test.js
+++ b/tests/mocha/trashcan_test.js
@@ -27,12 +27,9 @@ suite("Trashcan", function() {
 
   setup(function() {
     sharedTestSetup.call(this);
-    var options = new Blockly.Options(
+    this.workspace = Blockly.inject('blocklyDiv',
         {'trashcan': true, 'maxTrashcanContents': Infinity});
-    this.workspace = new Blockly.WorkspaceSvg(options);
-    this.trashcan = new Blockly.Trashcan(this.workspace);
-    // Stub the trashcan dom.
-    this.trashcan.svgLid_ = sinon.createStubInstance(SVGElement);
+    this.trashcan = this.workspace.trashcan;
   });
   teardown(function() {
     sharedTestTeardown.call(this);
@@ -61,23 +58,50 @@ suite("Trashcan", function() {
       fireDeleteEvent(this.workspace, '<shadow type="dummy_type"/>');
       chai.assert.equal(this.trashcan.contents_.length, 0);
     });
-    test("Click without contents - fires no events", function() {
-      this.trashcan.click();
-      var lastFireCall = this.eventsFireStub.lastCall;
-      chai.assert.notExists(lastFireCall);
+    test("Click without contents - fires workspace click", function() {
+      simulateClick(this.trashcan.svgGroup_);
+
+      assertEventNotFired(
+          this.eventsFireStub, Blockly.Events.Ui, {element: 'trashcanOpen'});
+      assertEventFired(
+          this.eventsFireStub, Blockly.Events.Ui,
+          {element: 'click', oldValue: null, newValue: 'workspace'},
+          this.workspace.id, null);
     });
     test("Click with contents - fires trashcanOpen", function() {
       fireDeleteEvent(this.workspace, '<block type="dummy_type"/>');
       chai.assert.equal(this.trashcan.contents_.length, 1);
       // Stub flyout interaction.
       var showFlyoutStub = sinon.stub(this.trashcan.flyout, "show");
-      this.trashcan.click();
+
+      simulateClick(this.trashcan.svgGroup_);
+
+      sinon.assert.calledOnce(showFlyoutStub);
 
       assertEventFired(
           this.eventsFireStub, Blockly.Events.Ui,
           {element: 'trashcanOpen', oldValue: null, newValue: true},
           this.workspace.id, null);
-      sinon.assert.calledOnce(showFlyoutStub);
+      assertEventNotFired(
+          this.eventsFireStub, Blockly.Events.Ui, {element: 'click'});
+    });
+    test("Click outside trashcan - fires trashcanClose", function() {
+      sinon.stub(this.trashcan.flyout, 'isVisible').returns(true);
+      // Stub flyout interaction.
+      var hideFlyoutStub = sinon.stub(this.trashcan.flyout, "hide");
+
+      simulateClick(this.workspace.svgGroup_);
+
+      sinon.assert.calledOnce(hideFlyoutStub);
+
+      assertEventFired(
+          this.eventsFireStub, Blockly.Events.Ui,
+          {element: 'trashcanOpen', oldValue: null, newValue: false},
+          this.workspace.id, null);
+      assertEventFired(
+          this.eventsFireStub, Blockly.Events.Ui,
+          {element: 'click', oldValue: null, newValue: 'workspace'},
+          this.workspace.id, null);
     });
   });
   suite("Unique Contents", function() {