Improve tests

Author: NullVoxPopuli

packages/@glimmer-workspace/integration-tests/test/keywords/eq-runtime-test.ts

@@ -21,7 +21,17 @@ class KeywordEqRuntime extends RenderTest {
   }
 
   @test
-  'implicit scope'() {
+  'explicit scope (shadowed)'() {
+    const compiled = template('{{if (eq a b) "yes" "no"}}', {
+      strictMode: true,
+      scope: () => ({ eq: () => false, a: 1, b: 1 }),
+    });
+    this.renderComponent(compiled);
+    this.assertHTML('no');
+  }
+
+  @test
+  'implicit scope (eval)'() {
     let a = 1;
     let b = 1;
     hide(a);

packages/@glimmer-workspace/integration-tests/test/keywords/eq-test.ts

@@ -2,18 +2,64 @@ import { DEBUG } from '@glimmer/env';
 import { jitSuite, RenderTest, test } from '@glimmer-workspace/integration-tests';
 
 import { template } from '@ember/template-compiler';
-import { eq } from '@ember/helper';
 
 class KeywordEq extends RenderTest {
   static suiteName = 'keyword helper: eq';
 
+  @test
+  'explicit scope'() {
+    let a = 1;
+    let b = 1;
+
+    const compiled = template('{{eq a b}}', {
+      strictMode: true,
+      scope: () => ({ a, b }),
+    });
+
+    this.renderComponent(compiled);
+    this.assertHTML('true');
+  }
+
+  @test
+  'explicit scope (shadowed)'() {
+    let a = 1;
+    let b = 2;
+    let eq = () => 'surprise';
+    const compiled = template('{{eq a b}}', {
+      strictMode: true,
+      scope: () => ({ eq, a, b }),
+    });
+
+    this.renderComponent(compiled);
+    this.assertHTML('surprise');
+  }
+
+  @test
+  'implicit scope (eval)'() {
+    let a = 1;
+    let b = 1;
+
+    hide(a);
+    hide(b);
+
+    const compiled = template('{{if (eq a b) "yes" "no"}}', {
+      strictMode: true,
+      eval() {
+        return eval(arguments[0]);
+      },
+    });
+
+    this.renderComponent(compiled);
+    this.assertHTML('yes');
+  }
+
   @test
   'returns true for equal numbers'() {
     let a = 1;
     let b = 1;
     const compiled = template('{{if (eq a b) "yes" "no"}}', {
       strictMode: true,
-      scope: () => ({ eq, a, b }),
+      scope: () => ({ a, b }),
     });
     this.renderComponent(compiled);
     this.assertHTML('yes');
@@ -25,7 +71,7 @@ class KeywordEq extends RenderTest {
     let b = 2;
     const compiled = template('{{if (eq a b) "yes" "no"}}', {
       strictMode: true,
-      scope: () => ({ eq, a, b }),
+      scope: () => ({ a, b }),
     });
     this.renderComponent(compiled);
     this.assertHTML('no');
@@ -37,7 +83,7 @@ class KeywordEq extends RenderTest {
     let b = 'hello';
     const compiled = template('{{if (eq a b) "yes" "no"}}', {
       strictMode: true,
-      scope: () => ({ eq, a, b }),
+      scope: () => ({ a, b }),
     });
     this.renderComponent(compiled);
     this.assertHTML('yes');
@@ -48,7 +94,7 @@ class KeywordEq extends RenderTest {
     let a = 1;
     const compiled = template('{{eq a}}', {
       strictMode: true,
-      scope: () => ({ eq, a }),
+      scope: () => ({ a }),
     });
 
     assert.throws(() => {
@@ -58,3 +104,7 @@ class KeywordEq extends RenderTest {
 }
 
 jitSuite(KeywordEq);
+
+const hide = (variable: unknown) => {
+  new Function(`return (${JSON.stringify(variable)});`);
+};

packages/@glimmer-workspace/integration-tests/test/keywords/neq-runtime-test.ts

@@ -21,7 +21,17 @@ class KeywordNeqRuntime extends RenderTest {
   }
 
   @test
-  'implicit scope'() {
+  'explicit scope (shadowed)'() {
+    const compiled = template('{{if (neq a b) "yes" "no"}}', {
+      strictMode: true,
+      scope: () => ({ neq: () => false, a: 1, b: 2 }),
+    });
+    this.renderComponent(compiled);
+    this.assertHTML('no');
+  }
+
+  @test
+  'implicit scope (eval)'() {
     let a = 1;
     let b = 2;
     hide(a);

packages/@glimmer-workspace/integration-tests/test/keywords/neq-test.ts

@@ -2,18 +2,64 @@ import { DEBUG } from '@glimmer/env';
 import { jitSuite, RenderTest, test } from '@glimmer-workspace/integration-tests';
 
 import { template } from '@ember/template-compiler';
-import { neq } from '@ember/helper';
 
 class KeywordNeq extends RenderTest {
   static suiteName = 'keyword helper: neq';
 
+  @test
+  'explicit scope'() {
+    let a = 1;
+    let b = 2;
+
+    const compiled = template('{{neq a b}}', {
+      strictMode: true,
+      scope: () => ({ a, b }),
+    });
+
+    this.renderComponent(compiled);
+    this.assertHTML('true');
+  }
+
+  @test
+  'explicit scope (shadowed)'() {
+    let a = 1;
+    let b = 1;
+    let neq = () => 'surprise';
+    const compiled = template('{{neq a b}}', {
+      strictMode: true,
+      scope: () => ({ neq, a, b }),
+    });
+
+    this.renderComponent(compiled);
+    this.assertHTML('surprise');
+  }
+
+  @test
+  'implicit scope (eval)'() {
+    let a = 1;
+    let b = 2;
+
+    hide(a);
+    hide(b);
+
+    const compiled = template('{{if (neq a b) "yes" "no"}}', {
+      strictMode: true,
+      eval() {
+        return eval(arguments[0]);
+      },
+    });
+
+    this.renderComponent(compiled);
+    this.assertHTML('yes');
+  }
+
   @test
   'returns true for unequal numbers'() {
     let a = 1;
     let b = 2;
     const compiled = template('{{if (neq a b) "yes" "no"}}', {
       strictMode: true,
-      scope: () => ({ neq, a, b }),
+      scope: () => ({ a, b }),
     });
     this.renderComponent(compiled);
     this.assertHTML('yes');
@@ -25,7 +71,7 @@ class KeywordNeq extends RenderTest {
     let b = 1;
     const compiled = template('{{if (neq a b) "yes" "no"}}', {
       strictMode: true,
-      scope: () => ({ neq, a, b }),
+      scope: () => ({ a, b }),
     });
     this.renderComponent(compiled);
     this.assertHTML('no');
@@ -36,7 +82,7 @@ class KeywordNeq extends RenderTest {
     let a = 1;
     const compiled = template('{{neq a}}', {
       strictMode: true,
-      scope: () => ({ neq, a }),
+      scope: () => ({ a }),
     });
 
     assert.throws(() => {
@@ -46,3 +92,7 @@ class KeywordNeq extends RenderTest {
 }
 
 jitSuite(KeywordNeq);
+
+const hide = (variable: unknown) => {
+  new Function(`return (${JSON.stringify(variable)});`);
+};