Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split up editing/run/* with variant #11436

Merged
merged 2 commits into from
Aug 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions editing/include/tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -5607,7 +5607,7 @@ function runConformanceTest(browserTest) {
format_value(browserTest[1][i][1]) + ") " +
(browserTest[1][i][2] ? browserTest[1][i][2] + " " : "") +
"return value"
test(function() {
subsetTest(test, function() {
assert_equals(exception, null, "Setup must not throw an exception");

assert_equals(document.execCommand(browserTest[1][i][0], false, browserTest[1][i][1]),
Expand Down Expand Up @@ -5640,7 +5640,7 @@ function runConformanceTest(browserTest) {
}
}

test(function() {
subsetTest(test, function() {
assert_equals(exception, null, "Setup must not throw an exception");

// Now test for modifications to non-editable content. First just
Expand All @@ -5664,7 +5664,7 @@ function runConformanceTest(browserTest) {
"Everything outside the editable div must be unchanged, but some change did occur");
}, testName + " checks for modifications to non-editable content");

test(function() {
subsetTest(test, function() {
assert_equals(exception, null, "Setup must not throw an exception");

assert_equals(testDiv.innerHTML,
Expand All @@ -5682,7 +5682,7 @@ function runConformanceTest(browserTest) {
'queryCommandValue("' + command + '") after',
];
for (var i = 0; i < 6; i++) {
test(function() {
subsetTest(test, function() {
assert_equals(exception, null, "Setup must not throw an exception");

if (expectedQueryResults[command][i] === null) {
Expand Down
1 change: 1 addition & 0 deletions editing/run/backcolor.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<script src=../data/backcolor.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
5 changes: 5 additions & 0 deletions editing/run/bold.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<!doctype html>
<meta charset=utf-8>
<meta name="variant" content="?1-1000">
<meta name="variant" content="?1001-2000">
<meta name="variant" content="?2001-3000">
<meta name="variant" content="?3001-last">
<link rel=stylesheet href=../include/reset.css>
<title>bold - HTML editing conformance tests</title>

Expand All @@ -15,6 +19,7 @@
<script src=../data/bold.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
1 change: 1 addition & 0 deletions editing/run/createlink.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<script src=../data/createlink.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
1 change: 1 addition & 0 deletions editing/run/delete-list-items-in-table-cell.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<script src=../data/delete-list-items-in-table-cells.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
8 changes: 8 additions & 0 deletions editing/run/delete.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
<!doctype html>
<meta charset=utf-8>
<meta name="variant" content="?1-1000">
<meta name="variant" content="?1001-2000">
<meta name="variant" content="?2001-3000">
<meta name="variant" content="?3001-4000">
<meta name="variant" content="?4001-5000">
<meta name="variant" content="?5001-6000">
<meta name="variant" content="?6001-last">
<link rel=stylesheet href=../include/reset.css>
<title>delete - HTML editing conformance tests</title>

Expand All @@ -15,6 +22,7 @@
<script src=../data/delete.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
4 changes: 4 additions & 0 deletions editing/run/fontname.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<!doctype html>
<meta charset=utf-8>
<meta name="variant" content="?1-1000">
<meta name="variant" content="?1001-2000">
<meta name="variant" content="?2001-last">
<link rel=stylesheet href=../include/reset.css>
<title>fontname - HTML editing conformance tests</title>

Expand All @@ -15,6 +18,7 @@
<script src=../data/fontname.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
4 changes: 4 additions & 0 deletions editing/run/fontsize.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<!doctype html>
<meta charset=utf-8>
<meta name="variant" content="?1-1000">
<meta name="variant" content="?1001-2000">
<meta name="variant" content="?2001-last">
<link rel=stylesheet href=../include/reset.css>
<title>fontsize - HTML editing conformance tests</title>

Expand All @@ -15,6 +18,7 @@
<script src=../data/fontsize.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
4 changes: 4 additions & 0 deletions editing/run/forecolor.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<!doctype html>
<meta charset=utf-8>
<meta name="variant" content="?1-1000">
<meta name="variant" content="?1001-2000">
<meta name="variant" content="?2001-last">
<link rel=stylesheet href=../include/reset.css>
<title>forecolor - HTML editing conformance tests</title>

Expand All @@ -15,6 +18,7 @@
<script src=../data/forecolor.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
6 changes: 6 additions & 0 deletions editing/run/formatblock.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<!doctype html>
<meta charset=utf-8>
<meta name="variant" content="?1-1000">
<meta name="variant" content="?1001-2000">
<meta name="variant" content="?2001-3000">
<meta name="variant" content="?3001-4000">
<meta name="variant" content="?4001-last">
<link rel=stylesheet href=../include/reset.css>
<title>formatblock - HTML editing conformance tests</title>

Expand All @@ -15,6 +20,7 @@
<script src=../data/formatblock.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
8 changes: 8 additions & 0 deletions editing/run/forwarddelete.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
<!doctype html>
<meta charset=utf-8>
<meta name="variant" content="?1-1000">
<meta name="variant" content="?1001-2000">
<meta name="variant" content="?2001-3000">
<meta name="variant" content="?3001-4000">
<meta name="variant" content="?4001-5000">
<meta name="variant" content="?5001-6000">
<meta name="variant" content="?6001-last">
<link rel=stylesheet href=../include/reset.css>
<title>forwarddelete - HTML editing conformance tests</title>

Expand All @@ -15,6 +22,7 @@
<script src=../data/forwarddelete.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
1 change: 1 addition & 0 deletions editing/run/hilitecolor.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<script src=../data/hilitecolor.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
1 change: 1 addition & 0 deletions editing/run/indent.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<script src=../data/indent.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
1 change: 1 addition & 0 deletions editing/run/insert-list-items-in-table-cell.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<script src=../data/insert-list-items-in-table-cells.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
1 change: 1 addition & 0 deletions editing/run/inserthorizontalrule.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<script src=../data/inserthorizontalrule.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
1 change: 1 addition & 0 deletions editing/run/inserthtml.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<script src=../data/inserthtml.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
1 change: 1 addition & 0 deletions editing/run/insertimage.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<script src=../data/insertimage.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
1 change: 1 addition & 0 deletions editing/run/insertlinebreak.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<script src=../data/insertlinebreak.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
1 change: 1 addition & 0 deletions editing/run/insertorderedlist.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<script src=../data/insertorderedlist.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
8 changes: 8 additions & 0 deletions editing/run/insertparagraph.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
<!doctype html>
<meta charset=utf-8>
<meta name="variant" content="?1-1000">
<meta name="variant" content="?1001-2000">
<meta name="variant" content="?2001-3000">
<meta name="variant" content="?3001-4000">
<meta name="variant" content="?4001-5000">
<meta name="variant" content="?5001-6000">
<meta name="variant" content="?6001-last">
<link rel=stylesheet href=../include/reset.css>
<title>insertparagraph - HTML editing conformance tests</title>

Expand All @@ -15,6 +22,7 @@
<script src=../data/insertparagraph.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
4 changes: 4 additions & 0 deletions editing/run/inserttext.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<!doctype html>
<meta charset=utf-8>
<meta name="variant" content="?1-1000">
<meta name="variant" content="?1001-2000">
<meta name="variant" content="?2001-last">
<link rel=stylesheet href=../include/reset.css>
<title>inserttext - HTML editing conformance tests</title>

Expand All @@ -15,6 +18,7 @@
<script src=../data/inserttext.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
1 change: 1 addition & 0 deletions editing/run/insertunorderedlist.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<script src=../data/insertunorderedlist.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
4 changes: 4 additions & 0 deletions editing/run/italic.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<!doctype html>
<meta charset=utf-8>
<meta name="variant" content="?1-1000">
<meta name="variant" content="?1001-2000">
<meta name="variant" content="?2001-last">
<link rel=stylesheet href=../include/reset.css>
<title>italic - HTML editing conformance tests</title>

Expand All @@ -15,6 +18,7 @@
<script src=../data/italic.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
8 changes: 8 additions & 0 deletions editing/run/justifycenter.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
<!doctype html>
<meta charset=utf-8>
<meta name=timeout content=long>
<meta name="variant" content="?1-1000">
<meta name="variant" content="?1001-2000">
<meta name="variant" content="?2001-3000">
<meta name="variant" content="?3001-4000">
<meta name="variant" content="?4001-5000">
<meta name="variant" content="?5001-6000">
<meta name="variant" content="?6001-last">
<link rel=stylesheet href=../include/reset.css>
<title>justifycenter - HTML editing conformance tests</title>

Expand All @@ -16,6 +23,7 @@
<script src=../data/justifycenter.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
6 changes: 6 additions & 0 deletions editing/run/justifyfull.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<!doctype html>
<meta charset=utf-8>
<meta name="variant" content="?1-1000">
<meta name="variant" content="?1001-2000">
<meta name="variant" content="?2001-3000">
<meta name="variant" content="?3001-4000">
<meta name="variant" content="?4001-last">
<link rel=stylesheet href=../include/reset.css>
<title>justifyfull - HTML editing conformance tests</title>

Expand All @@ -15,6 +20,7 @@
<script src=../data/justifyfull.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
4 changes: 4 additions & 0 deletions editing/run/justifyleft.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<!doctype html>
<meta charset=utf-8>
<meta name="variant" content="?1-1000">
<meta name="variant" content="?1001-2000">
<meta name="variant" content="?2001-last">
<link rel=stylesheet href=../include/reset.css>
<title>justifyleft - HTML editing conformance tests</title>

Expand All @@ -15,6 +18,7 @@
<script src=../data/justifyleft.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
6 changes: 6 additions & 0 deletions editing/run/justifyright.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<!doctype html>
<meta charset=utf-8>
<meta name="variant" content="?1-1000">
<meta name="variant" content="?1001-2000">
<meta name="variant" content="?2001-3000">
<meta name="variant" content="?3001-4000">
<meta name="variant" content="?4001-last">
<link rel=stylesheet href=../include/reset.css>
<title>justifyright - HTML editing conformance tests</title>

Expand All @@ -15,6 +20,7 @@
<script src=../data/justifyright.js></script>
<script src=/resources/testharness.js></script>
<script src=/resources/testharnessreport.js></script>
<script src="/common/subset-tests.js"></script>
<script>
"use strict";

Expand Down
Loading