Merge pull request reactjs#30 from rackt/fix-assertions

Tidy up assertions and tests
romeovs · May 13, 2015 · f267e2d · f267e2d
2 parents b6f1d81 + 6851277
commit f267e2d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/lib/__tests__/index-test.js b/lib/__tests__/index-test.js
@@ -98,7 +98,7 @@ describe('props', () => {
     });
 
     describe('when role="button"', () => {
-      it('requires onKeyUp', () => {
+      it('requires onKeyDown', () => {
         expectWarning(assertions.props.onClick.BUTTON_ROLE_SPACE.msg, () => {
           <span onClick={k} role="button"/>;
         });

diff --git a/lib/assertions.js b/lib/assertions.js
@@ -68,8 +68,6 @@ exports.props = {
       }
     },
 
-    // onKeyUp is too late to cancel space's default behavior of scrolling the
-    // page.
     BUTTON_ROLE_SPACE: {
       msg: 'You have `role="button"` but did not define an `onKeyDown` handler. Add it, and have the "Space" key do the same thing as an `onClick` handler.',
       test (tagName, props, children) {
@@ -80,7 +78,7 @@ exports.props = {
     BUTTON_ROLE_ENTER: {
       msg: 'You have `role="button"` but did not define an `onKeyDown` handler. Add it, and have the "Enter" key do the same thing as an `onClick` handler.',
       test (tagName, props, children) {
-        return !(props.role === 'button' && props.onKeyDown);
+        return !(props.role === 'button' && !props.onKeyDown);
       }
     }