Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUGFIX] Fix setComponentTemplate in tests #57

Merged
merged 1 commit into from
Apr 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
]
},
"workspaces": [
"packages/*",
"packages/examples/*",
"packages/@glimmerx/*"
],
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/@glimmerx/core/tests/modifier-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ module('Modifier Tests', () => {
}

setComponentTemplate(
MyComponent,
compileTemplate(
`<button {{on "click" this.incrementCounter}}>Count: {{this.count}}</button>`,
() => ({ on })
)
),
MyComponent
);

const element = document.getElementById('qunit-fixture')!;
Expand Down
38 changes: 19 additions & 19 deletions packages/@glimmerx/core/tests/render-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default function renderTests(
test('it renders a component', async assert => {
class MyComponent extends Component {}

setComponentTemplate(MyComponent, compileTemplate(`<h1>Hello world</h1>`));
setComponentTemplate(compileTemplate(`<h1>Hello world</h1>`), MyComponent);

const html = await render(MyComponent);
assert.strictEqual(html, '<h1>Hello world</h1>', 'the template was rendered');
Expand All @@ -32,12 +32,12 @@ export default function renderTests(
test('a component can render a nested component', async assert => {
class OtherComponent extends Component {}

setComponentTemplate(OtherComponent, compileTemplate(`Hello world`));
setComponentTemplate(compileTemplate(`Hello world`), OtherComponent);

class MyComponent extends Component {}
setComponentTemplate(
MyComponent,
compileTemplate(`<h1><OtherComponent /></h1>`, () => ({ OtherComponent }))
compileTemplate(`<h1><OtherComponent /></h1>`, () => ({ OtherComponent })),
MyComponent
);

const html = await render(MyComponent);
Expand All @@ -47,21 +47,21 @@ export default function renderTests(

test('a component can render multiple nested components', async assert => {
class Foo extends Component {}
setComponentTemplate(Foo, compileTemplate(`Foo`));
setComponentTemplate(compileTemplate(`Foo`), Foo);

class Bar extends Component {}
setComponentTemplate(Bar, compileTemplate(`Bar`));
setComponentTemplate(compileTemplate(`Bar`), Bar);

class OtherComponent extends Component {}
setComponentTemplate(
OtherComponent,
compileTemplate(`Hello world <Foo /><Bar />`, () => ({ Foo, Bar }))
compileTemplate(`Hello world <Foo /><Bar />`, () => ({ Foo, Bar })),
OtherComponent
);

class MyComponent extends Component {}
setComponentTemplate(
MyComponent,
compileTemplate(`<h1><OtherComponent /></h1>`, () => ({ OtherComponent }))
compileTemplate(`<h1><OtherComponent /></h1>`, () => ({ OtherComponent })),
MyComponent
);

const html = await render(MyComponent);
Expand All @@ -76,8 +76,8 @@ export default function renderTests(

class MyComponent extends Component {}
setComponentTemplate(
MyComponent,
compileTemplate('<h1>{{myHelper "foo" greeting="Hello"}}</h1>', () => ({ myHelper }))
compileTemplate('<h1>{{myHelper "foo" greeting="Hello"}}</h1>', () => ({ myHelper })),
MyComponent
);

const html = await render(MyComponent);
Expand All @@ -87,7 +87,7 @@ export default function renderTests(
test('a component can render with args', async assert => {
class MyComponent extends Component {}

setComponentTemplate(MyComponent, compileTemplate('<h1>{{@say}}</h1>'));
setComponentTemplate(compileTemplate('<h1>{{@say}}</h1>'), MyComponent);

const renderOptions = {
args: {
Expand Down Expand Up @@ -117,7 +117,7 @@ export default function renderTests(
}
}

setComponentTemplate(MyComponent, compileTemplate('<h1>{{this.myLocale}}</h1>'));
setComponentTemplate(compileTemplate('<h1>{{this.myLocale}}</h1>'), MyComponent);

const html = await render(MyComponent, {
services: {
Expand All @@ -141,8 +141,8 @@ export default function renderTests(

class MyComponent extends Component {}
setComponentTemplate(
MyComponent,
compileTemplate('<h1>{{myHelper}}</h1>', () => ({ myHelper }))
compileTemplate('<h1>{{myHelper}}</h1>', () => ({ myHelper })),
MyComponent
);

const html = await render(MyComponent, {
Expand All @@ -156,7 +156,7 @@ export default function renderTests(
test('a component can be rendered more than once', async assert => {
class MyComponent extends Component {}

setComponentTemplate(MyComponent, compileTemplate(`<h1>Bump</h1>`));
setComponentTemplate(compileTemplate(`<h1>Bump</h1>`), MyComponent);

let html = await render(MyComponent);
assert.strictEqual(html, '<h1>Bump</h1>', 'the component rendered');
Expand All @@ -178,11 +178,11 @@ export default function renderTests(
}

setComponentTemplate(
MyComponent,
compileTemplate(
`<button {{on "click" this.incrementCounter}}>Count: {{this.count}}</button>`,
() => ({ on })
)
),
MyComponent
);

const html = await render(MyComponent);
Expand Down
2 changes: 1 addition & 1 deletion packages/@glimmerx/ssr/tests/render-options-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ QUnit.module('@glimmer/ssr rendering', () => {

const options: RenderOptions = { serializer: new CustomHTMLSerializer(voidMap) };

setComponentTemplate(MyComponent, compileTemplate(`<h1>Hello World</h1>`));
setComponentTemplate(compileTemplate(`<h1>Hello World</h1>`), MyComponent);

const output = await renderToString(MyComponent, options);

Expand Down
4 changes: 4 additions & 0 deletions packages/examples/basic-addon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,9 @@
},
"ember-addon": {
"configPath": "tests/dummy/config"
},
"volta": {
"node": "12.10.0",
"yarn": "1.22.4"
}
}
Loading