--- a/dom/grid/test/chrome/test_grid_repeats.html
+++ b/dom/grid/test/chrome/test_grid_repeats.html
@@ -81,19 +81,16 @@ SimpleTest.waitForExplicitFinish();
function testLines(elementName, grid, expectedValues) {
is(grid.cols.lines.length, expectedValues.length, elementName + " has expected number of lines.");
for (let i = 0; i < grid.cols.lines.length; i++) {
// 'number' is optional.
if (typeof(expectedValues[i].number) != "undefined") {
is(grid.cols.lines[i].number, expectedValues[i].number, elementName + " line " + (i + 1) + " has expected number.");
- } else {
- // If 'number' is omitted, assume that first line is line 1 and increase from there.
- is(grid.cols.lines[i].number, (i + 1), elementName + " line " + (i + 1) + " has expected number.");
}
// 'negativeNumber' is optional.
if (typeof(expectedValues[i].negativeNumber) != "undefined") {
// Check for the supplied number.
is(grid.cols.lines[i].negativeNumber, expectedValues[i].negativeNumber, elementName + " line " + (i + 1) + " has expected negativeNumber.");
}
@@ -118,25 +115,26 @@ function testLines(elementName, grid, ex
}
}
}
function runTests() {
let wrapper;
let grid;
let expectedValues;
+ let templateColumnsText;
wrapper = document.getElementById("wrapper1");
grid = wrapper.getGridFragments()[0];
// test auto-fit count
is(grid.cols.tracks.length, 7, "Grid column track array reports removed auto-fit columns.");
// test resolved value of grid-template-columns
- let templateColumnsText = getComputedStyle(wrapper).gridTemplateColumns;
+ templateColumnsText = getComputedStyle(wrapper).gridTemplateColumns;
is(templateColumnsText, "50px 0px 0px 100px 0px 0px 0px",
"Resolved value of grid-template-columns reports removed auto-fits as '0px'.");
// test starts, breadths, and states
expectedValues = [
{ "start": 0,
"breadth": 50,
"state": "static" },
@@ -281,20 +279,25 @@ function runTests() {
testLines("wrapper7", grid, expectedValues);
wrapper = document.getElementById("wrapper8");
grid = wrapper.getGridFragments()[0];
// test starts and names
expectedValues = [
- { "start": 0,
- "todo_names": "real-before,before" },
- { "start": 0,
- "todo_names": "after,real-after" },
+ {},
+ {},
+ {},
+ {},
+ {},
+ {},
+ {},
+ { "names": "real-before,before" },
+ { "names": "after,real-after" },
];
testLines("wrapper8", grid, expectedValues);
wrapper = document.getElementById("wrapper9");
grid = wrapper.getGridFragments()[0];
// test starts and names
@@ -378,16 +381,17 @@ function runTests() {
<br/>
<div id="wrapper7" class="wrapper grid7">
<div id="boxB" class="box b">B</div>
</div>
<br/>
<div id="wrapper8" class="wrapper grid8">
+ <div id="boxF" class="box f">F</div>
</div>
<br/>
<div id="wrapper9" class="wrapper grid9">
<div id="boxB" class="box b">B</div>
<div id="boxE" class="box e">E</div>
</div>