[BUGFIX] Fix setComponentTemplate in tests

glimmerjs · Apr 7, 2020 · c53b6e5 · c53b6e5
1 parent 7285b3d
commit c53b6e5
Show file tree

Hide file tree

Showing 9 changed files with 4,643 additions and 21,935 deletions.
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
     ]
   },
   "workspaces": [
-    "packages/*",
+    "packages/examples/*",
     "packages/@glimmerx/*"
   ],
   "devDependencies": {

diff --git a/packages/@glimmerx/core/tests/modifier-tests.ts b/packages/@glimmerx/core/tests/modifier-tests.ts
@@ -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')!;

diff --git a/packages/@glimmerx/core/tests/render-tests.ts b/packages/@glimmerx/core/tests/render-tests.ts
@@ -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');
@@ -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);
@@ -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);
@@ -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);
@@ -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: {
@@ -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: {
@@ -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, {
@@ -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');
@@ -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);

diff --git a/packages/@glimmerx/ssr/tests/render-options-tests.ts b/packages/@glimmerx/ssr/tests/render-options-tests.ts
@@ -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);
 

diff --git a/packages/examples/basic-addon/package.json b/packages/examples/basic-addon/package.json
@@ -63,5 +63,9 @@
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"
+  },
+  "volta": {
+    "node": "12.10.0",
+    "yarn": "1.22.4"
   }
 }