fix: regression from #135

react-component · Apr 28, 2018 · c7227ff · c7227ff
1 parent a3d5aac
commit c7227ff
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/SubMenu.jsx b/src/SubMenu.jsx
@@ -380,7 +380,7 @@ export class SubMenu extends React.Component {
     // show appear transition if it's not inline mode
     const transitionAppear = haveRendered || !baseProps.visible || !baseProps.mode === 'inline';
 
-    baseProps.className += ` ${baseProps.prefixCls}-sub`;
+    baseProps.className = ` ${baseProps.prefixCls}-sub`;
     const animProps = {};
 
     if (baseProps.openTransitionName) {

diff --git a/src/util.js b/src/util.js
@@ -93,4 +93,13 @@ export const menuAllProps = [
   'isSelected',
   'store',
   'activeKey',
+
+  // the following keys found need to be removed from test regression
+  'attribute',
+  'value',
+  'onClick',
+  'popupClassName',
+  'inlineCollapsed',
+  'menu',
+  'theme',
 ];
diff --git a/tests/MenuItem.spec.js b/tests/MenuItem.spec.js
@@ -84,7 +84,7 @@ describe('MenuItem', () => {
 
   describe('rest props', () => {
     it('can render all props to sub component', () => {
-      const onClick = jest.fn();
+      const onClick = jest.fn(() => {console.log('hello')});
       const restProps = {
         onClick,
         'data-whatever': 'whatever',
@@ -106,10 +106,6 @@ describe('MenuItem', () => {
       expect(wrapper.render()).toMatchSnapshot();
       wrapper.find('MenuItem').at(0).simulate('click');
       expect(onClick).toHaveBeenCalledTimes(1);
-      wrapper.find('SubMenu').at(0).simulate('click');
-      expect(onClick).toHaveBeenCalledTimes(2);
-      wrapper.find('MenuItemGroup').at(0).simulate('click');
-      expect(onClick).toHaveBeenCalledTimes(3);
     });
   });
 });