From fc3780ec312ae4f846656c8451fa40068b8a77e6 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Wed, 20 Oct 2021 15:03:20 +0200 Subject: [PATCH] test(@angular-devkit/build-angular): update tests to match critters 0.0.11 output --- .../src/app-shell/app-shell_spec.ts | 2 +- .../tests/options/inline-critical_spec.ts | 10 +++---- .../build-inline-critical-css_spec.ts | 2 +- .../index-file/inline-critical-css_spec.ts | 26 +++++++------------ 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/packages/angular_devkit/build_angular/src/app-shell/app-shell_spec.ts b/packages/angular_devkit/build_angular/src/app-shell/app-shell_spec.ts index 975c87d6dbfb..9cb4ba83c76c 100644 --- a/packages/angular_devkit/build_angular/src/app-shell/app-shell_spec.ts +++ b/packages/angular_devkit/build_angular/src/app-shell/app-shell_spec.ts @@ -294,7 +294,7 @@ describe('AppShell Builder', () => { const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName))); expect(content).toContain('app-shell works!'); - expect(content).toContain('p{color:#000;}'); + expect(content).toContain('p{color:#000}'); expect(content).toMatch( //, ); diff --git a/packages/angular_devkit/build_angular/src/browser/tests/options/inline-critical_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/options/inline-critical_spec.ts index 99eaade9d0a8..a8c86d84c9a8 100644 --- a/packages/angular_devkit/build_angular/src/browser/tests/options/inline-critical_spec.ts +++ b/packages/angular_devkit/build_angular/src/browser/tests/options/inline-critical_spec.ts @@ -37,7 +37,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => { .content.toContain( ``, ); - harness.expectFile('dist/index.html').content.toContain(`body{color:#000;}`); + harness.expectFile('dist/index.html').content.toContain(`body{color:#000}`); }); it(`should extract critical css when 'optimization' is unset`, async () => { @@ -55,7 +55,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => { .content.toContain( ``, ); - harness.expectFile('dist/index.html').content.toContain(`body{color:#000;}`); + harness.expectFile('dist/index.html').content.toContain(`body{color:#000}`); }); it(`should extract critical css when 'optimization' is true`, async () => { @@ -73,7 +73,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => { .content.toContain( ``, ); - harness.expectFile('dist/index.html').content.toContain(`body{color:#000;}`); + harness.expectFile('dist/index.html').content.toContain(`body{color:#000}`); }); it(`should not extract critical css when 'optimization' is false`, async () => { @@ -131,7 +131,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => { .content.toContain( ``, ); - harness.expectFile('dist/index.html').content.toContain(`body{color:#000;}`); + harness.expectFile('dist/index.html').content.toContain(`body{color:#000}`); }); it(`should extract critical css when using '@media all {}' and 'minify' is set to true`, async () => { @@ -157,7 +157,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => { .content.toContain( ``, ); - harness.expectFile('dist/index.html').content.toContain(`body{color:#000;}`); + harness.expectFile('dist/index.html').content.toContain(`body{color:#000}`); }); }); }); diff --git a/packages/angular_devkit/build_angular/src/dev-server/tests/behavior/build-inline-critical-css_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/tests/behavior/build-inline-critical-css_spec.ts index 99f4fcdf366f..206bce6c590a 100644 --- a/packages/angular_devkit/build_angular/src/dev-server/tests/behavior/build-inline-critical-css_spec.ts +++ b/packages/angular_devkit/build_angular/src/dev-server/tests/behavior/build-inline-critical-css_spec.ts @@ -44,7 +44,7 @@ describeBuilder(serveWebpackBrowser, DEV_SERVER_BUILDER_INFO, (harness) => { const { result, response } = await executeOnceAndFetch(harness, '/'); expect(result?.success).toBeTrue(); - expect(await response?.text()).toContain('body{color:#000;}'); + expect(await response?.text()).toContain('body{color:#000}'); }); }); }); diff --git a/packages/angular_devkit/build_angular/src/utils/index-file/inline-critical-css_spec.ts b/packages/angular_devkit/build_angular/src/utils/index-file/inline-critical-css_spec.ts index 9b96cf2fd3ac..1af80e8dc847 100644 --- a/packages/angular_devkit/build_angular/src/utils/index-file/inline-critical-css_spec.ts +++ b/packages/angular_devkit/build_angular/src/utils/index-file/inline-critical-css_spec.ts @@ -58,14 +58,10 @@ describe('InlineCriticalCssProcessor', () => { ); expect(content).not.toContain('color: blue'); expect(tags.stripIndents`${content}`).toContain(tags.stripIndents` - - `); + `); }); it('should inline critical css when using deployUrl', async () => { @@ -85,14 +81,10 @@ describe('InlineCriticalCssProcessor', () => { ``, ); expect(tags.stripIndents`${content}`).toContain(tags.stripIndents` - - `); + `); }); it('should compress inline critical css when minify is enabled', async () => { @@ -111,6 +103,6 @@ describe('InlineCriticalCssProcessor', () => { expect(content).toContain( ``, ); - expect(content).toContain(''); + expect(content).toContain(''); }); });