feat(buttons): update examples & tests

eddywashere · eddywashere · commit 52fd2fbd1be9 · 2016-02-20T23:26:18.000-08:00
diff --git a/example/js/ButtonsExample.jsx b/example/js/ButtonsExample.jsx
@@ -41,28 +41,24 @@ class ButtonsExample extends React.Component {
           <Button size="lg">Large (lg)</Button>
         </p>
         <p>Button Group</p>
-        <p>
+        <ButtonGroup className="m-b-1">
+          <Button>Left</Button>
+          <Button>Middle</Button>
+          <Button>Right</Button>
+        </ButtonGroup>
+        <p>Button Toolbar</p>
+        <ButtonToolbar className="m-b-1">
           <ButtonGroup>
             <Button>Left</Button>
             <Button>Middle</Button>
             <Button>Right</Button>
           </ButtonGroup>
-        </p>
-        <p>Button Toolbar</p>
-        <p>
-          <ButtonToolbar>
-            <ButtonGroup>
-              <Button>Left</Button>
-              <Button>Middle</Button>
-              <Button>Right</Button>
-            </ButtonGroup>
-            <ButtonGroup>
-              <Button>Left</Button>
-              <Button>Middle</Button>
-              <Button>Right</Button>
-            </ButtonGroup>
-          </ButtonToolbar>
-        </p>
+          <ButtonGroup>
+            <Button>Left</Button>
+            <Button>Middle</Button>
+            <Button>Right</Button>
+          </ButtonGroup>
+        </ButtonToolbar>
       </div>
     );
   }
diff --git a/lib/Button.jsx b/lib/Button.jsx
@@ -24,8 +24,10 @@ class Button extends React.Component {
 
   onClick(e) {
     if (this.props.disabled) {
-      e.preventDefault();
-    } else {
+      return e.preventDefault();
+    }
+
+    if (this.props.onClick) {
       this.props.onClick(e);
     }
   }
diff --git a/test/Button.spec.js b/test/Button.spec.js
@@ -45,7 +45,7 @@ describe('Button', () => {
   });
 
   describe('onClick', () => {
-    it('is called when passed as property', () => {
+    it('calls props.onClick if it exists', () => {
       const onClick = jasmine.createSpy('onClick');
       const wrapper = mount(<Button onClick={onClick}>Testing Click</Button>);
 
@@ -55,11 +55,13 @@ describe('Button', () => {
 
     it('is not called when disabled', () => {
       const e = jasmine.createSpyObj('e', ['preventDefault']);
-      const onClick = jasmine.createSpy('onClick');
-      const wrapper = mount(<Button onClick={onClick} disabled>Testing Click</Button>);
+      const wrapper = mount(<Button>Testing Click</Button>);
+
+      wrapper.instance().onClick(e);
+      expect(e.preventDefault).not.toHaveBeenCalled();
 
+      wrapper.setProps({ disabled: true });
       wrapper.instance().onClick(e);
-      expect(onClick).not.toHaveBeenCalled();
       expect(e.preventDefault).toHaveBeenCalled();
     });
   });

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,10 @@ class Button extends React.Component {`
`24`	`24`
`25`	`25`	`onClick(e) {`
`26`	`26`	`if (this.props.disabled) {`
`27`		`- e.preventDefault();`
`28`		`- } else {`
	`27`	`+ return e.preventDefault();`
	`28`	`+ }`
	`29`	`+`
	`30`	`+ if (this.props.onClick) {`
`29`	`31`	`this.props.onClick(e);`
`30`	`32`	`}`
`31`	`33`	`}`