From 57c1c26465aa367328c41f870776a20e5a9b294d Mon Sep 17 00:00:00 2001 From: Michael Ridgway Date: Mon, 3 Nov 2014 21:39:02 -0800 Subject: [PATCH] Update tests to use new React APIs; Use createElement instead of React.DOM --- lib/NavLink.js | 3 ++- tests/unit/lib/NavLink-test.js | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/NavLink.js b/lib/NavLink.js index 385a4eb..ea1e3b9 100644 --- a/lib/NavLink.js +++ b/lib/NavLink.js @@ -34,7 +34,8 @@ NavLink = React.createClass({ if (!this.props.href && routeName && context && context.makePath) { this.props.href = context.makePath(routeName, this.props.navParams); } - return React.DOM.a( + return React.createElement( + 'a', {onClick:this.dispatchNavAction, href:this.props.href}, this.props.children ); diff --git a/tests/unit/lib/NavLink-test.js b/tests/unit/lib/NavLink-test.js index ccfd755..82422a3 100644 --- a/tests/unit/lib/NavLink-test.js +++ b/tests/unit/lib/NavLink-test.js @@ -42,7 +42,7 @@ describe('NavLink', function () { global.navigator = global.window.navigator; React = require('react/addons'); ReactTestUtils = React.addons.TestUtils; - NavLink = require('../../../lib/NavLink'); + NavLink = React.createFactory(require('../../../lib/NavLink')); testResult = {}; }); @@ -54,12 +54,12 @@ describe('NavLink', function () { describe('render()', function () { it ('href defined', function () { - var link = ReactTestUtils.renderIntoDocument(NavLink( {href:"/foo"}, React.DOM.span(null, "bar"))); + var link = ReactTestUtils.renderIntoDocument(NavLink( {href:"/foo", context:contextMock}, React.DOM.span(null, "bar"))); expect(link.props.href).to.equal('/foo'); expect(link.getDOMNode().textContent).to.equal('bar'); }); it ('both href and routeName defined', function () { - var link = ReactTestUtils.renderIntoDocument(NavLink( {routeName:"fooo", href:"/foo"}, React.DOM.span(null, "bar"))); + var link = ReactTestUtils.renderIntoDocument(NavLink( {routeName:"fooo", href:"/foo", context:contextMock}, React.DOM.span(null, "bar"))); expect(link.props.href).to.equal('/foo'); }); it ('only routeName defined', function () {