From 919eba3c99b8fd697d508d36a6e4c13a079fe7e7 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Thu, 26 May 2016 01:08:27 +0100 Subject: [PATCH] Correctly check that element and props are frozen This fixes an incorrect way of checking introduced in 95373ce769188aacd25c6485bc2c628ff02a856f (it had no effect). --- .../element/__tests__/ReactElement-test.js | 18 ++++++++++++------ .../__tests__/ReactElementClone-test.js | 6 ++++-- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/isomorphic/classic/element/__tests__/ReactElement-test.js b/src/isomorphic/classic/element/__tests__/ReactElement-test.js index 877fdb750c..ec545c8e58 100644 --- a/src/isomorphic/classic/element/__tests__/ReactElement-test.js +++ b/src/isomorphic/classic/element/__tests__/ReactElement-test.js @@ -53,7 +53,8 @@ describe('ReactElement', function() { expect(element.key).toBe(null); expect(element.ref).toBe(null); var expectation = {}; - Object.freeze(expectation); + expect(Object.isFrozen(element)).toBe(true); + expect(Object.isFrozen(element.props)).toBe(true); expect(element.props).toEqual(expectation); }); @@ -121,7 +122,8 @@ describe('ReactElement', function() { expect(element.key).toBe(null); expect(element.ref).toBe(null); var expectation = {}; - Object.freeze(expectation); + expect(Object.isFrozen(element)).toBe(true); + expect(Object.isFrozen(element.props)).toBe(true); expect(element.props).toEqual(expectation); }); @@ -166,7 +168,8 @@ describe('ReactElement', function() { expect(element.key).toBe('12'); expect(element.ref).toBe('34'); var expectation = {foo: '56'}; - Object.freeze(expectation); + expect(Object.isFrozen(element)).toBe(true); + expect(Object.isFrozen(element.props)).toBe(true); expect(element.props).toEqual(expectation); }); @@ -180,7 +183,8 @@ describe('ReactElement', function() { expect(element.key).toBe('null'); expect(element.ref).toBe(null); var expectation = {foo: '12'}; - Object.freeze(expectation); + expect(Object.isFrozen(element)).toBe(true); + expect(Object.isFrozen(element.props)).toBe(true); expect(element.props).toEqual(expectation); }); @@ -195,7 +199,8 @@ describe('ReactElement', function() { expect(element.key).toBe(null); expect(element.ref).toBe(null); var expectation = {foo: '56'}; - Object.freeze(expectation); + expect(Object.isFrozen(element)).toBe(true); + expect(Object.isFrozen(element.props)).toBe(true); expect(element.props).toEqual(expectation); }); @@ -215,7 +220,8 @@ describe('ReactElement', function() { expect(element.key).toBe('12'); expect(element.ref).toBe(null); var expectation = {foo: '56'}; - Object.freeze(expectation); + expect(Object.isFrozen(element)).toBe(true); + expect(Object.isFrozen(element.props)).toBe(true); expect(element.props).toEqual(expectation); }); diff --git a/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js b/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js index 187ef0bfef..f11798f209 100644 --- a/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js +++ b/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js @@ -345,7 +345,8 @@ describe('ReactElementClone', function() { expect(clone.key).toBe('12'); expect(clone.ref).toBe('34'); var expectation = {foo: 'ef'}; - Object.freeze(expectation); + expect(Object.isFrozen(element)).toBe(true); + expect(Object.isFrozen(element.props)).toBe(true); expect(clone.props).toEqual(expectation); }); @@ -365,7 +366,8 @@ describe('ReactElementClone', function() { expect(clone.key).toBe('null'); expect(clone.ref).toBe(null); var expectation = {foo: 'ef'}; - Object.freeze(expectation); + expect(Object.isFrozen(element)).toBe(true); + expect(Object.isFrozen(element.props)).toBe(true); expect(clone.props).toEqual(expectation); });