Merge pull request #1258 from glimmerjs/cleanup/remove-property-fallb…

…ack-usage-in-tests
glimmerjs · Jan 29, 2021 · 8224439 · 8224439
2 parents 36f6887 + dff9d99
commit 8224439
Show file tree

Hide file tree

Showing 30 changed files with 531 additions and 457 deletions.
diff --git a/packages/@glimmer/integration-tests/lib/render-test.ts b/packages/@glimmer/integration-tests/lib/render-test.ts
@@ -307,9 +307,9 @@ export class RenderTest implements IRenderTest {
 
     let invocation: string | string[] = [];
     if (template) {
-      invocation.push('{{#component componentName');
+      invocation.push('{{#component this.componentName');
     } else {
-      invocation.push('{{component componentName');
+      invocation.push('{{component this.componentName');
     }
 
     let componentArgs = this.buildArgs(args);

diff --git a/packages/@glimmer/integration-tests/lib/suites/components.ts b/packages/@glimmer/integration-tests/lib/suites/components.ts
@@ -19,7 +19,7 @@ export class TemplateOnlyComponents extends RenderTest {
         name: 'MyComponent',
         layout: '{{yield}} - {{@color}}',
         template: 'hello!',
-        args: { color: 'color' },
+        args: { color: 'this.color' },
       },
       { color: 'red' }
     );
@@ -45,8 +45,8 @@ export class TemplateOnlyComponents extends RenderTest {
         name: 'MyComponent',
         layout: '<div><span ...attributes>{{yield}} - {{@color}}</span></div>',
         template: 'hello!',
-        args: { color: 'color' },
-        attributes: { color: '{{color}}' },
+        args: { color: 'this.color' },
+        attributes: { color: '{{this.color}}' },
       },
       { color: 'red' }
     );
