iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(test): StyleCompiler tests failing in Android browsers 

Closes #4351
This commit is contained in:
Marc Laval 2015-09-24 14:34:40 +02:00
parent 5f640c79bb
commit 9c9769047d
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/angular2/test/compiler/style_compiler_spec.ts
View File

@ -120,7 +120,7 @@ export function main() {
it('should compile plain css rules', inject([AsyncTestCompleter], (async) => { it('should compile plain css rules', inject([AsyncTestCompleter], (async) => {
compile(['div {\ncolor: red;\n}', 'span {\ncolor: blue;\n}'], [], encapsulation) compile(['div {\ncolor: red;\n}', 'span {\ncolor: blue;\n}'], [], encapsulation)
.then(styles => { .then(styles => {
expect(styles).toEqual([ compareStyles(styles, [
'div[_ngcontent-23] {\ncolor: red;\n}', 'div[_ngcontent-23] {\ncolor: red;\n}',
'span[_ngcontent-23] {\ncolor: blue;\n}' 'span[_ngcontent-23] {\ncolor: blue;\n}'
]); ]);
@ -131,7 +131,7 @@ export function main() {
it('should allow to import rules', inject([AsyncTestCompleter], (async) => { it('should allow to import rules', inject([AsyncTestCompleter], (async) => {
compile(['div {\ncolor: red;\n}'], [IMPORT_ABS_MODULE_NAME], encapsulation) compile(['div {\ncolor: red;\n}'], [IMPORT_ABS_MODULE_NAME], encapsulation)
.then(styles => { .then(styles => {
expect(styles).toEqual([ compareStyles(styles, [
'div[_ngcontent-23] {\ncolor: red;\n}', 'div[_ngcontent-23] {\ncolor: red;\n}',
'span[_ngcontent-23] {\ncolor: blue;\n}' 'span[_ngcontent-23] {\ncolor: blue;\n}'
]); ]);
@ -142,7 +142,7 @@ export function main() {
it('should allow to import rules transitively', inject([AsyncTestCompleter], (async) => { it('should allow to import rules transitively', inject([AsyncTestCompleter], (async) => {
compile(['div {\ncolor: red;\n}'], [IMPORT_ABS_MODULE_NAME_WITH_IMPORT], encapsulation) compile(['div {\ncolor: red;\n}'], [IMPORT_ABS_MODULE_NAME_WITH_IMPORT], encapsulation)
.then(styles => { .then(styles => {
expect(styles).toEqual([ compareStyles(styles, [
'div[_ngcontent-23] {\ncolor: red;\n}', 'div[_ngcontent-23] {\ncolor: red;\n}',
'a[_ngcontent-23] {\ncolor: green;\n}', 'a[_ngcontent-23] {\ncolor: green;\n}',
'span[_ngcontent-23] {\ncolor: blue;\n}' 'span[_ngcontent-23] {\ncolor: blue;\n}'
@ -230,7 +230,7 @@ export function main() {
expect(styles).toEqual(['div {color: red}', 'span {color: blue}']); expect(styles).toEqual(['div {color: red}', 'span {color: blue}']);
async.done(); async.done();
}); });
})); }), 1000);
}); });
describe('with shim', () => { describe('with shim', () => {
@ -239,7 +239,7 @@ export function main() {
it('should compile plain css ruless', inject([AsyncTestCompleter], (async) => { it('should compile plain css ruless', inject([AsyncTestCompleter], (async) => {
compile(['div {\ncolor: red;\n}', 'span {\ncolor: blue;\n}'], [], encapsulation) compile(['div {\ncolor: red;\n}', 'span {\ncolor: blue;\n}'], [], encapsulation)
.then(styles => { .then(styles => {
expect(styles).toEqual([ compareStyles(styles, [
'div[_ngcontent-23] {\ncolor: red;\n}', 'div[_ngcontent-23] {\ncolor: red;\n}',
'span[_ngcontent-23] {\ncolor: blue;\n}' 'span[_ngcontent-23] {\ncolor: blue;\n}'
]); ]);
@ -250,18 +250,18 @@ export function main() {
it('should allow to import rules', inject([AsyncTestCompleter], (async) => { it('should allow to import rules', inject([AsyncTestCompleter], (async) => {
compile(['div {color: red}'], [IMPORT_ABS_MODULE_NAME], encapsulation) compile(['div {color: red}'], [IMPORT_ABS_MODULE_NAME], encapsulation)
.then(styles => { .then(styles => {
expect(styles).toEqual([ compareStyles(styles, [
'div[_ngcontent-23] {\ncolor: red;\n}', 'div[_ngcontent-23] {\ncolor: red;\n}',
'span[_ngcontent-23] {\ncolor: blue;\n}' 'span[_ngcontent-23] {\ncolor: blue;\n}'
]); ]);
async.done(); async.done();
}); });
})); }), 1000);
}); });
}); });
describe('compileStylesheetCodeGen', () => { describe('compileStylesheetCodeGen', () => {
function compile(style: string): Promise<string[]> { function compile(style: string): Promise<string[][]> {
var sourceModules = compiler.compileStylesheetCodeGen(MODULE_NAME, style); var sourceModules = compiler.compileStylesheetCodeGen(MODULE_NAME, style);
return PromiseWrapper.all(sourceModules.map(sourceModule => { return PromiseWrapper.all(sourceModules.map(sourceModule => {
var sourceWithImports = testableModule(sourceModule).getSourceWithImports(); var sourceWithImports = testableModule(sourceModule).getSourceWithImports();
@ -272,9 +272,10 @@ export function main() {
it('should compile plain css rules', inject([AsyncTestCompleter], (async) => { it('should compile plain css rules', inject([AsyncTestCompleter], (async) => {
compile('div {color: red;}') compile('div {color: red;}')
.then(stylesAndShimStyles => { .then(stylesAndShimStyles => {
expect(stylesAndShimStyles) var expected =
.toEqual( [['div {color: red;}'], ['div[_ngcontent-%COMP%] {\ncolor: red;\n}']];
[['div {color: red;}'], ['div[_ngcontent-%COMP%] {\ncolor: red;\n}']]); compareStyles(stylesAndShimStyles[0], expected[0]);
compareStyles(stylesAndShimStyles[1], expected[1]);
async.done(); async.done();
}); });
})); }));
@ -283,14 +284,15 @@ export function main() {
inject([AsyncTestCompleter], (async) => { inject([AsyncTestCompleter], (async) => {
compile(`div {color: red}@import ${IMPORT_REL_MODULE_NAME};`) compile(`div {color: red}@import ${IMPORT_REL_MODULE_NAME};`)
.then(stylesAndShimStyles => { .then(stylesAndShimStyles => {
expect(stylesAndShimStyles) var expected = [
.toEqual([
['div {color: red}', 'span {color: blue}'], ['div {color: red}', 'span {color: blue}'],
[ [
'div[_ngcontent-%COMP%] {\ncolor: red;\n}', 'div[_ngcontent-%COMP%] {\ncolor: red;\n}',
'span[_ngcontent-%COMP%] {\ncolor: blue;\n}' 'span[_ngcontent-%COMP%] {\ncolor: blue;\n}'
] ]
]); ];
compareStyles(stylesAndShimStyles[0], expected[0]);
compareStyles(stylesAndShimStyles[1], expected[1]);
async.done(); async.done();
}); });
})); }));