From 34eab5d7fe581a70656aace20a6311b56230bc06 Mon Sep 17 00:00:00 2001 From: Brian Vaughn Date: Fri, 31 Mar 2017 13:30:24 -0700 Subject: [PATCH] Prepped for 15.5 release; added Yarn lockfile. Added missing devDep to package.json --- .../package.json | 7 +++--- addons/react-addons-pure-render-mixin/test.js | 24 +++++++++++-------- .../react-addons-pure-render-mixin/yarn.lock | 19 ++++++++++----- 3 files changed, 31 insertions(+), 19 deletions(-) diff --git a/addons/react-addons-pure-render-mixin/package.json b/addons/react-addons-pure-render-mixin/package.json index b5be8cf95b..677675b338 100644 --- a/addons/react-addons-pure-render-mixin/package.json +++ b/addons/react-addons-pure-render-mixin/package.json @@ -1,6 +1,6 @@ { "name": "react-addons-pure-render-mixin", - "version": "15.5.0-alpha.0", + "version": "15.5.0", "main": "index.js", "repository": "facebook/react", "keywords": [ @@ -25,7 +25,8 @@ }, "devDependencies": { "jest": "^19.0.2", - "react": "^16.0.0-alpha.4", - "react-dom": "^16.0.0-alpha.4" + "react": "^16.0.0-alpha.6", + "react-addons-test-utils": "15.4.2", + "react-dom": "^16.0.0-alpha.6" } } diff --git a/addons/react-addons-pure-render-mixin/test.js b/addons/react-addons-pure-render-mixin/test.js index a56228803f..7ec550c389 100644 --- a/addons/react-addons-pure-render-mixin/test.js +++ b/addons/react-addons-pure-render-mixin/test.js @@ -39,10 +39,10 @@ const expectDev = function expectDev(actual) { describe('createReactFragment', () => { beforeEach(() => { - React = require('React'); + React = require('react'); ReactComponentWithPureRenderMixin = require('./index'); - ReactTestUtils = require('ReactTestUtils'); + ReactTestUtils = require('react-addons-test-utils'); }); it('provides a default shouldComponentUpdate implementation', () => { @@ -57,10 +57,10 @@ describe('createReactFragment', () => { render() { return ( - + React.createElement(Apple, { + color: this.state.color, + ref: "apple" + }) ); } } @@ -90,11 +90,13 @@ describe('createReactFragment', () => { render: function() { renderCalls++; - return
; + return React.createElement('div'); }, }); - var instance = ReactTestUtils.renderIntoDocument(); + var instance = ReactTestUtils.renderIntoDocument( + React.createElement(PlasticWrap) + ); expect(renderCalls).toBe(1); // Do not re-render based on props @@ -138,11 +140,13 @@ describe('createReactFragment', () => { render: function() { renderCalls++; - return
; + return React.createElement('div'); }, }); - var instance = ReactTestUtils.renderIntoDocument(); + var instance = ReactTestUtils.renderIntoDocument( + React.createElement(Component) + ); expect(renderCalls).toBe(1); // Do not re-render if state is equal diff --git a/addons/react-addons-pure-render-mixin/yarn.lock b/addons/react-addons-pure-render-mixin/yarn.lock index a64787c770..96d0e1ccfb 100644 --- a/addons/react-addons-pure-render-mixin/yarn.lock +++ b/addons/react-addons-pure-render-mixin/yarn.lock @@ -1584,17 +1584,24 @@ randomatic@^1.1.3: is-number "^2.0.2" kind-of "^3.0.2" -react-dom@^16.0.0-alpha.4: - version "16.0.0-alpha.5" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.0.0-alpha.5.tgz#2e1b8efc3ba1c3000210ad364a6b385f1306655c" +react-addons-test-utils@15.4.2: + version "15.4.2" + resolved "https://registry.yarnpkg.com/react-addons-test-utils/-/react-addons-test-utils-15.4.2.tgz#93bcaa718fcae7360d42e8fb1c09756cc36302a2" + dependencies: + fbjs "^0.8.4" + object-assign "^4.1.0" + +react-dom@^16.0.0-alpha.6: + version "16.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.0.0-alpha.6.tgz#a70fa5dd62d7cc11c6a01868b45de95dc2095c90" dependencies: fbjs "^0.8.9" loose-envify "^1.1.0" object-assign "^4.1.0" -react@^16.0.0-alpha.4: - version "16.0.0-alpha.5" - resolved "https://registry.yarnpkg.com/react/-/react-16.0.0-alpha.5.tgz#ba5ca2058e7f39b010661497286e37133eb1c9fa" +react@^16.0.0-alpha.6: + version "16.0.0-alpha.6" + resolved "https://registry.yarnpkg.com/react/-/react-16.0.0-alpha.6.tgz#2ccb1afb4425ccc12f78a123a666f2e4c141adb9" dependencies: fbjs "^0.8.9" loose-envify "^1.1.0"