@ornikar/jest-config-react 7.2.0-alpha.1 → 7.3.1-beta.1

package/CHANGELOG.md

@@ -3,6 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [7.3.0](https://github.com/ornikar/shared-configs/compare/@ornikar/jest-config-react@7.2.0...@ornikar/jest-config-react@7.3.0) (2021-11-29)
+
+
+### Features
+
+* add waitFor in stories mock [no issue] ([#550](https://github.com/ornikar/shared-configs/issues/550)) ([9a4f254](https://github.com/ornikar/shared-configs/commit/9a4f25431cf556099b6c48dd52670937526c19b7))
+
+
+
+
+
+# [7.2.0](https://github.com/ornikar/shared-configs/compare/@ornikar/jest-config-react@7.1.1...@ornikar/jest-config-react@7.2.0) (2021-11-29)
+
+
+### Features
+
+* **deps:** update dependency @testing-library/react to v12 ([#547](https://github.com/ornikar/shared-configs/issues/547)) ([31eefb7](https://github.com/ornikar/shared-configs/commit/31eefb74293eb36f304d65a396abd10a61589f29))
+* **deps:** update dependency @testing-library/react-hooks to v7.0.2 ([#548](https://github.com/ornikar/shared-configs/issues/548)) ([2dfb8c7](https://github.com/ornikar/shared-configs/commit/2dfb8c79b31ad4211cd2a41fc31c432b39b1de3b))
+
+
+
+
+
 ## [7.1.1](https://github.com/ornikar/shared-configs/compare/@ornikar/jest-config-react@7.1.0...@ornikar/jest-config-react@7.1.1) (2021-11-18)
 
 **Note:** Version bump only for package @ornikar/jest-config-react

package/__mocks__/@storybook/react.js

@@ -2,7 +2,7 @@
 
 'use strict';
 
-const { act, render } = require('@testing-library/react');
+const { act, render, waitFor } = require('@testing-library/react');
 
 const wait = (amount = 0) => new Promise((resolve) => setTimeout(resolve, amount));
 
@@ -49,7 +49,7 @@ exports.storiesOf = (groupName) => {
       const parameters = { ...localParameters, ...storyParameters };
       const context = { name: storyName, parameters };
       const { jest } = parameters;
-      const { ignore, ignoreDecorators } = jest || {};
+      const { ignore, ignoreDecorators, createBeforeAfterEachCallbacks, waitFor: waitForExpectation } = jest || {};
 
       if (ignore) {
         test.skip(storyName, () => {});
@@ -57,17 +57,24 @@ exports.storiesOf = (groupName) => {
       }
 
       describe(groupName, () => {
+        if (createBeforeAfterEachCallbacks) {
+          const { before, after } = createBeforeAfterEachCallbacks();
+          if (before) beforeEach(before);
+          if (after) afterEach(after);
+        }
+
         it(storyName, async () => {
           const wrappingComponent = ignoreDecorators
             ? undefined
             : ({ children }) => decorateStory(() => children, [...localDecorators, ...globalDecorators])(context);
 
           await act(async () => {
-            const { unmount, asFragment } = render(story(context), { wrapper: wrappingComponent });
+            const rtlApi = render(story(context), { wrapper: wrappingComponent });
+            const { unmount, asFragment } = rtlApi;
             // https://www.apollographql.com/docs/react/development-testing/testing/#testing-final-state
             // delays until the next "tick" of the event loop, and allows time
             // for that Promise returned from MockedProvider to be fulfilled
-            await wait(0);
+            await (waitForExpectation ? waitFor(() => waitForExpectation(rtlApi, expect)) : wait(0));
             expect(asFragment()).toMatchSnapshot();
             unmount();
           });

package/jest-preset.js

@@ -19,7 +19,6 @@ module.exports = {
         '\\.svg$': require.resolve('./fileTransform'),
       }
     : {
-        '\\.inline\\.svg$': 'jest-svg-transformer',
         '\\.svg$': require.resolve('./fileTransform'),
         '^.+\\.(js|jsx|ts|tsx)$': '<rootDir>/node_modules/babel-jest',
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ornikar/jest-config-react",
-  "version": "7.2.0-alpha.1",
+  "version": "7.3.1-beta.1",
   "description": "jest config",
   "repository": "ornikar/shared-configs",
   "main": "jest-preset.js",
@@ -12,8 +12,8 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@testing-library/react": "^11.2.5",
-    "@testing-library/react-hooks": "^5.1.0",
+    "@testing-library/react": "^11.2.5 || ^12.0.0",
+    "@testing-library/react-hooks": "^5.1.0 || ^7.0.0",
     "react": "^16.6.3 || ^17.0.0",
     "react-dom": "^16.6.3 || ^17.0.0"
   },
@@ -22,9 +22,8 @@
     "identity-obj-proxy": "^3.0.0"
   },
   "devDependencies": {
-    "@testing-library/react": "11.2.7",
-    "@testing-library/react-hooks": "5.1.3",
-    "jest-svg-transformer": "^1.0.0",
+    "@testing-library/react": "12.1.2",
+    "@testing-library/react-hooks": "7.0.2",
     "react": "17.0.2"
   }
 }