From df83968de422642b23e7339fdbc9c67aea015739 Mon Sep 17 00:00:00 2001
From: tanjinzhou <415800467@qq.com>
Date: Tue, 28 Jul 2020 17:10:59 +0800
Subject: [PATCH] test: update comment test

---
 antdv-demo                                    |  2 +-
 .../__snapshots__/index.test.js.snap          | 26 +++++++++--
 components/comment/__tests__/index.test.js    | 44 ++++++++++---------
 components/comment/index.jsx                  |  4 +-
 components/tooltip/Tooltip.jsx                |  5 ++-
 examples/App.vue                              |  2 +-
 6 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/antdv-demo b/antdv-demo
index 432632788..51cd1e3ae 160000
--- a/antdv-demo
+++ b/antdv-demo
@@ -1 +1 @@
-Subproject commit 4326327888f185e994eb7071d0b0b5edb1be2768
+Subproject commit 51cd1e3aea790432b220a7233ba189899438f031
diff --git a/components/comment/__tests__/__snapshots__/index.test.js.snap b/components/comment/__tests__/__snapshots__/index.test.js.snap
index 6374ae36a..4bff5d290 100644
--- a/components/comment/__tests__/__snapshots__/index.test.js.snap
+++ b/components/comment/__tests__/__snapshots__/index.test.js.snap
@@ -3,8 +3,10 @@
 exports[`Comment Comment can be used as editor, user can customize the editor component. 1`] = `
 <div>
   <div class="ant-list ant-list-split">
+    <!---->
     <div class="ant-list-header">1 reply</div>
     <div class="ant-spin-nested-loading">
+      <!---->
       <div class="ant-spin-container">
         <ul class="ant-list-items">
           <li class="ant-list-item">
@@ -14,39 +16,55 @@ exports[`Comment Comment can be used as editor, user can customize the editor co
                 <div class="ant-comment-content">
                   <div class="ant-comment-content-author"><span class="ant-comment-content-author-name">Han Solo</span><span class="ant-comment-content-author-time">a few seconds ago</span></div>
                   <div class="ant-comment-content-detail">222</div>
+                  <!---->
                 </div>
               </div>
+              <!---->
             </div>
+            <!---->
+            <!---->
           </li>
         </ul>
       </div>
     </div>
+    <!---->
+    <!---->
   </div>
   <div class="ant-comment">
     <div class="ant-comment-inner">
-      <div class="ant-comment-avatar"></div>
+      <div class="ant-comment-avatar">
+        <!---->
+      </div>
       <div class="ant-comment-content">
-        <div class="ant-comment-content-author"></div>
+        <div class="ant-comment-content-author">
+          <!---->
+          <!---->
+        </div>
         <div class="ant-comment-content-detail">
           <div>
             <div class="ant-row ant-form-item">
               <div class="ant-col ant-form-item-control-wrapper">
-                <div class="ant-form-item-control"><span class="ant-form-item-children"><textarea class="ant-input" rows="4"></textarea></span>
+                <div class="ant-form-item-control"><span class="ant-form-item-children"><textarea rows="4" class="ant-input"></textarea><!----></span>
+                  <!---->
                   <!---->
                 </div>
               </div>
             </div>
             <div class="ant-row ant-form-item">
               <div class="ant-col ant-form-item-control-wrapper">
-                <div class="ant-form-item-control"><span class="ant-form-item-children"><button type="submit" class="ant-btn ant-btn-primary" ant-click-animating-without-extra-node="true"><span>Add Comment</span></button></span>
+                <div class="ant-form-item-control"><span class="ant-form-item-children"><button class="ant-btn ant-btn-primary" type="submit" ant-click-animating-without-extra-node="true"><!----><span>Add Comment</span></button>
+                  <!----></span>
+                  <!---->
                   <!---->
                 </div>
               </div>
             </div>
           </div>
         </div>
+        <!---->
       </div>
     </div>
