Chromium Code Reviews Chromium Code Reviews
Issue 2235693002:
convert LayoutTest/scrollbars/* js-test.js tests to testharness.js based tests (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| Index: third_party/WebKit/LayoutTests/scrollbars/iframe-scrollbar-becomes-custom.html |
| diff --git a/third_party/WebKit/LayoutTests/scrollbars/iframe-scrollbar-becomes-custom.html b/third_party/WebKit/LayoutTests/scrollbars/iframe-scrollbar-becomes-custom.html |
| index be1a938f36f5e7284e76f25719770457da2e329c..c10c77813610d6538cd6e649449e5c59076bebcc 100644 |
| --- a/third_party/WebKit/LayoutTests/scrollbars/iframe-scrollbar-becomes-custom.html |
| +++ b/third_party/WebKit/LayoutTests/scrollbars/iframe-scrollbar-becomes-custom.html |
| @@ -1,27 +1,24 @@ |
| <!DOCTYPE HTML> |
| -<script src="../resources/js-test.js"></script> |
| +<script src="../resources/testharness.js"></script> |
| +<script src="../resources/testharnessreport.js"></script> |
| <iframe id="i" frameborder="0" style="margin-top: 10px"></iframe> |
| <div id="content" style="display: none"> |
| <div id="block1" style='background-color: #ccc'>100% width</div><br> |
| <div style='background-color: #ddf; width: 400px; height: 300px'></div> |
| </div> |
| <script> |
| +test(function(){ |
|
Srirama
2016/08/10 11:04:39
nit: space between () and {.
MuVen
2016/08/10 11:40:59
Done.
|
| + var idoc = document.querySelector("#i").contentDocument; |
|
Srirama
2016/08/10 11:04:39
you can remove id from iframe element and directly
Srirama
2016/08/10 11:04:39
s/idoc/iframeDocument for better readability.
MuVen
2016/08/10 11:40:59
Done.
MuVen
2016/08/10 11:40:59
Done.
|
| + var sheet = idoc.head.appendChild(idoc.createElement("style")).sheet; |
| + idoc.body.style.margin = '0'; |
|
Srirama
2016/08/10 11:04:39
nit: use double quotes to be consistent within the
MuVen
2016/08/10 11:40:59
Done.
|
| + idoc.body.innerHTML = document.querySelector('#content').innerHTML; |
|
Srirama
2016/08/10 11:04:39
nit: change it to double quotes here as well.
MuVen
2016/08/10 11:40:59
Done.
|
| + var block = idoc.querySelector("#block1"); |
| + var origWidth = block.offsetWidth; |
| + sheet.insertRule("::-webkit-scrollbar { width: 50px; height: 20px; }", 0); |
| + sheet.insertRule("::-webkit-scrollbar-thumb { background: #cce; }", 1); |
| + var width = block.offsetWidth; |
| -var idoc = document.querySelector("#i").contentDocument; |
| -var sheet = idoc.head.appendChild(idoc.createElement("style")).sheet; |
| - |
| -idoc.body.style.margin = '0'; |
| -idoc.body.innerHTML = document.querySelector('#content').innerHTML; |
| - |
| -var block = idoc.querySelector("#block1"); |
| -var origWidth = block.offsetWidth; |
| - |
| -sheet.insertRule("::-webkit-scrollbar { width: 50px; height: 20px; }", 0); |
| -sheet.insertRule("::-webkit-scrollbar-thumb { background: #cce; }", 1); |
| - |
| -var width = block.offsetWidth; |
| - |
| -shouldBe("250", String(width)); |
| -shouldBeTrue("width < origWidth"); |
| - |
| + assert_equals(250, width); |
| + assert_less_than(width, origWidth); |
| +}); |
| </script> |
