From 1fac6f39ef565cc672ab3de74c5e0295d70df31f Mon Sep 17 00:00:00 2001 From: Daniel Holbert Date: Tue, 22 Jul 2014 08:24:35 -0700 Subject: [PATCH] Bug 984711 part 8: Remove pref-setting mochitest wrapper for min-[size]:auto mochitest. (no review; tweaking existing test) --- .../test/file_flexbox_min_size_auto.html | 18 ++++---- layout/style/test/mochitest.ini | 3 +- .../test/test_flexbox_min_size_auto.html | 43 ------------------- 3 files changed, 9 insertions(+), 55 deletions(-) delete mode 100644 layout/style/test/test_flexbox_min_size_auto.html diff --git a/layout/style/test/file_flexbox_min_size_auto.html b/layout/style/test/file_flexbox_min_size_auto.html index 5902e139f07..e4a73c98030 100644 --- a/layout/style/test/file_flexbox_min_size_auto.html +++ b/layout/style/test/file_flexbox_min_size_auto.html @@ -1,9 +1,17 @@ + + Test behavior of 'min-height:auto' and 'min-width:auto' (Bug 763689) + + +Mozilla Bug 763689 +
abc
@@ -52,11 +60,6 @@ * min-content height as needed in layout.) */ -// Use "is()", "ok()", and "todo_is()" from parent document. -var is = parent.is; -var ok = parent.ok; -var todo_is = parent.todo_is; - // Given an element ID, this function sets the corresponding // element's inline-style min-width and min-height explicitly to "auto". function setElemMinSizesToAuto(aElemId) { @@ -119,9 +122,6 @@ function checkAllTheMinSizes() { // Main test function function main() { - ok(SpecialPowers.getBoolPref("layout.css.flexbox.enabled"), - "expecting to be run with flexbox support enabled"); - // First: check that min-sizes are what we expect, with min-size properties // at their initial value. checkAllTheMinSizes(); @@ -134,8 +134,6 @@ function main() { // ...and try again (should have the same result): checkAllTheMinSizes(); - - parent.finish(); } main(); diff --git a/layout/style/test/mochitest.ini b/layout/style/test/mochitest.ini index bea622f4a91..13c5b7c2ff9 100644 --- a/layout/style/test/mochitest.ini +++ b/layout/style/test/mochitest.ini @@ -128,8 +128,7 @@ skip-if = toolkit == 'android' #bug 536603 [test_flexbox_flex_shorthand.html] [test_flexbox_layout.html] support-files = flexbox_layout_testcases.js -[test_flexbox_min_size_auto.html] -support-files = file_flexbox_min_size_auto.html +# [test_flexbox_min_size_auto.html] # (will uncomment in next patch) [test_flexbox_order.html] [test_flexbox_order_table.html] [test_font_face_parser.html] diff --git a/layout/style/test/test_flexbox_min_size_auto.html b/layout/style/test/test_flexbox_min_size_auto.html deleted file mode 100644 index b7b4fd14430..00000000000 --- a/layout/style/test/test_flexbox_min_size_auto.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - Test behavior of 'min-height:auto' and 'min-width:auto' (Bug 763689) - - - - -Mozilla Bug 763689 -
- -
-
-
-
- -