Chromium Code Reviews Chromium Code Reviews
Issue 70073005:
Refactoring spellcheck-disable-enable.html to use async path for spellcheck (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink@master| Index: LayoutTests/editing/spelling/spellcheck-disable-enable.html |
| diff --git a/LayoutTests/editing/spelling/spellcheck-disable-enable.html b/LayoutTests/editing/spelling/spellcheck-disable-enable.html |
| index d2f94b7451ff276ef9897cc824e2122826e96154..34aca8cf5977324800e535893370c7f9abe05477 100644 |
| --- a/LayoutTests/editing/spelling/spellcheck-disable-enable.html |
| +++ b/LayoutTests/editing/spelling/spellcheck-disable-enable.html |
| @@ -3,52 +3,62 @@ |
| <head> |
| <script src="../../resources/js-test.js"></script> |
| </head> |
| -<body onload="test(document.getElementById('destination'), document.getElementById('frame').contentWindow.document);"> |
| -<pre id="console"></pre> |
| +<body onload="test(document.getElementById('destination'), document.getElementById('frame').contentDocument.body);"> |
| <div id="container"> |
| - <div id="destination" contentEditable></div> |
| - <iframe id="frame" src="data:text/html,<body contenteditable></body>"></iframe> |
| + <div id="destination" contentEditable>zz.</div> |
| + <iframe id="frame" src="data:text/html,<body contenteditable>zz.</body>"></iframe> |
| </div> |
| <script> |
| -description("Spell check markers should be removed from the whole page when disabling spell checker but " + |
| -"they should be restored in the focused editable if spell checker gets enabled. " + |
| -"To test manually type something with mispellings in the above editable element and iframe and turn " + |
| -"spell checker off - misspelling markers should disappear. Having the editable focused " + |
| -"turn spell checker on again. Misspellings in the editable should be marked again."); |
| +description("Spell check markers should be removed from the whole page when disabling spell checker " |
| + + "but they should be restored in the focused editable if spell checker gets enabled. " |
| + + "To test manually, turn spell checker off - misspelling markers should disappear. " |
| + + "Having the editable focused, turn spell checker on. Misspellings in the editable should be marked."); |
| jsTestIsAsync = true; |
| -var destination_elm = null; |
| -var destination_elm_in_frame = null; |
| +function hasSpellingMarkerOnSetting(element, enableSpellChecking) { |
| + internals.setContinuousSpellCheckingEnabled(enableSpellChecking); |
| + return internals.markerCountForNode(element.firstChild, "spelling") ? true : false; |
|
tony
2013/11/13 17:30:34
Nit: return !!internals.markerCountForNode(element
grzegorz
2013/11/14 08:44:22
Thanks. Done.
|
| +} |
| + |
| +var editableDiv = null; |
| +var editableBodyInFrame = null; |
| + |
| +function test(div, frameBody) { |
| -function test(destination, frame_doc) |
| -{ |
| - if (!window.internals) |
| - { |
| - document.getElementById("console").innerHTML = "Automatic testing impossible. Test manually.\n"; |
| + if (!window.internals) { |
| + debug("Automatic testing impossible. Test manually."); |
| return; |
| } |
| - internals.settings.setAsynchronousSpellCheckingEnabled(false); |
| + internals.settings.setAsynchronousSpellCheckingEnabled(true); |
| internals.settings.setUnifiedTextCheckerEnabled(true); |
| - destination_elm = destination; |
| - destination_elm_in_frame = frame_doc.body; |
| - destination_elm.focus(); |
| - document.execCommand("InsertText", false, "zz."); |
| - shouldBe('internals.markerCountForNode(destination_elm.childNodes[0], "spelling")', '1'); |
| - destination_elm_in_frame.focus(); |
| - frame_doc.execCommand("InsertText", false, "zz."); |
| - shouldBe('internals.markerCountForNode(destination_elm_in_frame.childNodes[0], "spelling")', '1'); |
| - internals.setContinuousSpellCheckingEnabled(false); |
| - shouldBe('internals.markerCountForNode(destination_elm.childNodes[0], "spelling")', '0'); |
| - shouldBe('internals.markerCountForNode(destination_elm_in_frame.childNodes[0], "spelling")', '0'); |
| - destination_elm.focus(); |
| - internals.setContinuousSpellCheckingEnabled(true); |
| - shouldBe('internals.markerCountForNode(destination_elm.childNodes[0], "spelling")', '1'); |
| - |
| - finishJSTest(); |
| + editableDiv = div; |
| + editableBodyInFrame = frameBody; |
| + |
| + // Trigger spellchecking on editable fields. |
| + editableDiv.focus(); |
| + editableBodyInFrame.focus(); |
| + // Without blur, this element doesn't have misspelling. However, Chrome doesn't need it. |
| + editableBodyInFrame.blur(); |
| + |
| + shouldBecomeEqual('hasSpellingMarkerOnSetting(editableDiv, true)', 'true', function() { |
| + shouldBecomeEqual('hasSpellingMarkerOnSetting(editableBodyInFrame, true)', 'true', function() { |
| + // Turn off spellchecking, all misspellings should disappear. |
| + shouldBecomeEqual('hasSpellingMarkerOnSetting(editableDiv, false)', 'false', function() { |
| + shouldBecomeEqual('hasSpellingMarkerOnSetting(editableBodyInFrame, false)', 'false', function() { |
| + // Focus element and turn on spellchecking. |
| + // Only misspellings of the focused element should be restored. |
| + editableDiv.focus(); |
| + shouldBecomeEqual('hasSpellingMarkerOnSetting(editableDiv, true)', 'true', function() { |
| + shouldBecomeEqual('hasSpellingMarkerOnSetting(editableBodyInFrame, true)', 'false', finishJSTest); |
| + }); |
| + }); |
| + }); |
| + }); |
| + }); |
| } |
| </script> |
