Bug 1176782 part 8 - [css-align] Update three tests that assumed that the computed value of 'align-items' is 'stretch' on all types of boxes which is no longer true.
authorMats Palmgren <mats@mozilla.com>
Tue, 03 Nov 2015 15:18:06 +0100
changeset 270943 9a84c80698b0c3f443520d4c624e465b9bedc1cf
parent 270942 075f3a69cc48715bb4b8cae7577b95f39298666f
child 270944 56aebef6afdfd77c266d6b95abf3866a75c4abe7
push id67508
push usermpalmgren@mozilla.com
push dateTue, 03 Nov 2015 14:18:18 +0000
treeherdermozilla-inbound@56aebef6afdf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1176782
milestone45.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1176782 part 8 - [css-align] Update three tests that assumed that the computed value of 'align-items' is 'stretch' on all types of boxes which is no longer true.
layout/reftests/css-display/display-contents-acid.html
layout/reftests/w3c-css/submitted/flexbox/flexbox-align-self-horiz-003-ref.xhtml
layout/style/test/test_flexbox_align_self_auto.html
--- a/layout/reftests/css-display/display-contents-acid.html
+++ b/layout/reftests/css-display/display-contents-acid.html
@@ -27,17 +27,17 @@
 .colg    { display:table-column-group; }
 .flex    { display:flex; }
 .iflex   { display:inline-flex; }
 .li      { display:list-item; }
 .ib      { display:inline-block; }
 .inline  { display:inline; }
 .columns  { -moz-columns:2; columns:2; height:4em; }
 
-.contents { display:contents; }
+.contents { display:contents; align-items:inherit; justify-items:inherit; }
 
 .c1 { color:lime; }
 .c2 { background:blue; color:pink; }
 .c3 { color:teal; }
 .c4 { color:green; }
 .c5 { color:silver; }
 .c6 { color:cyan; }
 .c7 { color:magenta; }
--- a/layout/reftests/w3c-css/submitted/flexbox/flexbox-align-self-horiz-003-ref.xhtml
+++ b/layout/reftests/w3c-css/submitted/flexbox/flexbox-align-self-horiz-003-ref.xhtml
@@ -82,12 +82,12 @@
        ><div class="baseline big"
              style="width: 40px; display: inline-block">abc</div>
       </div>
       <div class="stretch" style="height: 100%">stretch</div>
       <div class="stretch big">a b c d e f</div>
       <div class="auto" style="height: 100%">auto</div>
       <div class="unspecified" style="height: 100%">unspec</div>
       <div class="initial" style="height: 100%">initial</div>
-      <div class="inherit" style="height: 100%">inherit</div>
+      <div class="inherit">inherit</div>
     </div>
   </body>
 </html>
--- a/layout/style/test/test_flexbox_align_self_auto.html
+++ b/layout/style/test/test_flexbox_align_self_auto.html
@@ -58,32 +58,32 @@ function getComputedAlignSelf(elem) {
   return window.getComputedStyle(elem, "").alignSelf;
 }
 
 /*
  * Tests that are useful regardless of whether we have a parent node:
  */
 function testGeneralNode(elem) {
   // Test initial computed style
-  // (Initial value should be 'auto', which should compute to 'stretch')
-  is(getComputedAlignSelf(elem), "stretch",
-     "initial computed value of 'align-self' should be 'stretch', " +
+  // (Initial value should be 'auto', which should compute to 'start')
+  is(getComputedAlignSelf(elem), "start",
+     "initial computed value of 'align-self' should be 'start', " +
      "if we haven't explicitly set any style on the parent");
 
   // Test value after setting align-self explicitly to "auto"
   elem.style.alignSelf = "auto";
-  is(getComputedAlignSelf(elem), "stretch",
-     "computed value of 'align-self: auto' should be 'stretch', " +
+  is(getComputedAlignSelf(elem), "start",
+     "computed value of 'align-self: auto' should be 'start', " +
      "if we haven't explicitly set any style on the parent");
   elem.style.alignSelf = ""; // clean up
 
   // Test value after setting align-self explicitly to "inherit"
   elem.style.alignSelf = "inherit";
-  is(getComputedAlignSelf(elem), "stretch",
-     "computed value of 'align-self: inherit' should be 'stretch', " +
+  is(getComputedAlignSelf(elem), "start",
+     "computed value of 'align-self: inherit' should be 'start', " +
      "if we haven't explicitly set any style on the parent");
   elem.style.alignSelf = ""; // clean up
 }
 
 /*
  * Tests that depend on us having a parent node:
  */
 function testNodeThatHasParent(elem) {
@@ -106,21 +106,21 @@ function testNodeThatHasParent(elem) {
      "computed value of 'align-self: auto' should match parent's " +
      "specified 'align-items' value");
 
   elem.style.alignSelf = ""; // clean up
   elem.parentNode.style.alignItems = ""; // clean up
 
   // Finally: test computed style after setting "align-self" to "inherit"
   // and leaving parent at its initial value (which should be "auto", which
-  // should compute to "stretch")
+  // should compute to "start")
   elem.style.alignSelf = "inherit";
-  is(getComputedAlignSelf(elem), "stretch",
+  is(getComputedAlignSelf(elem), "start",
      "computed value of 'align-self: inherit' should take parent's " +
-     "computed 'align-self' value (which should be 'stretch', " +
+     "computed 'align-self' value (which should be 'start', " +
      "if we haven't explicitly set any other style");
   elem.style.alignSelf = ""; // clean up
  }
 
 /*
  * Tests that depend on us having a grandparent node:
  */
 function testNodeThatHasGrandparent(elem) {