@@ -223,7 +223,7 @@ export class GlimmerishComponents extends RenderTest {
     this.registerComponent(
       'Glimmer',
       'Foo',
-      '<div ...attributes>[{{localProperty}} {{@staticNamedArg}} {{@dynamicNamedArg}}]</div>',
+      '<div ...attributes>[{{this.localProperty}} {{@staticNamedArg}} {{@dynamicNamedArg}}]</div>',
       Foo
     );
 
@@ -232,7 +232,7 @@ export class GlimmerishComponents extends RenderTest {
         layout: stripTight`<@foo @staticNamedArg="static" data-test1={{@outerArg}} data-test2="static" @dynamicNamedArg={{@outerArg}} />`,
         args: {
           foo: 'component "Foo"',
-          outerArg: 'outer',
+          outerArg: 'this.outer',
         },
       },
       { outer: 'outer' }
@@ -345,11 +345,11 @@ export class GlimmerishComponents extends RenderTest {
     this.registerComponent(
       'Glimmer',
       'Foo',
-      '<div ...attributes>[{{localProperty}} {{@staticNamedArg}} {{@dynamicNamedArg}}] - {{yield}}</div>',
+      '<div ...attributes>[{{this.localProperty}} {{@staticNamedArg}} {{@dynamicNamedArg}}] - {{yield}}</div>',
       Foo
     );
     this.render(
-      `{{#with (component 'Foo') as |Other|}}<Other @staticNamedArg="static" data-test1={{outer}} data-test2="static" @dynamicNamedArg={{outer}}>template</Other>{{/with}}`,
+      `{{#with (component 'Foo') as |Other|}}<Other @staticNamedArg="static" data-test1={{this.outer}} data-test2="static" @dynamicNamedArg={{this.outer}}>template</Other>{{/with}}`,
       { outer: 'outer' }
     );
 
@@ -519,10 +519,12 @@ export class GlimmerishComponents extends RenderTest {
     this.registerComponent(
       'Glimmer',
       'Foo',
-      '<div ...attributes>[{{localProperty}} {{@staticNamedArg}} {{@dynamicNamedArg}}] - {{yield}}</div>',
+      '<div ...attributes>[{{this.localProperty}} {{@staticNamedArg}} {{@dynamicNamedArg}}] - {{yield}}</div>',
       Foo
     );
-    this.render('<TestHarness @outer={{outer}} @Foo={{component "Foo"}} />', { outer: 'outer' });
+    this.render('<TestHarness @outer={{this.outer}} @Foo={{component "Foo"}} />', {
+      outer: 'outer',
+    });
 
     this.assertHTML(
       `<div data-test1="outer" data-test2="static">[local static outer] - template</div>`
@@ -625,7 +627,7 @@ export class GlimmerishComponents extends RenderTest {
     this.registerComponent(
       'Glimmer',
       'Main',
-      '<div><HelloWorld @name={{salutation}} /></div>',
+      '<div><HelloWorld @name={{this.salutation}} /></div>',
       MainComponent
     );
     this.registerComponent('Glimmer', 'HelloWorld', '<h1>Hello {{@name}}!</h1>');
@@ -666,7 +668,7 @@ export class GlimmerishComponents extends RenderTest {
     );
     this.registerComponent('Glimmer', 'HelloWorld', '{{yield (component "A" a=@a)}}');
     this.registerComponent('Glimmer', 'A', 'A {{@a}}');
-    this.render('<Main @a={{a}} />', { a: 'a' });
+    this.render('<Main @a={{this.a}} />', { a: 'a' });
     this.assertHTML('<div>A a</div>');
     this.assertStableRerender();
     this.rerender({ a: 'A' });
@@ -682,7 +684,7 @@ export class GlimmerishComponents extends RenderTest {
       'A {{#component "B" arg1=@one arg2=@two arg3=@three}}{{/component}}'
     );
     this.registerComponent('Glimmer', 'B', 'B {{@arg1}} {{@arg2}} {{@arg3}}');
-    this.render('<A @one={{first}} @two={{second}} @three={{third}} />', {
+    this.render('<A @one={{this.first}} @two={{this.second}} @three={{this.third}} />', {
       first: 1,
       second: 2,
       third: 3,
@@ -698,7 +700,7 @@ export class GlimmerishComponents extends RenderTest {
   'Static inline component helper'() {
     this.registerComponent('Glimmer', 'A', 'A {{component "B" arg1=@one arg2=@two arg3=@three}}');
     this.registerComponent('Glimmer', 'B', 'B {{@arg1}} {{@arg2}} {{@arg3}}');
-    this.render('<A @one={{first}} @two={{second}} @three={{third}} />', {
+    this.render('<A @one={{this.first}} @two={{this.second}} @three={{this.third}} />', {
       first: 1,
       second: 2,
       third: 3,
@@ -719,7 +721,7 @@ export class GlimmerishComponents extends RenderTest {
 
     this.render(
       strip`
-    {{#each components key="id" as |c|}}
+    {{#each this.components key="id" as |c|}}
       {{#in-element c.mount}}
         {{component c.name childName=c.child data=c.data}}
       {{/in-element}}
@@ -755,7 +757,7 @@ export class GlimmerishComponents extends RenderTest {
     this.registerComponent(
       'Glimmer',
       'RecursiveInvoker',
-      '{{id}}{{#if showChildren}}<RecursiveInvoker />{{/if}}',
+      '{{this.id}}{{#if this.showChildren}}<RecursiveInvoker />{{/if}}',
       RecursiveInvoker
     );
 
@@ -777,7 +779,7 @@ export class GlimmerishComponents extends RenderTest {
       }
     );
 
-    this.render('{{#if showing}}<Foo/>{{/if}}', {
+    this.render('{{#if this.showing}}<Foo/>{{/if}}', {
       showing: false,
     });
 
@@ -805,9 +807,12 @@ export class GlimmerishComponents extends RenderTest {
       }
     );
 
-    this.render('{{#if showing}}<div class="first"></div><div class="second"></div><Foo/>{{/if}}', {
-      showing: false,
-    });
+    this.render(
+      '{{#if this.showing}}<div class="first"></div><div class="second"></div><Foo/>{{/if}}',
+      {
+        showing: false,
+      }
+    );
 
     this.assert.throws(() => {
       this.rerender({ showing: true });
@@ -838,7 +843,7 @@ export class GlimmerishComponents extends RenderTest {
 
     this.registerComponent('TemplateOnly', 'Bar', '<div class="second"></div><Foo/>');
 
-    this.render('{{#if showing}}<div class="first"></div><Bar/>{{/if}}', {
+    this.render('{{#if this.showing}}<div class="first"></div><Bar/>{{/if}}', {
       showing: false,
     });
 
@@ -885,7 +890,7 @@ export class GlimmerishComponents extends RenderTest {
 
       this.registerComponent('TemplateOnly', 'Bar', '<div class="second"></div><Foo/>');
 
-      this.render('{{#if showing}}<div class="first"></div><Bar/>{{/if}}', {
+      this.render('{{#if this.showing}}<div class="first"></div><Bar/>{{/if}}', {
         showing: false,
       });
 

diff --git a/packages/@glimmer/integration-tests/lib/suites/custom-dom-helper.ts b/packages/@glimmer/integration-tests/lib/suites/custom-dom-helper.ts
@@ -48,7 +48,7 @@ export class SerializedDOMHelperTests extends DOMHelperTests {
 
   @test
   'The compiler can handle unescaped HTML'() {
-    this.render('<div>{{{title}}}</div>', { title: '<strong>hello</strong>' });
+    this.render('<div>{{{this.title}}}</div>', { title: '<strong>hello</strong>' });
     let b = blockStack();
     this.assertHTML(strip`
       <div>

diff --git a/packages/@glimmer/integration-tests/lib/suites/debugger.ts b/packages/@glimmer/integration-tests/lib/suites/debugger.ts
@@ -25,7 +25,10 @@ export class DebuggerSuite extends RenderTest {
       this.assert.equal(get('foo'), expectedContext.foo);
     });
 
-    this.render('{{#if a.b}}true{{debugger}}{{else}}false{{debugger}}{{/if}}', expectedContext);
+    this.render(
+      '{{#if this.a.b}}true{{debugger}}{{else}}false{{debugger}}{{/if}}',
+      expectedContext
+    );
     this.assert.equal(callbackExecuted, 1);
     this.assertHTML('true');
     this.assertStableRerender();
@@ -71,7 +74,7 @@ export class DebuggerSuite extends RenderTest {
     });
 
     this.render(
-      '{{#with foo as |bar|}}{{#if a.b}}true{{debugger}}{{else}}false{{debugger}}{{/if}}{{/with}}',
+      '{{#with this.foo as |bar|}}{{#if this.a.b}}true{{debugger}}{{else}}false{{debugger}}{{/if}}{{/with}}',
       expectedContext
     );
     this.assert.equal(callbackExecuted, 1);