From 0a7e352a559d04b66b544c83056b470080a4f1c3 Mon Sep 17 00:00:00 2001
From: Anastasia Lanz <anastasia.lanz@deque.com>
Date: Thu, 4 Jan 2024 11:35:37 -0600
Subject: [PATCH] fix: colocate button test

---
 packages/react/__tests__/axe.ts                       |  6 +++---
 .../react/__tests__/{setupTests.js => setupTests.ts}  |  0
 packages/react/package.json                           |  7 ++++---
 packages/react/src/axe.ts                             |  9 +++++++++
 .../components/Button/index.test.tsx}                 |  6 +++---
 packages/react/yarn.lock                              | 11 +++++++++--
 6 files changed, 28 insertions(+), 11 deletions(-)
 rename packages/react/__tests__/{setupTests.js => setupTests.ts} (100%)
 create mode 100644 packages/react/src/axe.ts
 rename packages/react/{__tests__/src/components/Button/index.tsx => src/components/Button/index.test.tsx} (93%)

diff --git a/packages/react/__tests__/axe.ts b/packages/react/__tests__/axe.ts
index d0b473abb..1f2153469 100644
--- a/packages/react/__tests__/axe.ts
+++ b/packages/react/__tests__/axe.ts
@@ -1,9 +1,9 @@
-import { configureAxe } from 'jest-axe';
+import { JestAxe, configureAxe } from 'jest-axe';
 
-const axe = configureAxe({
+const axe: JestAxe = configureAxe({
   rules: {
     region: { enabled: false }
   }
 });
 
-module.exports = axe;
+export default axe;
diff --git a/packages/react/__tests__/setupTests.js b/packages/react/__tests__/setupTests.ts
similarity index 100%
rename from packages/react/__tests__/setupTests.js
rename to packages/react/__tests__/setupTests.ts
diff --git a/packages/react/package.json b/packages/react/package.json
index abc7b5591..05e39066f 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -50,6 +50,7 @@
     "@types/react": "^18.0.12",
     "@types/react-dom": "^18.0.5",
     "@types/jest-axe": "^3.5.4",
+    "@types/jest": "^24.7.1",
     "@types/react-syntax-highlighter": "^15.5.2",
     "autoprefixer": "^9.7.6",
     "babel-plugin-module-resolver": "^4.0.0",
@@ -95,12 +96,12 @@
   },
   "jest": {
     "setupFilesAfterEnv": [
-      "<rootDir>__tests__/setupTests.js"
+      "<rootDir>__tests__/setupTests.ts"
     ],
     "testMatch": [
       "**/__tests__/src/**/*.js",
-      "**/__tests__/src/**/*.tsx",
-      "**/__tests__/demo/**/*.js"
+      "**/__tests__/demo/**/*.js",
+      "**/src/components/**/*.test.tsx"
     ],
     "collectCoverageFrom": [
       "**/src/**/*.{ts,tsx}"
diff --git a/packages/react/src/axe.ts b/packages/react/src/axe.ts
new file mode 100644
index 000000000..1f2153469
--- /dev/null
+++ b/packages/react/src/axe.ts
@@ -0,0 +1,9 @@
+import { JestAxe, configureAxe } from 'jest-axe';
+
+const axe: JestAxe = configureAxe({
+  rules: {
+    region: { enabled: false }
+  }
+});
+
+export default axe;
diff --git a/packages/react/__tests__/src/components/Button/index.tsx b/packages/react/src/components/Button/index.test.tsx
similarity index 93%
rename from packages/react/__tests__/src/components/Button/index.tsx
rename to packages/react/src/components/Button/index.test.tsx
index ef21e21e8..ab6bfcd75 100644
--- a/packages/react/__tests__/src/components/Button/index.tsx
+++ b/packages/react/src/components/Button/index.test.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import Button from '../../../../src/components/Button';
-import Icon from '../../../../src/components/Icon';
-import * as axe from '../../../axe';
+import Button from '../../../src/components/Button';
+import Icon from '../../../src/components/Icon';
+import axe from '../../axe';
 
 test('should render primary button', () => {
   render(
diff --git a/packages/react/yarn.lock b/packages/react/yarn.lock
index 90516d7c3..7ce2127cd 100644
--- a/packages/react/yarn.lock
+++ b/packages/react/yarn.lock
@@ -1702,6 +1702,13 @@
     expect "^29.0.0"
     pretty-format "^29.0.0"
 
+"@types/jest@^24.7.1":
+  version "24.9.1"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.9.1.tgz#02baf9573c78f1b9974a5f36778b366aa77bd534"
+  integrity sha512-Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q==
+  dependencies:
+    jest-diff "^24.3.0"
+
 "@types/node@*":
   version "20.10.6"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.6.tgz#a3ec84c22965802bf763da55b2394424f22bfbb5"
@@ -4421,9 +4428,9 @@ jest-config@^24.9.0:
     pretty-format "^24.9.0"
     realpath-native "^1.1.0"
 
-jest-diff@^24.9.0:
+jest-diff@^24.3.0, jest-diff@^24.9.0:
   version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da"
   integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==
   dependencies:
     chalk "^2.0.1"