From c7abd252d5f9ca0d46f88771898760f642b16f36 Mon Sep 17 00:00:00 2001
From: Material Web Team <material-web-copybara@google.com>
Date: Fri, 19 Aug 2022 10:22:27 -0700
Subject: [PATCH] refactor(field): move tests closer to the code they test.

PiperOrigin-RevId: 468730710
---
 field/{test => lib}/field_test.ts          | 37 ++++++++------------
 field/{test => lib}/filled-field_test.ts   | 38 ++++++++-------------
 field/{test => lib}/outlined-field_test.ts | 39 ++++++++--------------
 3 files changed, 42 insertions(+), 72 deletions(-)
 rename field/{test => lib}/field_test.ts (93%)
 rename field/{test => lib}/filled-field_test.ts (83%)
 rename field/{test => lib}/outlined-field_test.ts (67%)

diff --git a/field/test/field_test.ts b/field/lib/field_test.ts
similarity index 93%
rename from field/test/field_test.ts
rename to field/lib/field_test.ts
index 1a05a969d2..d5071bed50 100644
--- a/field/test/field_test.ts
+++ b/field/lib/field_test.ts
@@ -7,7 +7,6 @@
 import 'jasmine';
 
 import {Environment} from '@material/web/testing/environment';
-import {State, TemplateBuilder, TemplateProps} from '@material/web/testing/templates';
 import {html} from 'lit';
 import {customElement} from 'lit/decorators';
 
@@ -59,29 +58,21 @@ class TestField extends Field {
 describe('Field', () => {
   const env = new Environment();
 
-  const templates =
-      new TemplateBuilder().withHarness(FieldHarness).withVariants({
-        field(directive, props) {
-          return html`
-            <md-test-field
-              .label=${props.label}
-              ?disabled=${props.disabled ?? false}
-              .error=${props.error ?? false}
-              .populated=${props.populated ?? false}
-              .required=${props.required ?? false}
-              ${directive}
-            >
-              <input>
-            </md-test-field>
-          `;
-        },
-      });
-
-  async function setupTest(props: TemplateProps<FieldHarness> = {}) {
+  async function setupTest(props: Partial<Field> = {}) {
     // Variant type does not matter for shared tests
-    const template = templates.variant('field', props).render(State.DEFAULT);
-    const instance =
-        template ? env.render(template).querySelector('md-test-field') : null;
+    const template = html`
+      <md-test-field
+        .label=${props.label}
+        ?disabled=${props.disabled ?? false}
+        .error=${props.error ?? false}
+        .populated=${props.populated ?? false}
+        .required=${props.required ?? false}
+      >
+        <input>
+      </md-test-field>
+    `;
+    const root = env.render(template);
+    const instance = root.querySelector('md-test-field');
     if (!instance) {
       throw new Error('Could not query rendered <md-test-field>.');
     }
diff --git a/field/test/filled-field_test.ts b/field/lib/filled-field_test.ts
similarity index 83%
rename from field/test/filled-field_test.ts
rename to field/lib/filled-field_test.ts
index 9cfce7ab6b..c2f0031cef 100644
--- a/field/test/filled-field_test.ts
+++ b/field/lib/filled-field_test.ts
@@ -7,7 +7,6 @@
 import 'jasmine';
 
 import {Environment} from '@material/web/testing/environment';
-import {State, TemplateBuilder, TemplateProps} from '@material/web/testing/templates';
 import {html} from 'lit';
 import {customElement} from 'lit/decorators';
 
@@ -54,30 +53,21 @@ describe('Field', () => {
   describe('<md-filled-field>', () => {
     const env = new Environment();
 
-    const templates =
-        new TemplateBuilder().withHarness(FieldHarness).withVariants({
-          filled(directive, props) {
-            return html`
-              <md-test-filled-field
-                .label=${props.label}
-                ?disabled=${props.disabled ?? false}
-                .error=${props.error ?? false}
-                .populated=${props.populated ?? false}
-                .required=${props.required ?? false}
-                ${directive}
-              >
-                <input>
-              </md-test-filled-field>
-            `;
-          },
-        });
-
-    async function setupTest(props: TemplateProps<FieldHarness> = {}) {
+    async function setupTest(props: Partial<FilledField> = {}) {
       // Variant type does not matter for shared tests
-      const template = templates.variant('filled', props).render(State.DEFAULT);
-      const instance = template ?
-          env.render(template).querySelector('md-test-filled-field') :
-          null;
+      const template = html`
+        <md-test-filled-field
+          .label=${props.label}
+          ?disabled=${props.disabled ?? false}
+          .error=${props.error ?? false}
+          .populated=${props.populated ?? false}
+          .required=${props.required ?? false}
+        >
+          <input>
+        </md-test-filled-field>
+      `;
+      const root = env.render(template);
+      const instance = root.querySelector('md-test-filled-field');
       if (!instance) {
         throw new Error('Could not query rendered <md-test-filled-field>.');
       }
diff --git a/field/test/outlined-field_test.ts b/field/lib/outlined-field_test.ts
similarity index 67%
rename from field/test/outlined-field_test.ts
rename to field/lib/outlined-field_test.ts
index 46e5755102..3d6110d8a9 100644
--- a/field/test/outlined-field_test.ts
+++ b/field/lib/outlined-field_test.ts
@@ -7,7 +7,6 @@
 import 'jasmine';
 
 import {Environment} from '@material/web/testing/environment';
-import {State, TemplateBuilder, TemplateProps} from '@material/web/testing/templates';
 import {html} from 'lit';
 import {customElement} from 'lit/decorators';
 
@@ -39,31 +38,21 @@ describe('Field', () => {
   describe('<md-outlined-field>', () => {
     const env = new Environment();
 
-    const templates =
-        new TemplateBuilder().withHarness(FieldHarness).withVariants({
-          outlined(directive, props) {
-            return html`
-              <md-test-outlined-field
-                .label=${props.label}
-                ?disabled=${props.disabled ?? false}
-                .error=${props.error ?? false}
-                .populated=${props.populated ?? false}
-                .required=${props.required ?? false}
-                ${directive}
-              >
-                <input>
-              </md-test-outlined-field>
-            `;
-          },
-        });
-
-    async function setupTest(props: TemplateProps<FieldHarness> = {}) {
+    async function setupTest(props: Partial<OutlinedField> = {}) {
       // Variant type does not matter for shared tests
-      const template =
-          templates.variant('outlined', props).render(State.DEFAULT);
-      const instance = template ?
-          env.render(template).querySelector('md-test-outlined-field') :
-          null;
+      const template = html`
+        <md-test-outlined-field
+          .label=${props.label}
+          ?disabled=${props.disabled ?? false}
+          .error=${props.error ?? false}
+          .populated=${props.populated ?? false}
+          .required=${props.required ?? false}
+        >
+          <input>
+        </md-test-outlined-field>
+      `;
+      const root = env.render(template);
+      const instance = root.querySelector('md-test-outlined-field');
       if (!instance) {
         throw new Error('Could not query rendered <md-test-outlined-field>.');
       }