From 2a466699078729d4b99397d174819d5c0ec7e6ae Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@reactioncommerce.com>
Date: Fri, 26 Jul 2019 14:49:17 -0700
Subject: [PATCH] chore: fix babel/jest configs

Signed-off-by: Machiko Yasuda <machiko@reactioncommerce.com>
---
 babel.config.js                                            | 1 +
 config/paths.js                                            | 1 +
 package.json                                               | 3 +--
 package/src/components/Button/Button.test.js               | 1 +
 package/src/components/ConfirmDialog/ConfirmDialog.test.js | 1 +
 package/src/setupTests.js                                  | 5 +++++
 6 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 package/src/setupTests.js

diff --git a/babel.config.js b/babel.config.js
index 37fe8642..77c0a8bb 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -76,6 +76,7 @@ module.exports = function (api) {
     ignore = [
       "**/*.test.js",
       "__snapshots__",
+      "**/setupTests.js",
       "**/tests",
       "**/scripts"
     ];
diff --git a/config/paths.js b/config/paths.js
index 744da8fa..c175730a 100644
--- a/config/paths.js
+++ b/config/paths.js
@@ -49,6 +49,7 @@ module.exports = {
   appSrc: resolveApp('src'),
   tests: resolveApp('src/tests/index.js'),
   yarnLockFile: resolveApp('yarn.lock'),
+  testsSetup: resolveApp('src/setupTests.js'),
   appNodeModules: resolveApp('node_modules'),
   publicUrl: getPublicUrl(resolveApp('package.json')),
   servedPath: getServedPath(resolveApp('package.json')),
diff --git a/package.json b/package.json
index 00558efe..f6efbddd 100644
--- a/package.json
+++ b/package.json
@@ -81,8 +81,7 @@
       "<rootDir>/config/polyfills.js"
     ],
     "setupFilesAfterEnv": [
-      "react-testing-library/cleanup-after-each",
-      "jest-dom/extend-expect"
+      "<rootDir>/package/src/setupTests.js"
     ],
     "testPathIgnorePatterns": [
       "<rootDir>/config/",
diff --git a/package/src/components/Button/Button.test.js b/package/src/components/Button/Button.test.js
index 69c279cc..f5dadfda 100644
--- a/package/src/components/Button/Button.test.js
+++ b/package/src/components/Button/Button.test.js
@@ -19,5 +19,6 @@ test("error button snapshot", () => {
 
 test("isWaiting button snapshot", () => {
   const { asFragment } = render(<Button className="myBtn" isWaiting>Upload</Button>);
+  expect(asFragment()).toBeDisabled();
   expect(asFragment()).toMatchSnapshot();
 });
diff --git a/package/src/components/ConfirmDialog/ConfirmDialog.test.js b/package/src/components/ConfirmDialog/ConfirmDialog.test.js
index 63c5dd41..72d06f92 100644
--- a/package/src/components/ConfirmDialog/ConfirmDialog.test.js
+++ b/package/src/components/ConfirmDialog/ConfirmDialog.test.js
@@ -16,6 +16,7 @@ test("basic snapshot - with opening the dialog", () => {
       )}
     </ConfirmDialog>);
   fireEvent.click(getByText("Open Confirm Dialog"));
+  expect(getByRole("dialog")).toBeInTheDocument();
   expect(getByRole("dialog")).toHaveTextContent("Are you sure you want to do that?");
   expect(getByRole("dialog")).toHaveTextContent("Are you sure?");
   expect(getByRole("dialog")).toHaveTextContent("OK");
diff --git a/package/src/setupTests.js b/package/src/setupTests.js
new file mode 100644
index 00000000..d7c2a0fb
--- /dev/null
+++ b/package/src/setupTests.js
@@ -0,0 +1,5 @@
+// add some helpful assertions
+import "@testing-library/jest-dom/extend-expect";
+
+// this is basically: afterEach(cleanup)
+import "@testing-library/react/cleanup-after-each";