From 6e8adae43ff8c5ec09c1dde4502005f2198232ef Mon Sep 17 00:00:00 2001 From: Stefan Penner Date: Thu, 19 Aug 2021 09:20:48 -0600 Subject: [PATCH] Adjust tests for new ember-cli --- packages/compat/tests/addon-styles.test.ts | 12 ++++++------ packages/compat/tests/stage2.test.ts | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/compat/tests/addon-styles.test.ts b/packages/compat/tests/addon-styles.test.ts index 387b540816..7421eca271 100644 --- a/packages/compat/tests/addon-styles.test.ts +++ b/packages/compat/tests/addon-styles.test.ts @@ -95,11 +95,11 @@ describe('addon.styles tests', function () { test(`all addon CSS gets convert to implicit-styles`, function () { let implicitStyles = expectFile('node_modules/my-addon3/package.json').json().get('ember-addon.implicit-styles'); - implicitStyles.includes('./my-addon3.css'); - implicitStyles.includes('./outer.css'); - implicitStyles.includes('./nested/inner.css'); - expectFile('node_modules/my-addon3/my-addon3.css').matches(`from-addon`); - expectFile('node_modules/my-addon3/outer.css').matches(`from-outer`); - expectFile('node_modules/my-addon3/nested/inner.css').matches(`from-inner`); + implicitStyles.includes("./my-addon3/__COMPILED_STYLES__/my-addon3.css"); + implicitStyles.includes("./my-addon3/__COMPILED_STYLES__/nested/inner.css"); + implicitStyles.includes("./my-addon3/__COMPILED_STYLES__/outer.css"); + expectFile('node_modules/my-addon3/__COMPILED_STYLES__/my-addon3.css').matches(`from-addon`); + expectFile('node_modules/my-addon3/__COMPILED_STYLES__/outer.css').matches(`from-outer`); + expectFile('node_modules/my-addon3/__COMPILED_STYLES__/nested/inner.css').matches(`from-inner`); }); }); diff --git a/packages/compat/tests/stage2.test.ts b/packages/compat/tests/stage2.test.ts index 8c209b4e5a..22636f3ffc 100644 --- a/packages/compat/tests/stage2.test.ts +++ b/packages/compat/tests/stage2.test.ts @@ -718,9 +718,9 @@ describe('stage2 build', function () { test('lazy engine css is imported', function () { expectFile('assets/_engine_/lazy-engine.js') - .matches(` if (macroCondition(!getGlobalConfig().fastboot?.isRunning)) { -i(\"../../node_modules/lazy-engine/lazy-engine.css\"); - }`); + .matches(` if (macroCondition(!getGlobalConfig().fastboot?.isRunning)) { +i(\"../../node_modules/lazy-engine/lazy-engine/__COMPILED_STYLES__/lazy-engine.css\");` + ); }); test('eager engine css is merged with vendor.css', function () {