Skip to content

GitLab

T
tangled
Commit 4c93deee authored by Philip Jägenstedt's avatar Philip Jägenstedt Committed by Commit Bot
Browse files
Options

Move web-platform-tests/html-imports/ into Blink's LayoutTests 

As discussed on dom-dev:
https://groups.google.com/a/chromium.org/d/msg/dom-dev/qfHM4fKckwk/nELu4mvaAwAJ

There was already a hello.html + hello-parent.html in LayoutTests, so
these are kept and already-in-import-map.html was tweaked slightly to
use those instead.

There was also an existing hello.css, which was different, but the
test (import-attribute.html) doesn't depend on it.

Change-Id: Ib97451ff33bae16a75a2c7c703a8bac270910e38
Reviewed-on: https://chromium-review.googlesource.com/1133161Reviewed-by: default avatarHayato Ito <hayato@chromium.org>
Reviewed-by: default avatarTakayoshi Kochi <kochi@chromium.org>
Commit-Queue: Philip Jägenstedt <foolip@chromium.org>
Cr-Commit-Position: refs/heads/master@{#575207}
parent 75ee73da
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 16 deletions
third_party/WebKit/LayoutTests/external/wpt/html-imports/OWNERS deleted 100644 → 0
View file @ 75ee73da
# TEAM: dom-dev@chromium.org
# COMPONENT: Blink>HTML>Modules
third_party/WebKit/LayoutTests/external/wpt/html-imports/fetching/already-in-import-map.html → third_party/WebKit/LayoutTests/http/tests/htmlimports/already-in-import-map.html
View file @ 4c93deee
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<link id="first" rel="import" href="resources/hello.html"> <link id="first" rel="import" href="resources/hello.html">
<link id="shouldBeInImportMap" rel="import" href="resources/hello.html"> <link id="shouldBeInImportMap" rel="import" href="resources/hello.html">
<link id="parentOfFirst" rel="import" href="resources/parent-of-hello.html"> <link id="parentOfFirst" rel="import" href="resources/hello-parent.html">
</head> </head>
<body> <body>
...@@ -19,7 +19,7 @@ test(function() { ...@@ -19,7 +19,7 @@ test(function() {
}, 'If LOCATION is already in the import map, let IMPORT be the imported document for LOCATION and stop. (1)'); }, 'If LOCATION is already in the import map, let IMPORT be the imported document for LOCATION and stop. (1)');
test(function() { test(function() {
assert_true(window.first.import === window.parentOfFirst.import.getElementById('child').import); assert_true(window.first.import === window.parentOfFirst.import.getElementById('original').import);
}, 'If LOCATION is already in the import map, let IMPORT be the imported document for LOCATION and stop. (2)'); }, 'If LOCATION is already in the import map, let IMPORT be the imported document for LOCATION and stop. (2)');
</script> </script>
</body> </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