From e704503dc78476076c9f12e5147f26b0725c1e35 Mon Sep 17 00:00:00 2001 From: yiminghe Date: Wed, 10 Jun 2015 01:09:34 +0800 Subject: [PATCH 1/3] optimize className check --- src/test/ReactTestUtils.js | 2 +- src/test/__tests__/ReactTestUtils-test.js | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/test/ReactTestUtils.js b/src/test/ReactTestUtils.js index ab1d75d0b5..e207ea8140 100644 --- a/src/test/ReactTestUtils.js +++ b/src/test/ReactTestUtils.js @@ -174,7 +174,7 @@ var ReactTestUtils = { var instClassName = React.findDOMNode(inst).className; return ( instClassName && - (' ' + instClassName + ' ').indexOf(' ' + className + ' ') !== -1 + (('' + instClassName).split(/\s+/)).indexOf(className) !== -1 ); } return false; diff --git a/src/test/__tests__/ReactTestUtils-test.js b/src/test/__tests__/ReactTestUtils-test.js index 7311bcf0d0..7ae7dba19f 100644 --- a/src/test/__tests__/ReactTestUtils-test.js +++ b/src/test/__tests__/ReactTestUtils-test.js @@ -187,6 +187,17 @@ describe('ReactTestUtils', function() { }); + it('Test scryRenderedDOMComponentsWithClass with className contains \\n', function() { + var renderedComponent = ReactTestUtils.renderIntoDocument(
Hello Jim
); + var scryResults = ReactTestUtils.scryRenderedDOMComponentsWithClass( + renderedComponent, + 'x' + ); + expect(scryResults.length).toBe(1); + + }); + it('traverses children in the correct order', function() { var container = document.createElement('div'); From 69339a0f671b59b35c541425bc23c74c739e8160 Mon Sep 17 00:00:00 2001 From: yiminghe Date: Thu, 11 Jun 2015 23:21:52 +0800 Subject: [PATCH 2/3] update code style --- src/test/__tests__/ReactTestUtils-test.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/test/__tests__/ReactTestUtils-test.js b/src/test/__tests__/ReactTestUtils-test.js index 7ae7dba19f..725f40fe85 100644 --- a/src/test/__tests__/ReactTestUtils-test.js +++ b/src/test/__tests__/ReactTestUtils-test.js @@ -188,14 +188,15 @@ describe('ReactTestUtils', function() { }); it('Test scryRenderedDOMComponentsWithClass with className contains \\n', function() { - var renderedComponent = ReactTestUtils.renderIntoDocument(
Hello Jim
); + var renderedComponent = ReactTestUtils.renderIntoDocument( +
Hello Jim
+ ); var scryResults = ReactTestUtils.scryRenderedDOMComponentsWithClass( renderedComponent, 'x' ); expect(scryResults.length).toBe(1); - }); it('traverses children in the correct order', function() { From a5f3962ef6dae53b1bb0f19284773af2400fc56a Mon Sep 17 00:00:00 2001 From: yiminghe Date: Thu, 11 Jun 2015 23:26:09 +0800 Subject: [PATCH 3/3] update code style --- src/test/__tests__/ReactTestUtils-test.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/__tests__/ReactTestUtils-test.js b/src/test/__tests__/ReactTestUtils-test.js index 725f40fe85..2c784152c7 100644 --- a/src/test/__tests__/ReactTestUtils-test.js +++ b/src/test/__tests__/ReactTestUtils-test.js @@ -189,8 +189,7 @@ describe('ReactTestUtils', function() { it('Test scryRenderedDOMComponentsWithClass with className contains \\n', function() { var renderedComponent = ReactTestUtils.renderIntoDocument( -
Hello Jim
+
Hello Jim
); var scryResults = ReactTestUtils.scryRenderedDOMComponentsWithClass( renderedComponent,