Skip to content
This repository was archived by the owner on Feb 22, 2018. It is now read-only.

Commit 16e8e14

Browse files
Ted Sanderrkirov
authored andcommitted
<fix>(transformers): Fix template_cache_generator_spec
Add template_cache_generator_spec to the test suite in that directory, and fix the included tests.
1 parent f9406a4 commit 16e8e14

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

test/tools/transformer/all.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ import 'expression_generator_spec.dart' as expression_generator_spec;
44
import 'metadata_generator_spec.dart' as metadata_generator_spec;
55
import 'static_angular_generator_spec.dart' as static_angular_generator_spec;
66
import 'type_relative_uri_generator_spec.dart' as type_relative_uri_generator_spec;
7+
import 'template_cache_generator_spec.dart' as template_cache_generator_spec;
78

89
main() {
910
expression_generator_spec.main();
1011
metadata_generator_spec.main();
1112
static_angular_generator_spec.main();
1213
type_relative_uri_generator_spec.main();
14+
template_cache_generator_spec.main();
1315
}

test/tools/transformer/template_cache_generator_spec.dart

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ main() {
1414
describe('TemplateCacheGenerator', () {
1515
var htmlContent1 = "<div></div>";
1616
var htmlContent2 = "<span></span>";
17+
var cssContent1 = '#id {color: red}';
18+
var cssContent2 = '#id2 {color: blue}';
1719

1820
it('should cache templateURL', () {
1921
return generates(setupPhases(),
@@ -33,19 +35,17 @@ main() {
3335
@Component(templateUrl: "test2.html")
3436
class B {}
3537
''',
36-
'a|test1.html': htmlContent1,
37-
'a|test2.html': htmlContent2,
38+
'a|web/test1.html': htmlContent1,
39+
'a|web/dir/test2.html': htmlContent2,
3840
'angular|lib/angular.dart': libAngular,
3941
},
4042
cacheContent: {
4143
'test1.html': htmlContent1,
42-
'test2.html': htmlContent2,
44+
'dir/test2.html': htmlContent2,
4345
});
4446
});
4547

4648
it('should cache cssURLs', () {
47-
var cssContent1 = '#id {color: red}';
48-
var cssContent2 = '#id2 {color: blue}';
4949
return generates(setupPhases(),
5050
inputs: {
5151
'a|web/main.dart': '''
@@ -63,13 +63,13 @@ main() {
6363
@Component(cssUrl: ["test2.css"])
6464
class B {}
6565
''',
66-
'a|test1.css': cssContent1,
67-
'a|test2.css': cssContent2,
66+
'a|web/test1.css': cssContent1,
67+
'a|web/dir/test2.css': cssContent2,
6868
'angular|lib/angular.dart': libAngular,
6969
},
7070
cacheContent: {
7171
'test1.css': cssContent1,
72-
'test2.css': cssContent2,
72+
'dir/test2.css': cssContent2,
7373
});
7474
});
7575

@@ -93,8 +93,8 @@ main() {
9393
9494
main() {}
9595
''',
96-
'a|multiline1.html': multiLineContent1,
97-
'a|multiline2.css': multiLineContent2,
96+
'a|web/multiline1.html': multiLineContent1,
97+
'a|web/multiline2.css': multiLineContent2,
9898
'angular|lib/angular.dart': libAngular,
9999
},
100100
cacheContent: {
@@ -123,14 +123,14 @@ main() {
123123
@NgTemplateCache(preCacheUrls: ["test2.html"])
124124
class B {}
125125
''',
126-
'a|test1.html': htmlContent1,
127-
'a|test2.html': htmlContent2,
126+
'a|web/test1.html': htmlContent1,
127+
'a|web/dir/test2.html': htmlContent2,
128128
'angular|lib/angular.dart': libAngular,
129129
'angular|lib/angular_cache.dart': libCacheAnnotation,
130130
},
131131
cacheContent: {
132132
'test1.html': htmlContent1,
133-
'test2.html': htmlContent2,
133+
'dir/test2.html': htmlContent2,
134134
});
135135
});
136136

@@ -181,8 +181,8 @@ main() {
181181
@NgTemplateCache(preCacheUrls: ["test2.html"])
182182
class B {}
183183
''',
184-
'angular|lib/angular.dart': libAngular,
185-
'angular|lib/template_cache.dart': libCacheAnnotation,
184+
'angular|lib/angular.dart': libAngular,
185+
'angular|lib/template_cache.dart': libCacheAnnotation,
186186
});
187187
});
188188
});

0 commit comments

Comments
 (0)