pkg/polymer/test/build/import_inliner_test.dart - Issue 575503002: When inlining imports from head, put them inside a hidden div

Unified Diff: pkg/polymer/test/build/import_inliner_test.dart

Issue 575503002: When inlining imports from head, put them inside a hidden div (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: pkg/polymer/test/build/import_inliner_test.dart

diff --git a/pkg/polymer/test/build/import_inliner_test.dart b/pkg/polymer/test/build/import_inliner_test.dart

index 13b4cdf71617d1604c7cd8d28b7b93aba0213b7b..5ff7b338d36baed1531a7233f44247f5436e979a 100644

--- a/pkg/polymer/test/build/import_inliner_test.dart

+++ b/pkg/polymer/test/build/import_inliner_test.dart

@@ -84,7 +84,9 @@ void importTests() {

'a|web/test.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>2</polymer-element>'

+ '</div>'

'</body></html>',

'a|web/test.html._data': EMPTY_DATA,

'a|web/test2.html':

@@ -110,11 +112,13 @@ void importTests() {

'a|web/test.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<script type="text/javascript">/*first*/</script>'

'<script src="second.js"></script>'

'<script>/*third*/</script>'

'<polymer-element>2</polymer-element>'

'<script>/*forth*/</script>'

+ '</div>'

'</body></html>',

'a|web/test.html._data': EMPTY_DATA,

'a|web/test2.html':

@@ -142,18 +146,24 @@ void importTests() {

'a|web/test.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<script type="text/javascript">/*first*/</script>'

'<script src="second.js"></script>'

'<script>/*third*/</script>'

'<polymer-element>2</polymer-element>'

+ '</div>'

'</body></html>',

'a|web/test.html._data': expectedData([

'web/test.html.1.dart','web/test.html.0.dart']),

'a|web/test.html.1.dart': 'library a.web.test2_html_0;\n/*forth*/',

'a|web/test.html.0.dart': 'library a.web.test_html_0;\n/*fifth*/',

'a|web/test2.html':

- '<!DOCTYPE html><html><head></head><body><script>/*third*/</script>'

- '<polymer-element>2</polymer-element></body></html>',

+ '<!DOCTYPE html><html><head></head><body>'

+ '<div hidden="">'

+ '<script>/*third*/</script>'

+ '</div>'

+ '<polymer-element>2</polymer-element>'

+ '</body></html>',

'a|web/test2.html._data': expectedData(['web/test2.html.0.dart']),

'a|web/test2.html.0.dart': 'library a.web.test2_html_0;\n/*forth*/',

'a|web/second.js': '/*second*/'

@@ -179,10 +189,12 @@ void importTests() {

'a|web/test.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<script type="text/javascript" src="test.html.0.js"></script>'

'<script src="second.js"></script>'

'<script src="test.html.2.js"></script>'

'<polymer-element>2</polymer-element>'

+ '</div>'

'</body></html>',

'a|web/test.html._data': expectedData([

'web/test.html.3.dart','web/test.html.1.dart']),

@@ -192,7 +204,9 @@ void importTests() {

'a|web/test.html.2.js': '/*third*/',

'a|web/test2.html':

'<!DOCTYPE html><html><head></head><body>'

+ '<div hidden="">'

'<script src="test2.html.0.js"></script>'

+ '</div>'

'<polymer-element>2</polymer-element></body></html>',

'a|web/test2.html._data': expectedData(['web/test2.html.1.dart']),

'a|web/test2.html.0.js': '/*third*/',

@@ -271,8 +285,10 @@ void importTests() {

'a|web/test.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>2</polymer-element>'

'<polymer-element>3</polymer-element>'

+ '</div>'

'</body></html>',

'a|web/test2.html':

'<!DOCTYPE html><html><head>'

@@ -302,15 +318,21 @@ void importTests() {

'a|web/test.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>4</polymer-element>'

'<polymer-element>3</polymer-element>'

- '<polymer-element>2</polymer-element></body></html>',

+ '<polymer-element>2</polymer-element>'

+ '</div>'

+ '</body></html>',

'a|web/test2.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>4</polymer-element>'

'<polymer-element>3</polymer-element>'

- '<polymer-element>2</polymer-element></body></html>',

+ '</div>'

+ '<polymer-element>2</polymer-element>'

+ '</body></html>',

'b|asset/test3.html':

'<!DOCTYPE html><html><head>'

'<link rel="import" href="../../packages/c/test4.html">'

@@ -352,25 +374,31 @@ void importTests() {

'a|web/test.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>3a</polymer-element>'

'<polymer-element>3b</polymer-element>'

'<polymer-element>2a</polymer-element>'

'<polymer-element>4a</polymer-element>'

'<polymer-element>4b</polymer-element>'

'<polymer-element>2b</polymer-element>'

+ '</div>'

'</body></html>',

'a|web/test2a.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>3a</polymer-element>'

'<polymer-element>3b</polymer-element>'

+ '</div>'

'<polymer-element>2a</polymer-element>'

'</body></html>',

'a|web/test2b.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>4a</polymer-element>'

'<polymer-element>4b</polymer-element>'

+ '</div>'

'<polymer-element>2b</polymer-element>'

'</body></html>',

'a|web/test3a.html':

@@ -412,17 +440,24 @@ void importTests() {

'a|web/test.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>2</polymer-element>'

- '<polymer-element>1</polymer-element></body></html>',

+ '<polymer-element>1</polymer-element>'

+ '</div>'

+ '</body></html>',

'a|web/test_1.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>2</polymer-element>'

+ '</div>'

'<polymer-element>1</polymer-element></body></html>',

'a|web/test_2.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>1</polymer-element>'

+ '</div>'

'<polymer-element>2</polymer-element></body></html>',

});

@@ -445,24 +480,31 @@ void importTests() {

'a|web/test.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>2</polymer-element>'

'<script src="s2"></script>'

'<polymer-element>1</polymer-element>'

- '<script src="s1"></script></body></html>',

+ '<script src="s1"></script>'

+ '</div>'

+ '</body></html>',

'a|web/test.html._data': EMPTY_DATA,

'a|web/test_1.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>2</polymer-element>'

'<script src="s2"></script>'

+ '</div>'

'<polymer-element>1</polymer-element>'

'<script src="s1"></script></body></html>',

'a|web/test_1.html._data': EMPTY_DATA,

'a|web/test_2.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>1</polymer-element>'

'<script src="s1"></script>'

+ '</div>'

'<polymer-element>2</polymer-element>'

'<script src="s2"></script></body></html>',

'a|web/test_2.html._data': EMPTY_DATA,

@@ -492,21 +534,27 @@ void importTests() {

'a|web/test.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>2</polymer-element>'

'<polymer-element>1</polymer-element>'

+ '</div>'

'</body></html>',

'a|web/test.html._data': expectedData(['web/s2.dart', 'web/s1.dart']),

'a|web/test_1.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>2</polymer-element>'

+ '</div>'

'<polymer-element>1</polymer-element>'

'</body></html>',

'a|web/test_1.html._data': expectedData(['web/s2.dart', 'web/s1.dart']),

'a|web/test_2.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>1</polymer-element>'

+ '</div>'

'<polymer-element>2'

'</polymer-element>'

'</body></html>',

@@ -533,11 +581,14 @@ void importTests() {

'a|web/test.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<foo>42</foo><bar-baz></bar-baz>'

'<polymer-element>1'

'<script src="s1.js"></script>'

'</polymer-element>'

- 'FOO</body></html>',

+ 'FOO'

+ '</div>'

+ '</body></html>',

'a|web/test.html._data': expectedData(['web/s1.dart']),

'a|web/test_1.html':

'<!DOCTYPE html><html><head>'

@@ -571,26 +622,35 @@ void importTests() {

'a|web/test.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>3</polymer-element>'

'<polymer-element>2</polymer-element>'

- '<polymer-element>1</polymer-element></body></html>',

+ '<polymer-element>1</polymer-element>'

+ '</div>'

+ '</body></html>',

'a|web/test_1.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>3</polymer-element>'

'<polymer-element>2</polymer-element>'

+ '</div>'

'<polymer-element>1</polymer-element></body></html>',

'a|web/test_2.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>1</polymer-element>'

'<polymer-element>3</polymer-element>'

+ '</div>'

'<polymer-element>2</polymer-element></body></html>',

'a|web/test_3.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>2</polymer-element>'

'<polymer-element>1</polymer-element>'

+ '</div>'

'<polymer-element>3</polymer-element></body></html>',

});

@@ -607,7 +667,10 @@ void importTests() {

'a|web/test.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

- '<polymer-element>1</polymer-element></body></html>',

+ '<div hidden="">'

+ '<polymer-element>1</polymer-element>'

+ '</div>'

+ '</body></html>',

'a|web/test_1.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

@@ -635,18 +698,25 @@ void importTests() {

'a|web/test.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>3</polymer-element>'

'<polymer-element>1</polymer-element>'

- '<polymer-element>2</polymer-element></body></html>',

+ '<polymer-element>2</polymer-element>'

+ '</div>'

+ '</body></html>',

'a|web/test_1.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>3</polymer-element>'

+ '</div>'

'<polymer-element>1</polymer-element></body></html>',

'a|web/test_2.html':

'<!DOCTYPE html><html><head>'

'</head><body>'

+ '<div hidden="">'

'<polymer-element>3</polymer-element>'

+ '</div>'

'<polymer-element>2</polymer-element></body></html>',

'a|web/test_3.html':

'<!DOCTYPE html><html><head>'

@@ -664,7 +734,9 @@ void importTests() {

}, {

'a|web/test.html':

'<!DOCTYPE html><html><head></head><body>'

+ '<div hidden="">'

'<link rel="stylesheet" href="foo.css">'

+ '</div>'

'</body></html>',

}, [

'warning: Failed to inline stylesheet: '

@@ -765,7 +837,9 @@ void stylesheetTests() {

}, {

'a|web/test.html':

'<!DOCTYPE html><html><head></head><body>'

+ '<div hidden="">'

'<style>h1 { font-size: 70px; }</style>'

+ '</div>'

'</body></html>',

'a|web/test.html._data': EMPTY_DATA,

'a|web/test2.css':

@@ -789,12 +863,14 @@ void stylesheetTests() {

}, {

'a|web/test.html':

'<!DOCTYPE html><html><head></head><body>'

+ '<div hidden="">'

'<polymer-element>2'

'<style>'

'body {\n background: #eaeaea url(assets/b/test4.png);\n}\n'

'.foo {\n background: url(packages/c/test5.png);\n}'

'</style>'

'</polymer-element>'

+ '</div>'

'</body></html>',

'a|web/test2.html':

'<html><head></head><body>'

@@ -830,20 +906,26 @@ void stylesheetTests() {

}, {

'a|web/test.html':

'<!DOCTYPE html><html><head></head><body>'

+ '<div hidden="">'

'<img src="foo/bar/qux.png">'

'<polymer-element>2'

'<style>'

'body {\n background: #eaeaea url(foo/test4.png);\n}\n'

'.foo {\n background: url(foo/test5.png);\n}'

- '</style></polymer-element></body></html>',

+ '</style></polymer-element>'

+ '</div>'

+ '</body></html>',

'a|web/foo/test2.html':

'<html><head></head><body>'

+ '<div hidden="">' // NOTE: Parser injects the first import into head.

Siggi Cherem (dart-lang) 2014/09/15 18:04:32 I'm not sure I follow, what did you mean with this

jakemac 2014/09/15 18:34:03 In the original file, there was no <head> tag so y

Siggi Cherem (dart-lang) 2014/09/15 19:18:16 Ah, OK, maybe rephrase a bit ('injects' sounds lik

jakemac 2014/09/15 20:47:34 Added some comments to the definition On 2014/09/

'<img src="bar/qux.png">'

+ '</div>'

'<polymer-element>2'

'<style>'

'body {\n background: #eaeaea url(test4.png);\n}\n'

'.foo {\n background: url(test5.png);\n}'

- '</style></polymer-element></body></html>',

+ '</style></polymer-element>'

+ '</body></html>',

'a|web/foo/bar/test3.html':

'<img src="qux.png">',

'a|web/foo/test.css':

@@ -863,9 +945,11 @@ void stylesheetTests() {

}, {

'a|web/test.html':

'<!DOCTYPE html><html><head></head><body>'

+ '<div hidden="">'

'<style>.first { color: black }</style>'

'<style>h1 { font-size: 70px; }</style>'

'<style>.second { color: black }</style>'

+ '</div>'

'</body></html>',

'a|web/test.html._data': EMPTY_DATA,

'a|web/test2.css':

@@ -885,8 +969,10 @@ void stylesheetTests() {

}, {

'a|web/test.html':

'<!DOCTYPE html><html><head></head><body>'

+ '<div hidden="">'

'<style no-shim="">h1 { font-size: 70px; }</style>'

'<style shim-shadow="" foo="">h2 { font-size: 35px; }</style>'

+ '</div>'

'</body></html>',

'a|web/foo.css':

'h1 { font-size: 70px; }',

@@ -961,8 +1047,10 @@ void urlAttributeTests() {

}, {

'a|web/test.html':

'<!DOCTYPE html><html><head></head><body>'

+ '<div hidden="">'

'<script src="foo/baz.jpg"></script>' // normalized

'<foo-element src="baz.jpg"></foo-element>' // left alone (custom)

+ '</div>'

'</body></html>',

'a|web/foo/test_1.html':

'<script src="baz.jpg"></script>',

@@ -981,8 +1069,10 @@ void urlAttributeTests() {

}, {

'a|web/test.html':

'<!DOCTYPE html><html><head></head><body>'

+ '<div hidden="">'

'<img src="{{bar}}">'

'<img src="[[bar]]">'

+ '</div>'

'</body></html>',

'a|web/foo/test.html':

'<img src="{{bar}}">'

@@ -1000,8 +1090,10 @@ void urlAttributeTests() {

}, {

'a|web/test.html':

'<!DOCTYPE html><html><head></head><body>'

+ '<div hidden="">'

'<img src="foo/baz/{{bar}}">'

'<img src="foo/{{bar}}">'

+ '</div>'

'</body></html>',

});

@@ -1016,8 +1108,10 @@ void urlAttributeTests() {

}, {

'a|web/test.html':

'<!DOCTYPE html><html><head></head><body>'

+ '<div hidden="">'

'<img _src="foo/{{bar}}">'

'<a _href="foo/{{bar}}">test</a>'

+ '</div>'

'</body></html>',

});

@@ -1081,7 +1175,9 @@ void entryPointTests() {

}, {

'a|web/test/test.html':

'<!DOCTYPE html><html><head></head><body>'

+ '<div hidden="">'

'<script rel="import" href="../packages/b/bar/bar.js"></script>'

+ '</div>'

'</body></html>',

});

@@ -1095,7 +1191,9 @@ void entryPointTests() {

}, {

'a|web/test/test.html':

'<!DOCTYPE html><html><head></head><body>'

+ '<div hidden="">'

'<script src="../packages/a/foo/bar.js"></script>'

+ '</div>'

'</body></html>',

});

@@ -1111,7 +1209,9 @@ void entryPointTests() {

}, {

'a|web/test/well/test.html':

'<!DOCTYPE html><html><head></head><body>'

+ '<div hidden="">'

'<script rel="import" href="../../packages/b/bar/bar.js"></script>'

+ '</div>'

'</body></html>',

});

}

« no previous file with comments | « pkg/polymer/test/build/all_phases_test.dart ('k') | pkg/polymer/test/build/linter_test.dart » ('j') | no next file with comments »