Skip to content

GitLab

T
tangled
Commit 7a4bea4f authored by Yoshifumi Inoue's avatar Yoshifumi Inoue Committed by Commit Bot
Browse files
Options

Utilize selection_test() in editing/pasteboard/merge-start-blockquote.html 

This patch changes "merge-start-blockquote.html" to utilize |selection_test()|
for ease of maintenance.

Bug: 679977, 707656
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_layout_ng
Change-Id: Ib8b5d63687c42e9ead5167a11f0a592e19297f84
Reviewed-on: https://chromium-review.googlesource.com/1069965Reviewed-by: default avatarXiaocheng Hu <xiaochengh@chromium.org>
Commit-Queue: Yoshifumi Inoue <yosin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561359}
parent 62b6928f
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 84 deletions
third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-features=LayoutNG
View file @ 7a4bea4f
......@@ -189,7 +189,6 @@ crbug.com/591099 editing/pasteboard/copy-paste-white-space.html [ Failure ]
crbug.com/591099 editing/pasteboard/drag-image-to-contenteditable-in-iframe.html [ Failure ]
crbug.com/591099 editing/pasteboard/drag-list-item.html [ Failure ]
crbug.com/591099 editing/pasteboard/dragstart-contains-default-content.html [ Failure ]
crbug.com/591099 editing/pasteboard/merge-start-blockquote.html [ Failure ]
crbug.com/591099 editing/pasteboard/merge-start-list.html [ Failure ]
crbug.com/591099 editing/pasteboard/paste-noscript.html [ Failure ]
crbug.com/591099 editing/selection/4402375.html [ Failure ]
......
third_party/WebKit/LayoutTests/editing/pasteboard/merge-start-blockquote.html
View file @ 7a4bea4f
<!doctype html>
<script src="../../resources/testharness.js"></script>
<script src="../../resources/testharnessreport.js"></script>
<script src="../assert_selection.js"></script>
<script>
if (window.testRunner)
testRunner.dumpEditingCallbacks();
</script>
<style>
blockquote {
border: 1px solid blue;
}
</style>
<p>This test makes sure that content inside a Mail blockquote in an incoming fragment isn't pulled out of the blockquote during paste.</p>
<p><b>You should see 'bar' inside a blockquote (it will have a blue border around it if it is).</b></p>
<div id="test" contenteditable="true"></div>
<script>
var s = window.getSelection();
var e = document.getElementById("test");
s.collapse(e, 0);
document.execCommand("InsertHTML", false , "<blockquote type='cite'>bar</blockquote>");
// This test makes sure that content inside a Mail blockquote in an incoming
// fragment isn't pulled out of the blockquote during paste.
selection_test(
'<div contenteditable>|</div>',
'insertHTML <blockquote type="cite">bar</blockquote>',
'<div contenteditable><blockquote type="cite">bar|</blockquote></div>',
'insert BLOCKQUOTE');
</script>
third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/merge-start-blockquote-expected.txt deleted 100644 → 0
View file @ 62b6928f
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 800x600
LayoutView at (0,0) size 800x600
layer at (0,0) size 800x600
LayoutBlockFlow {HTML} at (0,0) size 800x600
LayoutBlockFlow {BODY} at (8,8) size 784x576
LayoutBlockFlow {P} at (0,0) size 784x40
LayoutText {#text} at (0,0) size 776x39
text run at (0,0) width 776: "This test makes sure that content inside a Mail blockquote in an incoming fragment isn't pulled out of the blockquote during"
text run at (0,20) width 36: "paste."
LayoutBlockFlow {P} at (0,56) size 784x20
LayoutInline {B} at (0,0) size 564x19
LayoutText {#text} at (0,0) size 564x19
text run at (0,0) width 564: "You should see 'bar' inside a blockquote (it will have a blue border around it if it is)."
LayoutBlockFlow {DIV} at (0,92) size 784x22
LayoutBlockFlow {BLOCKQUOTE} at (40,0) size 704x22 [border: (1px solid #0000FF)]
LayoutText {#text} at (1,1) size 20x19
text run at (1,1) width 20: "bar"
caret: position 3 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 4 {DIV} of body
third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/merge-start-blockquote-expected.txt deleted 100644 → 0
View file @ 62b6928f
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 800x600
LayoutView at (0,0) size 800x600
layer at (0,0) size 800x600
LayoutBlockFlow {HTML} at (0,0) size 800x600
LayoutBlockFlow {BODY} at (8,8) size 784x576
LayoutBlockFlow {P} at (0,0) size 784x36
LayoutText {#text} at (0,0) size 749x36
text run at (0,0) width 749: "This test makes sure that content inside a Mail blockquote in an incoming fragment isn't pulled out of the blockquote"
text run at (0,18) width 83: "during paste."
LayoutBlockFlow {P} at (0,52) size 784x18
LayoutInline {B} at (0,0) size 573x18
LayoutText {#text} at (0,0) size 573x18
text run at (0,0) width 573: "You should see 'bar' inside a blockquote (it will have a blue border around it if it is)."
LayoutBlockFlow {DIV} at (0,86) size 784x20
LayoutBlockFlow {BLOCKQUOTE} at (40,0) size 704x20 [border: (1px solid #0000FF)]
LayoutText {#text} at (1,1) size 21x18
text run at (1,1) width 21: "bar"
caret: position 3 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 4 {DIV} of body
third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/merge-start-blockquote-expected.txt deleted 100644 → 0
View file @ 62b6928f
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 800x600
LayoutView at (0,0) size 800x600
layer at (0,0) size 800x600
LayoutBlockFlow {HTML} at (0,0) size 800x600
LayoutBlockFlow {BODY} at (8,8) size 784x576
LayoutBlockFlow {P} at (0,0) size 784x20
LayoutText {#text} at (0,0) size 774x19
text run at (0,0) width 774: "This test makes sure that content inside a Mail blockquote in an incoming fragment isn't pulled out of the blockquote during paste."
LayoutBlockFlow {P} at (0,36) size 784x20
LayoutInline {B} at (0,0) size 549x19
LayoutText {#text} at (0,0) size 549x19
text run at (0,0) width 549: "You should see 'bar' inside a blockquote (it will have a blue border around it if it is)."
LayoutBlockFlow {DIV} at (0,72) size 784x22
LayoutBlockFlow {BLOCKQUOTE} at (40,0) size 704x22 [border: (1px solid #0000FF)]
LayoutText {#text} at (1,1) size 20x19
text run at (1,1) width 20: "bar"
caret: position 3 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 4 {DIV} of body
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment