fix: Descriptions warning should work as expect (#16819)

* fix warning * add MockDate
ant-design · May 27, 2019 · 29ec272 · 29ec272
1 parent 6853402
commit 29ec272
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/components/descriptions/__tests__/index.test.js b/components/descriptions/__tests__/index.test.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import MockDate from 'mockdate';
 import { mount } from 'enzyme';
 import Descriptions from '..';
 
@@ -23,6 +24,17 @@ jest.mock('enquire.js', () => {
 });
 
 describe('Descriptions', () => {
+  const errorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
+
+  afterEach(() => {
+    MockDate.reset();
+    errorSpy.mockReset();
+  });
+
+  afterAll(() => {
+    errorSpy.mockRestore();
+  });
+
   it('when max-width: 575px，column=1', () => {
     // eslint-disable-next-line global-require
     const enquire = require('enquire.js');
@@ -83,4 +95,20 @@ describe('Descriptions', () => {
     expect(wrapper.instance().getColumn()).toBe(8);
     wrapper.unmount();
   });
+
+  it('warning if ecceed the row span', () => {
+    mount(
+      <Descriptions column={3}>
+        <DescriptionsItem label="Product" span={2}>
+          Cloud Database
+        </DescriptionsItem>
+        <DescriptionsItem label="Billing" span={2}>
+          Prepaid
+        </DescriptionsItem>
+      </Descriptions>,
+    );
+    expect(errorSpy).toHaveBeenCalledWith(
+      'Warning: [antd: Descriptions] Sum of column `span` in a line exceeds `column` of Descriptions.',
+    );
+  });
 });
diff --git a/components/descriptions/index.tsx b/components/descriptions/index.tsx
@@ -48,14 +48,15 @@ const generateChildrenRows = (
       totalRowSpan += 1;
     }
     if (totalRowSpan >= column) {
-      childrenArray.push(columnArray);
-      columnArray = [];
-      totalRowSpan = 0;
       warning(
-        totalRowSpan > column,
+        totalRowSpan <= column,
         'Descriptions',
         'Sum of column `span` in a line exceeds `column` of Descriptions.',
       );
+
+      childrenArray.push(columnArray);
+      columnArray = [];
+      totalRowSpan = 0;
     }
   });
   if (columnArray.length > 0) {