+    <!---->
   </div>
 </div>
 `;
diff --git a/components/comment/__tests__/index.test.js b/components/comment/__tests__/index.test.js
index ad73012bc..7b171aede 100644
--- a/components/comment/__tests__/index.test.js
+++ b/components/comment/__tests__/index.test.js
@@ -51,7 +51,7 @@ const CommentTest = {
             dataSource={this.comments}
             header={`${this.comments.length} ${this.comments.length > 1 ? 'replies' : 'reply'}`}
             itemLayout="horizontal"
-            renderItem={item => {
+            renderItem={({ item }) => {
               return (
                 <List.Item>
                   <Comment
@@ -65,23 +65,27 @@ const CommentTest = {
             }}
           />
         ) : null}
-        <Comment>
-          <div slot="content">
-            <Form.Item>
-              <Input.TextArea rows={4} onChange={this.handleChange} value={this.value} />
-            </Form.Item>
-            <Form.Item>
-              <Button
-                htmlType="submit"
-                loading={this.submitting}
-                onClick={this.handleSubmit}
-                type="primary"
-              >
-                Add Comment
-              </Button>
-            </Form.Item>
-          </div>
-        </Comment>
+        <Comment
+          vSlots={{
+            content: () => (
+              <div>
+                <Form.Item>
+                  <Input.TextArea rows={4} onChange={this.handleChange} value={this.value} />
+                </Form.Item>
+                <Form.Item>
+                  <Button
+                    htmlType="submit"
+                    loading={this.submitting}
+                    onClick={this.handleSubmit}
+                    type="primary"
+                  >
+                    Add Comment
+                  </Button>
+                </Form.Item>
+              </div>
+            ),
+          }}
+        ></Comment>
       </div>
     );
   },
@@ -98,11 +102,11 @@ describe('Comment', () => {
       wrapper.find('textarea').trigger('input');
     });
     await asyncExpect(() => {
-      wrapper.find('Button').trigger('click');
+      wrapper.find('.ant-btn').trigger('click');
     });
 
     await asyncExpect(() => {
-      expect(wrapper.findAll('.ant-list-header').wrappers[0].element.innerHTML).toBe('1 reply');
+      expect(wrapper.findAll('.ant-list-header')[0].element.innerHTML).toBe('1 reply');
       expect(wrapper.html()).toMatchSnapshot();
     }, 2000);
   });
diff --git a/components/comment/index.jsx b/components/comment/index.jsx
index 10d5797aa..0d489e09b 100644
--- a/components/comment/index.jsx
+++ b/components/comment/index.jsx
@@ -1,6 +1,6 @@
 import { inject } from 'vue';
 import PropsTypes from '../_util/vue-types';
-import { getComponent } from '../_util/props-util';
+import { getComponent, getSlot } from '../_util/props-util';
 import { ConfigConsumerProps } from '../config-provider';
 export const CommentProps = {
   actions: PropsTypes.array,
@@ -81,7 +81,7 @@ const Comment = {
         {contentDom}
       </div>
     );
-    const children = this.$slots.default && this.$slots.default();
+    const children = getSlot(this);
     return (
       <div class={prefixCls}>
         {comment}
diff --git a/components/tooltip/Tooltip.jsx b/components/tooltip/Tooltip.jsx
index 7272f5296..571dc4ce9 100644
--- a/components/tooltip/Tooltip.jsx
+++ b/components/tooltip/Tooltip.jsx
@@ -1,5 +1,6 @@
 import { inject } from 'vue';
 import VcTooltip from '../vc-tooltip';
+import classNames from 'classnames';
 import getPlacements from './placements';
 import PropTypes from '../_util/vue-types';
 import {
@@ -186,10 +187,10 @@ export default {
     const child = this.getDisabledCompatibleChildren(
       isValidElement(children) ? children : <span>{children}</span>,
     );
-    const childCls = {
+    const childCls = classNames({
       [openClassName || `${prefixCls}-open`]: sVisible,
       [child.props && child.props.class]: child.props && child.props.class,
-    };
+    });
     const tooltipProps = {
       ...$attrs,
       ...$props,
diff --git a/examples/App.vue b/examples/App.vue
index 7bea37525..e3416a046 100644
--- a/examples/App.vue
+++ b/examples/App.vue
@@ -4,7 +4,7 @@
   </div>
 </template>
 <script>
-import demo from '../antdv-demo/docs/collapse/demo/index';
+import demo from '../antdv-demo/docs/comment/demo/index';
 
 export default {
   components: {