Skip to content

Commit cd5a978

Browse files
bgptrbgptr
committed
fix tests
1 parent 31f0a17 commit cd5a978

6 files changed

Lines changed: 207 additions & 146 deletions

File tree

‎test/unit/components/SideBar/Sidebar.spec.js‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -136,21 +136,7 @@ const expectToHaveDefaultMenuLinks = async (user, params) => {
136136
"/transactions",
137137
"On-chain Transactions"
138138
);
139-
await expectToHaveMenuLink(
140-
"menuLinkContent-governance",
141-
"Governance",
142-
"governanceIcon",
143-
"/governance",
144-
"Governance"
145-
);
146139
if (!sidebarOnBottom || expandSideBar) {
147-
await expectToHaveMenuLink(
148-
"menuLinkContent-tickets",
149-
"Staking",
150-
"ticketsIcon",
151-
"/tickets",
152-
"Staking"
153-
);
154140
await expectToHaveMenuLink(
155141
"menuLinkContent-accounts",
156142
"Accounts",
@@ -177,6 +163,20 @@ const expectToHaveDefaultMenuLinks = async (user, params) => {
177163
"/dex",
178164
"DEX"
179165
);
166+
await expectToHaveMenuLink(
167+
"menuLinkContent-tickets",
168+
"Staking",
169+
"ticketsIcon",
170+
"/tickets",
171+
"Staking"
172+
);
173+
await expectToHaveMenuLink(
174+
"menuLinkContent-governance",
175+
"Governance",
176+
"governanceIcon",
177+
"/governance",
178+
"Governance"
179+
);
180180
}
181181
}
182182
if (isLnEnabled) {
@@ -301,7 +301,9 @@ test("renders sidebar on the bottom", async () => {
301301
mockSidebarOnBottom.mockRestore();
302302
});
303303

304-
test("renders sidebar with trezor enabled, should not find trezor menu, it have been moved to a separate tab under settings", async () => {
304+
test("renders sidebar with trezor enabled, should not find trezor menu,\
305+
it have been moved to a separate tab under settings. Governance and Tickets\
306+
should be hidden.", async () => {
305307
const mockIsTrezor = (selectors.isTrezor = jest.fn(() => true));
306308
const { user } = render(<SideBar />);
307309
await expectToHaveDefaultMenuLinks(user, {

‎test/unit/components/Snackbar/Snackbar.spec.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,22 +184,23 @@ test("test multi notification", async () => {
184184
jest.useFakeTimers();
185185
user.click(snackbarSenderButton);
186186
user.click(snackbarSenderButton);
187+
user.click(snackbarSenderButton);
187188
await waitFor(() =>
188-
expect(screen.getAllByTestId("snackbar-message").length).toBe(2)
189+
expect(screen.getAllByTestId("snackbar-message").length).toBe(3)
189190
);
190191
// simulate that 10 * 500 seconds have passed
191192
act(() => {
192193
jest.advanceTimersByTime(5000);
193194
});
194195
await waitFor(() =>
195-
expect(screen.getAllByTestId("snackbar-message").length).toBe(1)
196+
expect(screen.getAllByTestId("snackbar-message").length).toBe(2)
196197
);
197198
// simulate that 10 * 500 seconds have passed
198199
act(() => {
199200
jest.advanceTimersByTime(5000);
200201
});
201202
await waitFor(() =>
202-
expect(screen.queryByTestId("snackbar-message")).not.toBeInTheDocument()
203+
expect(screen.getAllByTestId("snackbar-message").length).toBe(1)
203204
);
204205
});
205206

‎test/unit/components/views/GetStaredPage/SetupWallet/ProcessManagedTickets.spec.js‎

Lines changed: 50 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import ProcessManagedTickets from "components/views/GetStartedPage/SetupWallet/ProcessManagedTickets";
22
import { render } from "test-utils.js";
3-
import { screen, wait } from "@testing-library/react";
4-
import user from "@testing-library/user-event";
3+
import { screen, waitFor } from "@testing-library/react";
54
import * as sel from "selectors";
65
import * as wal from "wallet";
76
import * as arrs from "../../../../../../app/helpers/arrays";
@@ -108,37 +107,40 @@ const initialState = {
108107
}
109108
};
110109

111-
test("skip ProcessManagedTickets and show error", () => {
112-
render(
110+
test("skip ProcessManagedTickets and show error", async () => {
111+
const { user } = render(
113112
<ProcessManagedTickets
114113
send={mockSend}
115114
cancel={mockCancel}
116115
error={testError}
117116
/>
118117
);
119-
user.click(getSkipButton());
118+
await user.click(getSkipButton());
120119
expect(screen.getByText(testError)).toBeInTheDocument();
121120
expect(mockCancel).toHaveBeenCalled();
122121
});
123122

124123
test("do ProcessManagedTickets - in a private wallet", async () => {
125124
mockUnlockLockAndGetAccountsAttempt();
126-
render(<ProcessManagedTickets send={mockSend} cancel={mockCancel} />, {
127-
initialState
128-
});
125+
const { user } = render(
126+
<ProcessManagedTickets send={mockSend} cancel={mockCancel} />,
127+
{
128+
initialState
129+
}
130+
);
129131
const continueButton = getContinueButton();
130-
user.click(continueButton);
132+
await user.click(continueButton);
131133

132134
expect(screen.getByText("Passphrase")).toBeInTheDocument();
133135

134136
// cancel first
135-
user.click(getCancelButton());
137+
await user.click(getCancelButton());
136138

137-
user.click(continueButton);
138-
user.type(screen.getByLabelText("Private Passphrase"), testPassphrase);
139-
user.click(getModalContinueButton());
139+
await user.click(continueButton);
140+
await user.type(screen.getByLabelText("Private Passphrase"), testPassphrase);
141+
await user.click(getModalContinueButton());
140142

141-
await wait(() => expect(mockSend).toHaveBeenCalled());
143+
await waitFor(() => expect(mockSend).toHaveBeenCalled());
142144

143145
expect(mockProcessManagedTickets).toHaveBeenNthCalledWith(
144146
1,
@@ -201,22 +203,25 @@ test("do ProcessManagedTickets - in a default wallet, available vps pubkeys have
201203
selectors.getMixedAccount = jest.fn(() => null);
202204
selectors.getChangeAccount = jest.fn(() => null);
203205
mockUnlockLockAndGetAccountsAttempt();
204-
render(<ProcessManagedTickets send={mockSend} cancel={mockCancel} />, {
205-
initialState
206-
});
206+
const { user } = render(
207+
<ProcessManagedTickets send={mockSend} cancel={mockCancel} />,
208+
{
209+
initialState
210+
}
211+
);
207212
const continueButton = getContinueButton();
208-
user.click(continueButton);
213+
await user.click(continueButton);
209214

210215
expect(screen.getByText("Passphrase")).toBeInTheDocument();
211216

212217
// cancel first
213-
user.click(getCancelButton());
218+
await user.click(getCancelButton());
214219

215-
user.click(continueButton);
216-
user.type(screen.getByLabelText("Private Passphrase"), testPassphrase);
217-
user.click(getModalContinueButton());
220+
await user.click(continueButton);
221+
await user.type(screen.getByLabelText("Private Passphrase"), testPassphrase);
222+
await user.click(getModalContinueButton());
218223

219-
await wait(() => expect(mockSend).toHaveBeenCalled());
224+
await waitFor(() => expect(mockSend).toHaveBeenCalled());
220225

221226
expect(mockProcessManagedTickets).toHaveBeenNthCalledWith(
222227
1,
@@ -279,22 +284,25 @@ test("do ProcessManagedTickets - in a default wallet, available vps pubkeys have
279284
selectors.getMixedAccount = jest.fn(() => null);
280285
selectors.getChangeAccount = jest.fn(() => null);
281286
mockUnlockLockAndGetAccountsAttempt();
282-
render(<ProcessManagedTickets send={mockSend} cancel={mockCancel} />, {
283-
initialState
284-
});
287+
const { user } = render(
288+
<ProcessManagedTickets send={mockSend} cancel={mockCancel} />,
289+
{
290+
initialState
291+
}
292+
);
285293
const continueButton = getContinueButton();
286-
user.click(continueButton);
294+
await user.click(continueButton);
287295

288296
expect(screen.getByText("Passphrase")).toBeInTheDocument();
289297

290298
// cancel first
291-
user.click(getCancelButton());
299+
await user.click(getCancelButton());
292300

293-
user.click(continueButton);
294-
user.type(screen.getByLabelText("Private Passphrase"), testPassphrase);
295-
user.click(getModalContinueButton());
301+
await user.click(continueButton);
302+
await user.type(screen.getByLabelText("Private Passphrase"), testPassphrase);
303+
await user.click(getModalContinueButton());
296304

297-
await wait(() => expect(mockSend).toHaveBeenCalled());
305+
await waitFor(() => expect(mockSend).toHaveBeenCalled());
298306

299307
expect(mockProcessManagedTickets).toHaveBeenNthCalledWith(
300308
1,
@@ -355,16 +363,19 @@ test("do ProcessManagedTickets - failed to fetch vsps", async () => {
355363
mockGetAllVSPs = wallet.getAllVSPs = jest.fn(() => {
356364
throw testError;
357365
});
358-
render(<ProcessManagedTickets send={mockSend} cancel={mockCancel} />, {
359-
initialState
360-
});
366+
const { user } = render(
367+
<ProcessManagedTickets send={mockSend} cancel={mockCancel} />,
368+
{
369+
initialState
370+
}
371+
);
361372
const continueButton = getContinueButton();
362-
user.click(continueButton);
373+
await user.click(continueButton);
363374

364-
user.type(screen.getByLabelText("Private Passphrase"), testPassphrase);
365-
user.click(getModalContinueButton());
375+
await user.type(screen.getByLabelText("Private Passphrase"), testPassphrase);
376+
await user.click(getModalContinueButton());
366377

367-
await wait(() => expect(mockSend).toHaveBeenCalled());
378+
await waitFor(() => expect(mockSend).toHaveBeenCalled());
368379

369380
expect(mockGetAllVSPs).toHaveBeenCalled();
370381
expect(mockProcessManagedTickets).not.toHaveBeenCalled();

0 commit comments

Comments
 (0)