Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use a closure to bind argument to callback in ReactErrorUtils #8363

Merged
merged 2 commits into from
Nov 28, 2016
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
7 changes: 7 additions & 0 deletions scripts/fiber/tests-passing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1418,6 +1418,13 @@ src/renderers/shared/stack/reconciler/__tests__/refs-test.js
* ref called correctly for stateless component when __DEV__ = true
* coerces numbers to strings

src/renderers/shared/utils/__tests__/ReactErrorUtils-test.js
* should call the callback with only the passed argument
* should catch errors
* should rethrow caught errors
* should call the callback with only the passed argument
* should use invokeGuardedCallbackWithCatch in production

src/renderers/shared/utils/__tests__/accumulateInto-test.js
* throws if the second item is null
* returns the second item if first is null
Expand Down
4 changes: 3 additions & 1 deletion src/renderers/shared/utils/ReactErrorUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ if (__DEV__) {
func: (a: A) => void,
a: A,
): void {
var boundFunc = func.bind(null, a);
var boundFunc = function() {
func(a);
};
var evtType = `react-${name}`;
fakeNode.addEventListener(evtType, boundFunc, false);
var evt = document.createEvent('Event');
Expand Down
73 changes: 73 additions & 0 deletions src/renderers/shared/utils/__tests__/ReactErrorUtils-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
/**
* Copyright 2014-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*
* @emails react-core
*/

'use strict';

var ReactErrorUtils;

describe('ReactErrorUtils', () => {

beforeEach(() => {
ReactErrorUtils = require('ReactErrorUtils');
});

describe('invokeGuardedCallbackWithCatch', () => {
it('should call the callback with only the passed argument', () => {
var callback = jest.fn();
ReactErrorUtils.invokeGuardedCallbackWithCatch('foo', callback, 'arg');
expect(callback).toBeCalledWith('arg');
});

it('should catch errors', () => {
var callback = function() {
throw new Error('foo');
};
expect(
() => ReactErrorUtils.invokeGuardedCallbackWithCatch('foo', callback)
).not.toThrow();
});
});

describe('rethrowCaughtError', () => {
it('should rethrow caught errors', () => {
var err = new Error('foo');
var callback = function() {
throw err;
};
ReactErrorUtils.invokeGuardedCallbackWithCatch('foo', callback);
expect(() => ReactErrorUtils.rethrowCaughtError()).toThrow(err);
});
});

describe('invokeGuardedCallback', () => {
it('should call the callback with only the passed argument', () => {
var callback = jest.fn();
ReactErrorUtils.invokeGuardedCallback('foo', callback, 'arg');
expect(callback).toBeCalledWith('arg');
});

it('should use invokeGuardedCallbackWithCatch in production', () => {
expect(ReactErrorUtils.invokeGuardedCallback).not.toEqual(
ReactErrorUtils.invokeGuardedCallbackWithCatch
);
__DEV__ = false;
var oldProcess = process;
global.process = {env: {NODE_ENV: 'production'}};
jest.resetModuleRegistry();
ReactErrorUtils = require('ReactErrorUtils');
expect(ReactErrorUtils.invokeGuardedCallback).toEqual(
ReactErrorUtils.invokeGuardedCallbackWithCatch
);
__DEV__ = true;
global.process = oldProcess;
});
});
});