From 3843cff482d9601a35d673a2e120e65392a4bc8e Mon Sep 17 00:00:00 2001
From: Aex <spryti@qq.com>
Date: Tue, 7 Sep 2021 16:19:53 +0000
Subject: [PATCH 1/2] Badge: fix type class when is-dot

---
 packages/badge/src/main.vue   |  2 +-
 test/unit/specs/badge.spec.js | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/badge/src/main.vue b/packages/badge/src/main.vue
index 5b2eeb7392..fb3051d38f 100644
--- a/packages/badge/src/main.vue
+++ b/packages/badge/src/main.vue
@@ -7,7 +7,7 @@
         v-text="content"
         class="el-badge__content"
         :class="[
-          'el-badge__content--' + type,
+          type ? 'el-badge__content--' + type : null,
           {
             'is-fixed': $slots.default,
             'is-dot': isDot
diff --git a/test/unit/specs/badge.spec.js b/test/unit/specs/badge.spec.js
index cfcf122bc9..a0353d6352 100644
--- a/test/unit/specs/badge.spec.js
+++ b/test/unit/specs/badge.spec.js
@@ -32,6 +32,17 @@ describe('Badge', () => {
     expect(vm.$el.querySelector('.el-badge__content.is-dot')).to.exist;
   });
 
+  it('is dot with type', () => {
+    vm = createVue(`
+      <el-badge is-dot type="success">
+        <button>click</button>
+      </el-badge>
+    `);
+
+    expect(vm.$el.querySelector('.el-badge__content.is-dot')).to.exist;
+    expect(vm.$el.querySelector('.el-badge__content.el-badge_content--success.is-dot')).to.exist;
+  });
+
   it('max', () => {
     vm = createTest(Badge, { max: 100, value: 200 });
     expect(vm.content).to.equal('100+');

From 6a6b4eeb9bcae0ca789e8a0e3fe70b1baa2576d3 Mon Sep 17 00:00:00 2001
From: Aex <spryti@qq.com>
Date: Tue, 7 Sep 2021 16:29:50 +0000
Subject: [PATCH 2/2] fix class name typo

---
 test/unit/specs/badge.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/specs/badge.spec.js b/test/unit/specs/badge.spec.js
index a0353d6352..cc7a1993db 100644
--- a/test/unit/specs/badge.spec.js
+++ b/test/unit/specs/badge.spec.js
@@ -40,7 +40,7 @@ describe('Badge', () => {
     `);
 
     expect(vm.$el.querySelector('.el-badge__content.is-dot')).to.exist;
-    expect(vm.$el.querySelector('.el-badge__content.el-badge_content--success.is-dot')).to.exist;
+    expect(vm.$el.querySelector('.el-badge__content.el-badge__content--success.is-dot')).to.exist;
   });
 
   it('max', () => {