do not infinite loop on random layouts anymore

This commit is contained in:
Christopher Chedeau
2014-12-11 12:17:40 +00:00
parent a81f4abb0e
commit 8031cbe134

View File

@@ -80,7 +80,6 @@ var layoutTestUtils = (function() {
} }
fillNodes(rootNode); fillNodes(rootNode);
rootNode.style.alignSelf = 'flex-start';
realComputeLayout(rootNode); realComputeLayout(rootNode);
return extractNodes(rootNode); return extractNodes(rootNode);
} }
@@ -304,12 +303,16 @@ var layoutTestUtils = (function() {
textSizes: textSizes, textSizes: textSizes,
preDefinedTextSizes: preDefinedTextSizes, preDefinedTextSizes: preDefinedTextSizes,
testLayout: function(node, expectedLayout) { testLayout: function(node, expectedLayout) {
node.style = node.style || {};
node.style.alignSelf = 'flex-start';
var layout = computeCSSLayout(node); var layout = computeCSSLayout(node);
var domLayout = computeDOMLayout(node); var domLayout = computeDOMLayout(node);
testNamedLayout('expected-dom', expectedLayout, domLayout); testNamedLayout('expected-dom', expectedLayout, domLayout);
testNamedLayout('layout-dom', layout, domLayout); testNamedLayout('layout-dom', layout, domLayout);
}, },
testRandomLayout: function(node, i) { testRandomLayout: function(node, i) {
node.style = node.style || {};
node.style.alignSelf = 'flex-start';
expect({i: i, node: node, layout: computeCSSLayout(node)}) expect({i: i, node: node, layout: computeCSSLayout(node)})
.toEqual({i: i, node: node, layout: computeDOMLayout(node)}); .toEqual({i: i, node: node, layout: computeDOMLayout(node)});
}, },