Skip to content

Commit

Permalink
Merge pull request #5175 from spicyj/text-no-frag
Browse files Browse the repository at this point in the history
Don't test frag cases in ReactMultiChildText-test
  • Loading branch information
sophiebits committed Oct 14, 2015
2 parents 8e9682c + 5f8fe7d commit 8168c8e
Showing 1 changed file with 0 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,8 @@ require('mock-modules');

var React = require('React');
var ReactDOM = require('ReactDOM');
var ReactFragment = require('ReactFragment');
var ReactTestUtils = require('ReactTestUtils');

var frag = ReactFragment.create;

// Helpers
var testAllPermutations = function(testCases) {
for (var i = 0; i < testCases.length; i += 2) {
Expand Down Expand Up @@ -164,20 +161,6 @@ describe('ReactMultiChildText', function() {
[true, [1.2, '', <div />, 'foo'], true, 1.2], ['1.2', '', <div />, 'foo', '1.2'],
['', 'foo', [true, <div />, 1.2, ''], 'foo'], ['', 'foo', <div />, '1.2', '', 'foo'],

// values inside objects
[frag({a: true}), frag({a: true})], [],
[frag({a: 1.2}), frag({a: 1.2})], ['1.2', '1.2'],
[frag({a: ''}), frag({a: ''})], ['', ''],
[frag({a: 'foo'}), frag({a: 'foo'})], ['foo', 'foo'],
[frag({a: <div />}), frag({a: <div />})], [<div />, <div />],

[frag({a: true, b: 1.2, c: <div />}), '', 'foo'], ['1.2', <div />, '', 'foo'],
[1.2, '', frag({a: <div />, b: 'foo', c: true})], ['1.2', '', <div />, 'foo'],
['', frag({a: 'foo', b: <div />, c: true}), 1.2], ['', 'foo', <div />, '1.2'],

[true, frag({a: 1.2, b: '', c: <div />, d: 'foo'}), true, 1.2], ['1.2', '', <div />, 'foo', '1.2'],
['', 'foo', frag({a: true, b: <div />, c: 1.2, d: ''}), 'foo'], ['', 'foo', <div />, '1.2', '', 'foo'],

// values inside elements
[<div>{true}{1.2}{<div />}</div>, '', 'foo'], [<div />, '', 'foo'],
[1.2, '', <div>{<div />}{'foo'}{true}</div>], ['1.2', '', <div />],
Expand Down

0 comments on commit 8168c8e

Please sign in to comment.