diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-16 16:25:10 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
| commit | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (patch) | |
| tree | db769fadd053248f85db67434a5b275224defef7 /LayoutTests/fast | |
| parent | 52e2557aeb8477967e97fd24f20f8f407a10fa15 (diff) | |
| download | external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.zip external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.gz external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.bz2 | |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Diffstat (limited to 'LayoutTests/fast')
4 files changed, 35 insertions, 46 deletions
diff --git a/LayoutTests/fast/dom/HTMLKeygenElement/keygen-expected.txt b/LayoutTests/fast/dom/HTMLKeygenElement/keygen-expected.txt new file mode 100644 index 0000000..4d7e1f0 --- /dev/null +++ b/LayoutTests/fast/dom/HTMLKeygenElement/keygen-expected.txt @@ -0,0 +1,8 @@ + +Tests the keygen element. + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + + +PASS document.getElementById("keys").options is undefined + diff --git a/LayoutTests/fast/dom/HTMLKeygenElement/keygen-option-select-expected.txt b/LayoutTests/fast/dom/HTMLKeygenElement/keygen-option-select-expected.txt deleted file mode 100644 index a6f14fb..0000000 --- a/LayoutTests/fast/dom/HTMLKeygenElement/keygen-option-select-expected.txt +++ /dev/null @@ -1,6 +0,0 @@ - -This test verifies that list-box-style select form control for keygen works properly when selecting from option element. - -You should see the word "SUCCESS" below - -SUCCESS diff --git a/LayoutTests/fast/dom/HTMLKeygenElement/keygen-option-select.html b/LayoutTests/fast/dom/HTMLKeygenElement/keygen-option-select.html deleted file mode 100644 index 2667715..0000000 --- a/LayoutTests/fast/dom/HTMLKeygenElement/keygen-option-select.html +++ /dev/null @@ -1,40 +0,0 @@ -<html><head> -</head><body> -<keygen id="keys" /> - -<p>This test verifies that list-box-style select form control for keygen works properly when selecting from option element. -</p><p>You should see the word "SUCCESS" below</p> - -<div id="result">FAILED</div> - -<script> -if (window.layoutTestController) - layoutTestController.dumpAsText(); - -function test(elementId) -{ - var testKeygenElement = document.getElementById(elementId); - - // Add two option elements here in case the webkit port used doesn't implement the WebCore::getSupportedKeySizes() function - - var testOption1 = document.createElement("option"); - var testOption1Text = document.createTextNode("foo1"); - testOption1.appendChild(testOption1Text); - testKeygenElement.appendChild(testOption1); - - var testOption2 = document.createElement("option"); - var testOption2Text = document.createTextNode("foo2"); - testOption2.appendChild(testOption2Text); - testKeygenElement.appendChild(testOption2); - - if (testKeygenElement.options[1].index == 1) - { - var result = document.getElementById("result"); - result.innerHTML = "SUCCESS"; - } -} -test("keys"); -</script> - - -</body></html> diff --git a/LayoutTests/fast/dom/HTMLKeygenElement/keygen.html b/LayoutTests/fast/dom/HTMLKeygenElement/keygen.html new file mode 100644 index 0000000..59196ac --- /dev/null +++ b/LayoutTests/fast/dom/HTMLKeygenElement/keygen.html @@ -0,0 +1,27 @@ +<html> +<head> +<link rel="stylesheet" href="../../js/resources/js-test-style.css"> +<script src="../../js/resources/js-test-pre.js"></script> +</head> +<body> +<keygen id="keys" /> + +<p id="description"></p> +<div id="console"></div> + +<script> +if (window.layoutTestController) + layoutTestController.dumpAsText(); + +function test(elementId) +{ + description('Tests the keygen element.'); + + shouldBe('document.getElementById("keys").options', 'undefined'); +} + +test("keys"); +</script> + +</body> +</html> |