Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove enzyme test setup code from converged packages #22245

Merged
merged 2 commits into from
Apr 7, 2022
+3 −232
Merged

Remove enzyme test setup code from converged packages #22245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f5b09d
Remove enzyme test setup code from converged packages
ecraig12345 Mar 29, 2022
f22b93d
revert generator and update test
ecraig12345 Apr 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions packages/priority-overflow/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-accordion/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-aria/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-avatar/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-badge/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
5 changes: 0 additions & 5 deletions packages/react-button/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
/** Jest test setup file. */
const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
5 changes: 0 additions & 5 deletions packages/react-card/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
/** Jest test setup file. */
const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-checkbox/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-combobox/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-dialog/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-divider/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
5 changes: 0 additions & 5 deletions packages/react-image/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
/** Jest test setup file. */
const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-input/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-label/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-link/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-menu/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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() });
6 changes: 0 additions & 6 deletions packages/react-popover/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-portal/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-provider/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-radio/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-select/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
5 changes: 0 additions & 5 deletions packages/react-shared-contexts/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
/** Jest test setup file. */
const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-slider/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-spinbutton/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-spinner/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-switch/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-tabs/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-text/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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() });
6 changes: 0 additions & 6 deletions packages/react-textarea/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-theme/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-toolbar/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-tooltip/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
6 changes: 0 additions & 6 deletions packages/react-utilities/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
1 change: 1 addition & 0 deletions scripts/beachball/.beachballrc.base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"**/__fixtures__/**",
"**/__mocks__/**",
"**/common/isConformant.ts",
"**/config/tests.js",
"**/jest.config.js",
"**/SPEC*.md",
"**/tests/**"
Expand Down
6 changes: 0 additions & 6 deletions scripts/create-package/plop-templates-react/config/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
/** Jest test setup file. */

const { configure } = require('enzyme');
const Adapter = require('enzyme-adapter-react-16');

// Configure enzyme.
configure({ adapter: new Adapter() });
34 changes: 2 additions & 32 deletions tools/generators/migrate-converged-pkg/index.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,37 +443,13 @@ describe('migrate-converged-pkg generator', () => {
return tree.read(jestSetupFilePath)?.toString('utf-8');
}

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);
expect(tree.exists(jestSetupFilePath)).toBeFalsy();

await generator(tree, options);

content = getJestSetupFile();
expect(content).toMatchInlineSnapshot(`"/** Jest test setup file. */"`);
expect(tree.exists(jestSetupFilePath)).toBeTruthy();
expect(getJestSetupFile()).toMatchInlineSnapshot(`"/** Jest test setup file. */"`);
});
});

Expand Down Expand Up @@ -1242,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
Expand Down