Skip to content

Commit

Permalink
Adjust tests for new ember-cli
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanpenner committed Aug 19, 2021
1 parent e40d2d2 commit 6e8adae
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions packages/compat/tests/addon-styles.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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`);
});
});
6 changes: 3 additions & 3 deletions packages/compat/tests/stage2.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand Down

0 comments on commit 6e8adae

Please sign in to comment.