From 8ae2defa2d21b7b97e077882453c716b1e15ffdc Mon Sep 17 00:00:00 2001
From: Johan Hernefeldt <johans.inbox@gmail.com>
Date: Sun, 10 Dec 2017 10:42:08 +0100
Subject: [PATCH] Dropdown: click open uses `show-timeout` attribute (#8734)

* Dropdown: Click open uses `show-timeout` attribute

* Dropdown: Modified test to work with `show-timeout` attribute

* Dropdown: Clean up in testfix
---
 packages/dropdown/src/dropdown.vue | 6 +++++-
 test/unit/specs/dropdown.spec.js   | 5 ++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/dropdown/src/dropdown.vue b/packages/dropdown/src/dropdown.vue
index 5b14a6289..9fb1940aa 100644
--- a/packages/dropdown/src/dropdown.vue
+++ b/packages/dropdown/src/dropdown.vue
@@ -128,7 +128,11 @@
       },
       handleClick() {
         if (this.triggerElm.disabled) return;
-        this.visible = !this.visible;
+        if (this.visible) {
+          this.hide();
+        } else {
+          this.show();
+        }
       },
       handleTriggerKeyDown(ev) {
         const keyCode = ev.keyCode;
diff --git a/test/unit/specs/dropdown.spec.js b/test/unit/specs/dropdown.spec.js
index a2e31bf53..37f7383dd 100644
--- a/test/unit/specs/dropdown.spec.js
+++ b/test/unit/specs/dropdown.spec.js
@@ -102,12 +102,11 @@ describe('Dropdown', () => {
     triggerEvent(triggerElm, 'mouseenter');
     dropdown.$nextTick(_ => {
       expect(dropdown.visible).to.not.true;
-
       triggerElm.click();
-      dropdown.$nextTick(_ => {
+      setTimeout(_ => {
         expect(dropdown.visible).to.be.true;
         done();
-      });
+      }, 300);
     });
   });
   it('split button', done => {