@tramvai/test-react 2.28.0 → 2.29.0

package/README.md

@@ -42,10 +42,10 @@ import { testComponent } from '@tramvai/test-react';
 
 describe('test', () => {
   it('render', async () => {
-    const { render, rerender, context, act, fireEvent, Wrapper } = testComponent(<Cmp id={1} />);
+    const { screen, rerender, context, act, fireEvent, Wrapper } = testComponent(<Cmp id={1} />);
 
     // test component render
-    expect(render.getByTestId('test').textContent).toBe('Content 1');
+    expect(screen.getByTestId('test').textContent).toBe('Content 1');
 
     // test render after store update
     act(() => {
@@ -53,12 +53,12 @@ describe('test', () => {
     });
 
     // interact with the component
-    fireEvent.click(render.getByText('Button'));
+    fireEvent.click(screen.getByText('Button'));
 
     // component rerender
     rerender(<Cmp id={2} />);
 
-    expect(render.getByTestId('test').textContent).toBe('Content 2');
+    expect(screen.getByTestId('test').textContent).toBe('Content 2');
   });
 });
 ```

package/lib/index.es.js

@@ -1,4 +1,4 @@
-import { render, act, fireEvent, renderHook } from '@testing-library/react';
+import { render, act, screen, fireEvent, renderHook } from '@testing-library/react';
 export * from '@testing-library/react';
 import { jsx } from 'react/jsx-runtime';
 import { Provider } from '@tramvai/state';
@@ -7,7 +7,7 @@ import { Provider as Provider$1 } from '@tinkoff/router';
 import { createMockContext, createMockRouter } from '@tramvai/test-mocks';
 import { waitRaf } from '@tramvai/test-jsdom';
 
-const testComponent = (element, { providers, initialState, store, stores, di, context = createMockContext({ initialState, providers, di, store, stores }), currentRoute, currentUrl, router = createMockRouter({ currentRoute, currentUrl }), renderOptions, } = {}) => {
+const testComponent = (element, { providers, modules, initialState, store, stores, di, context = createMockContext({ initialState, providers, modules, di, store, stores }), currentRoute, currentUrl, router = createMockRouter({ currentRoute, currentUrl }), renderOptions, } = {}) => {
     const Wrapper = ({ children }) => (jsx(Provider, { context: context, serverState: initialState, children: jsx(DIContext.Provider, { value: context.di, children: jsx(Provider$1, { router: router, serverState: initialState === null || initialState === void 0 ? void 0 : initialState.router, children: children }) }) }));
     const renderResults = render(jsx(Wrapper, { children: element }), renderOptions);
     return {
@@ -23,13 +23,14 @@ const testComponent = (element, { providers, initialState, store, stores, di, co
                 }
             });
         },
+        screen,
         fireEvent,
         context,
         router,
     };
 };
 
-const testHook = (hookCallback, { providers, initialState, store, stores, di, context = createMockContext({ initialState, providers, di, store, stores }), currentRoute, currentUrl, router = createMockRouter({ currentRoute, currentUrl }), renderOptions, } = {}) => {
+const testHook = (hookCallback, { providers, modules, initialState, store, stores, di, context = createMockContext({ initialState, providers, modules, di, store, stores }), currentRoute, currentUrl, router = createMockRouter({ currentRoute, currentUrl }), renderOptions, } = {}) => {
     var _a;
     const Wrapper = (_a = renderOptions === null || renderOptions === void 0 ? void 0 : renderOptions.wrapper) !== null && _a !== void 0 ? _a : (({ children }) => children);
     const { result, rerender } = renderHook(hookCallback, {

package/lib/index.js

@@ -10,7 +10,7 @@ var router = require('@tinkoff/router');
 var testMocks = require('@tramvai/test-mocks');
 var testJsdom = require('@tramvai/test-jsdom');
 
-const testComponent = (element, { providers, initialState, store, stores, di, context = testMocks.createMockContext({ initialState, providers, di, store, stores }), currentRoute, currentUrl, router: router$1 = testMocks.createMockRouter({ currentRoute, currentUrl }), renderOptions, } = {}) => {
+const testComponent = (element, { providers, modules, initialState, store, stores, di, context = testMocks.createMockContext({ initialState, providers, modules, di, store, stores }), currentRoute, currentUrl, router: router$1 = testMocks.createMockRouter({ currentRoute, currentUrl }), renderOptions, } = {}) => {
     const Wrapper = ({ children }) => (jsxRuntime.jsx(state.Provider, { context: context, serverState: initialState, children: jsxRuntime.jsx(react$1.DIContext.Provider, { value: context.di, children: jsxRuntime.jsx(router.Provider, { router: router$1, serverState: initialState === null || initialState === void 0 ? void 0 : initialState.router, children: children }) }) }));
     const renderResults = react.render(jsxRuntime.jsx(Wrapper, { children: element }), renderOptions);
     return {
@@ -26,13 +26,14 @@ const testComponent = (element, { providers, initialState, store, stores, di, co
                 }
             });
         },
+        screen: react.screen,
         fireEvent: react.fireEvent,
         context,
         router: router$1,
     };
 };
 
-const testHook = (hookCallback, { providers, initialState, store, stores, di, context = testMocks.createMockContext({ initialState, providers, di, store, stores }), currentRoute, currentUrl, router: router$1 = testMocks.createMockRouter({ currentRoute, currentUrl }), renderOptions, } = {}) => {
+const testHook = (hookCallback, { providers, modules, initialState, store, stores, di, context = testMocks.createMockContext({ initialState, providers, modules, di, store, stores }), currentRoute, currentUrl, router: router$1 = testMocks.createMockRouter({ currentRoute, currentUrl }), renderOptions, } = {}) => {
     var _a;
     const Wrapper = (_a = renderOptions === null || renderOptions === void 0 ? void 0 : renderOptions.wrapper) !== null && _a !== void 0 ? _a : (({ children }) => children);
     const { result, rerender } = react.renderHook(hookCallback, {

package/lib/testComponent.d.ts

@@ -12,10 +12,11 @@ declare type Options = OptionsDi & OptionsContext & OptionsRouter & {
     router?: AbstractRouter;
     renderOptions?: RenderOptions;
 };
-export declare const testComponent: (element: React.ReactElement, { providers, initialState, store, stores, di, context, currentRoute, currentUrl, router, renderOptions, }?: Options) => {
+export declare const testComponent: (element: React.ReactElement, { providers, modules, initialState, store, stores, di, context, currentRoute, currentUrl, router, renderOptions, }?: Options) => {
     render: import("@testing-library/react").RenderResult<typeof import("@testing-library/dom/types/queries"), HTMLElement, HTMLElement>;
     rerender: (el: React.ReactElement) => void;
     act: (callback: () => Promise<void> | void) => Promise<undefined>;
+    screen: import("@testing-library/react").Screen<typeof import("@testing-library/dom/types/queries")>;
     fireEvent: import("@testing-library/react").FireFunction & import("@testing-library/react").FireObject;
     context: import("@tinkoff/dippy").BaseTokenInterface<import("@tramvai/tokens-common").ConsumerContext>;
     router: AbstractRouter;

package/lib/testHook.d.ts

@@ -11,7 +11,7 @@ declare type Options = OptionsDi & OptionsContext & OptionsRouter & {
     router?: AbstractRouter;
     renderOptions?: RenderHookOptions<any>;
 };
-export declare const testHook: <TProps, TResult>(hookCallback: (props: TProps) => TResult, { providers, initialState, store, stores, di, context, currentRoute, currentUrl, router, renderOptions, }?: Options) => {
+export declare const testHook: <TProps, TResult>(hookCallback: (props: TProps) => TResult, { providers, modules, initialState, store, stores, di, context, currentRoute, currentUrl, router, renderOptions, }?: Options) => {
     result: {
         current: TResult;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/test-react",
-  "version": "2.28.0",
+  "version": "2.29.0",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -20,11 +20,11 @@
   "dependencies": {
     "@testing-library/react": "^13.3.0",
     "@tinkoff/router": "0.2.3",
-    "@tramvai/react": "2.28.0",
-    "@tramvai/state": "2.28.0",
-    "@tramvai/test-jsdom": "2.28.0",
-    "@tramvai/test-mocks": "2.28.0",
-    "@tramvai/tokens-common": "2.28.0",
+    "@tramvai/react": "2.29.0",
+    "@tramvai/state": "2.29.0",
+    "@tramvai/test-jsdom": "2.29.0",
+    "@tramvai/test-mocks": "2.29.0",
+    "@tramvai/tokens-common": "2.29.0",
     "tslib": "^2.4.0"
   },
   "peerDependencies": {