Skip to content
This repository was archived by the owner on Oct 2, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,13 @@
"eslint-plugin-react": "^2.7.0",
"injectr": "^0.5.1",
"jasmine": "^2.3.1",
"react-shallow-testutils": "^0.2.1"
"react": "0.14.3",
"react-addons-perf": "0.14.0",
"react-addons-test-utils": "^0.14.0",
"react-shallow-testutils": "^0.7.1"
},
"peerDependencies": {
"react": "^0.13.3"
"react": "^0.14.0",
"react-addons-perf": "^0.14.0"
}
}
36 changes: 18 additions & 18 deletions specs/index-spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import injectr from 'injectr';
import React from 'react/addons';
import testUtils from 'react-shallow-testutils';
import React from 'react';
import {createRenderer} from 'react-addons-test-utils';
import ShallowTestUtils from 'react-shallow-testutils';

class TestComponent extends React.Component {
render() {
Expand All @@ -13,11 +14,9 @@ class TestComponent extends React.Component {
describe('Perf component', function() {
beforeEach(function() {
this.MockReactAddons = {
Perf: {
getLastMeasurements: jasmine.createSpy('Perf.getLastMeasurements'),
printWasted: jasmine.createSpy('Perf.printWasted'),
start: jasmine.createSpy('Perf.start')
}
getLastMeasurements: jasmine.createSpy('Perf.getLastMeasurements'),
printWasted: jasmine.createSpy('Perf.printWasted'),
start: jasmine.createSpy('Perf.start')
};

this.MockConsole = {
Expand All @@ -27,7 +26,7 @@ describe('Perf component', function() {
this.NODE_ENV = 'development';

this.makePerf = () => injectr('../../src/index.js', {
'react/addons': Object.assign({}, React, {addons: this.MockReactAddons})
'react-addons-perf': this.MockReactAddons
}, {
console: this.MockConsole,
process: {env: {NODE_ENV: this.NODE_ENV}}
Expand All @@ -48,10 +47,11 @@ describe('Perf component', function() {

it('should render the passed component and pass any props', function() {
const Perf = this.perf(TestComponent);
const renderer = new testUtils.Renderer();
const perf = renderer.render(Perf, null, {test: 1});
const renderer = createRenderer();
renderer.render(<Perf test={1} />);
const perf = renderer.getRenderOutput();

const mockPerfChild = testUtils.findWithType(perf, TestComponent);
const mockPerfChild = ShallowTestUtils.findWithType(perf, TestComponent);
expect(mockPerfChild.props.test).toEqual(1);
});

Expand All @@ -62,34 +62,34 @@ describe('Perf component', function() {
const perf = new Perf();
perf.componentDidMount();

expect(this.MockReactAddons.Perf.start).toHaveBeenCalled();
expect(this.MockReactAddons.start).toHaveBeenCalled();
});

it('should not print measurements if none are available', function() {
const Perf = this.perf(TestComponent);
this.MockReactAddons.Perf.getLastMeasurements.and.returnValue([]);
this.MockReactAddons.getLastMeasurements.and.returnValue([]);

const perf = new Perf();
perf.componentDidMount();
perf.componentDidUpdate();

expect(this.MockReactAddons.Perf.getLastMeasurements).toHaveBeenCalled();
expect(this.MockReactAddons.Perf.printWasted).not.toHaveBeenCalled();
expect(this.MockReactAddons.getLastMeasurements).toHaveBeenCalled();
expect(this.MockReactAddons.printWasted).not.toHaveBeenCalled();
expect(this.MockConsole.log).not.toHaveBeenCalled();
});

it('should print measurements if some are available', function() {
const Perf = this.perf(TestComponent);
this.MockReactAddons.Perf.getLastMeasurements.and.returnValue([{
this.MockReactAddons.getLastMeasurements.and.returnValue([{
totalTime: 192
}]);

const perf = new Perf();
perf.componentDidMount();
perf.componentDidUpdate();

expect(this.MockReactAddons.Perf.getLastMeasurements).toHaveBeenCalled();
expect(this.MockReactAddons.Perf.printWasted).toHaveBeenCalled();
expect(this.MockReactAddons.getLastMeasurements).toHaveBeenCalled();
expect(this.MockReactAddons.printWasted).toHaveBeenCalled();
expect(this.MockConsole.log).toHaveBeenCalled();
});
});
Expand Down
11 changes: 6 additions & 5 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react/addons';
import React from 'react';
import ReactPerf from 'react-addons-perf';

/**
* Wraps the passed in `Component` in a higher-order component. It can then
Expand All @@ -16,19 +17,19 @@ export default function perf(Component) {

return class Perf extends React.Component {
componentDidMount() {
React.addons.Perf.start();
ReactPerf.start();
}
componentDidUpdate() {
const measurements = React.addons.Perf.getLastMeasurements();
const measurements = ReactPerf.getLastMeasurements();

if (measurements.length > 0) {
this.totalRenders = (this.totalRenders || 0) + 1;
this.totalTime = (this.totalTime || 0) + measurements[0].totalTime;

console.log(`Average: ${this.totalTime / this.totalRenders} over ${this.totalRenders} renders.`);

React.addons.Perf.printWasted(measurements);
React.addons.Perf.start();
ReactPerf.printWasted(measurements);
ReactPerf.start();
}
}
render() {
Expand Down