Skip to content

test: fix align count test #373

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.

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

Merged
merged 3 commits into from
Apr 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
55 changes: 30 additions & 25 deletions tests/basic.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ describe('Trigger.Basic', () => {
});

describe('afterPopupVisibleChange can be triggered', () => {
it('uncontrolled', () => {
it('uncontrolled', async () => {
let triggered = 0;
const { container } = render(
<Trigger
Expand All @@ -178,22 +178,23 @@ describe('Trigger.Basic', () => {
);

trigger(container, '.target');

await awaitFakeTimer();

expect(triggered).toBe(1);
});

it('controlled', () => {
const demoRef = createRef();
it('controlled', async () => {
let triggered = 0;

class Demo extends React.Component {
state = {
visible: false,
};
const Demo = () => {
const [visible, setVisible] = React.useState(false);

render() {
return (
return (
<>
<button onClick={() => setVisible((v) => !v)} />
<Trigger
popupVisible={this.state.visible}
popupVisible={visible}
popupAlign={placementAlignMap.left}
afterPopupVisibleChange={() => {
triggered += 1;
Expand All @@ -202,21 +203,18 @@ describe('Trigger.Basic', () => {
>
<div className="target">click</div>
</Trigger>
);
}
}
</>
);
};

render(<Demo ref={demoRef} />);
act(() => {
demoRef.current.setState({ visible: true });
jest.runAllTimers();
});
const { container } = render(<Demo />);

fireEvent.click(container.querySelector('button'));
await awaitFakeTimer();
expect(triggered).toBe(1);

act(() => {
demoRef.current.setState({ visible: false });
jest.runAllTimers();
});
fireEvent.click(container.querySelector('button'));
await awaitFakeTimer();
expect(triggered).toBe(2);
});
});
Expand Down Expand Up @@ -850,8 +848,10 @@ describe('Trigger.Basic', () => {
expect(errorSpy).not.toHaveBeenCalled();
errorSpy.mockRestore();
});

it('should trigger align when popupAlign had updated', async () => {
const onPopupAlign = jest.fn();

const App = () => {
const [placementAlign, setPlacementAlign] = React.useState(
placementAlignMap.leftTop,
Expand Down Expand Up @@ -892,16 +892,21 @@ describe('Trigger.Basic', () => {
);
};
render(<App />);

// CSSMotion will trigger `onPrepare` even when motion not support
// Which means align will trigger twice on `prepare` & `visibleChanged`
await awaitFakeTimer();
expect(onPopupAlign).toHaveBeenCalledTimes(1);
expect(onPopupAlign).toHaveBeenCalledTimes(2);
fireEvent.click(document.querySelector('#btn'));

await awaitFakeTimer();
expect(onPopupAlign).toHaveBeenCalledTimes(2);
expect(onPopupAlign).toHaveBeenCalledTimes(3);

fireEvent.click(document.querySelector('#close'));
await awaitFakeTimer();
fireEvent.click(document.querySelector('#btn'));
await awaitFakeTimer();
expect(onPopupAlign).toHaveBeenCalledTimes(2);
expect(onPopupAlign).toHaveBeenCalledTimes(3);
});

it('popupVisible switch `undefined` and `false` should work', async () => {
Expand Down
12 changes: 9 additions & 3 deletions tests/flip.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,15 @@ import Trigger from '../src';
import { getVisibleArea } from '../src/util';

const flush = async () => {
await act(async () => {
await Promise.resolve();
});
for (let i = 0; i < 10; i += 1) {
act(() => {
jest.runAllTimers();
});

await act(async () => {
await Promise.resolve();
});
}
};

const builtinPlacements = {
Expand Down