From 9c9769047d74c0f9a4e9cfcf8ab55ee9b318a4e7 Mon Sep 17 00:00:00 2001
From: Marc Laval <mlaval@amadeus.com>
Date: Thu, 24 Sep 2015 14:34:40 +0200
Subject: [PATCH] fix(test): StyleCompiler tests failing in Android browsers

Closes #4351
---
 .../test/compiler/style_compiler_spec.ts      | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

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