Remove enzyme test setup code from converged packages

microsoft · Mar 30, 2022 · d81e3e7 · d81e3e7
1 parent 7562094
commit d81e3e7
Show file tree

Hide file tree

Showing 37 changed files with 15 additions and 219 deletions.
diff --git a/packages/priority-overflow/config/tests.js b/packages/priority-overflow/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-accordion/config/tests.js b/packages/react-accordion/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-aria/config/tests.js b/packages/react-aria/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-avatar/config/tests.js b/packages/react-avatar/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-badge/config/tests.js b/packages/react-badge/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-button/config/tests.js b/packages/react-button/config/tests.js
@@ -1,6 +1 @@
 /** Jest test setup file. */
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-card/config/tests.js b/packages/react-card/config/tests.js
@@ -1,6 +1 @@
 /** Jest test setup file. */
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-checkbox/config/tests.js b/packages/react-checkbox/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-combobox/config/tests.js b/packages/react-combobox/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-dialog/config/tests.js b/packages/react-dialog/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-divider/config/tests.js b/packages/react-divider/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-image/config/tests.js b/packages/react-image/config/tests.js
@@ -1,6 +1 @@
 /** Jest test setup file. */
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-input/config/tests.js b/packages/react-input/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-label/config/tests.js b/packages/react-label/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-link/config/tests.js b/packages/react-link/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-menu/config/tests.js b/packages/react-menu/config/tests.js
@@ -1,9 +1,3 @@
 /** Jest test setup file. */
 
 require('@testing-library/jest-dom');
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-popover/config/tests.js b/packages/react-popover/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-portal/config/tests.js b/packages/react-portal/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-provider/config/tests.js b/packages/react-provider/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-radio/config/tests.js b/packages/react-radio/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-select/config/tests.js b/packages/react-select/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-shared-contexts/config/tests.js b/packages/react-shared-contexts/config/tests.js
@@ -1,6 +1 @@
 /** Jest test setup file. */
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-slider/config/tests.js b/packages/react-slider/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-spinbutton/config/tests.js b/packages/react-spinbutton/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-spinner/config/tests.js b/packages/react-spinner/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-switch/config/tests.js b/packages/react-switch/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-tabs/config/tests.js b/packages/react-tabs/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-text/config/tests.js b/packages/react-text/config/tests.js
@@ -1,9 +1,3 @@
 /** Jest test setup file. */
 
 require('@testing-library/jest-dom');
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-textarea/config/tests.js b/packages/react-textarea/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-theme/config/tests.js b/packages/react-theme/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-toolbar/config/tests.js b/packages/react-toolbar/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-tooltip/config/tests.js b/packages/react-tooltip/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/packages/react-utilities/config/tests.js b/packages/react-utilities/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/scripts/beachball/.beachballrc.base.json b/scripts/beachball/.beachballrc.base.json
@@ -10,6 +10,7 @@
     "**/__fixtures__/**",
     "**/__mocks__/**",
     "**/common/isConformant.ts",
+    "**/config/tests.js",
     "**/jest.config.js",
     "**/SPEC*.md",
     "**/tests/**"

diff --git a/scripts/create-package/plop-templates-react/config/tests.js b/scripts/create-package/plop-templates-react/config/tests.js
@@ -1,7 +1 @@
 /** Jest test setup file. */
-
-const { configure } = require('enzyme');
-const Adapter = require('enzyme-adapter-react-16');
-
-// Configure enzyme.
-configure({ adapter: new Adapter() });
diff --git a/tools/generators/migrate-converged-pkg/index.spec.ts b/tools/generators/migrate-converged-pkg/index.spec.ts
@@ -446,25 +446,13 @@ describe('migrate-converged-pkg generator', () => {
       let content = getJestSetupFile();
       expect(content).toMatchInlineSnapshot(`
         "/** Jest test setup file. */
-
-        const { configure } = require('enzyme');
-        const Adapter = require('enzyme-adapter-react-16');
-
-        // Configure enzyme.
-        configure({ adapter: new Adapter() });"
       `);
 
       await generator(tree, options);
 
       content = getJestSetupFile();
       expect(content).toMatchInlineSnapshot(`
         "/** Jest test setup file. */
-
-        const { configure } = require('enzyme');
-        const Adapter = require('enzyme-adapter-react-16');
-
-        // Configure enzyme.
-        configure({ adapter: new Adapter() });"
       `);
 
       tree.delete(jestSetupFilePath);
@@ -1230,12 +1218,6 @@ function setupDummyPackage(
     `,
     jestSetupFile: stripIndents`
      /** Jest test setup file. */
-
-    const { configure } = require('enzyme');
-    const Adapter = require('enzyme-adapter-react-16');
-
-    // Configure enzyme.
-    configure({ adapter: new Adapter() });
     `,
     npmConfig: stripIndents`
       *.api.json

diff --git a/tools/generators/migrate-converged-pkg/index.ts b/tools/generators/migrate-converged-pkg/index.ts
@@ -752,7 +752,20 @@ function updateLocalJestConfig(tree: Tree, options: NormalizedSchema) {
 
   tree.write(options.paths.jestConfig, templates.jest(config));
 
-  if (!tree.exists(jestSetupFilePath)) {
+  if (tree.exists(jestSetupFilePath)) {
+    const content = tree.read(jestSetupFilePath)!.toString('utf-8');
+    const newContent = content.replace(
+      stripIndents`const { configure } = require('enzyme');
+        const Adapter = require('enzyme-adapter-react-16');
+
+        // Configure enzyme.
+        configure({ adapter: new Adapter() });"
+      `,
+      '',
+    );
+    tree.write(jestSetupFilePath, newContent);
+  } else {
+    throw new Error();
     tree.write(jestSetupFilePath, templates.jestSetup);
   }