Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[HOLD on #380] Bump Onyx to version 1.0.95 #28384

Closed
wants to merge 4 commits into from
Closed

[HOLD on #380] Bump Onyx to version 1.0.95 #28384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
178093c
bump onyx
Sep 28, 2023
b2f1a55
Merge branch 'main' into @chrispader/bump-onyx-to-1-0-95
Sep 29, 2023
ec15921
Merge branch 'main' into @chrispader/bump-onyx-to-1-0-95
Sep 30, 2023
ff26337
fix: tests
Sep 30, 2023
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
14 changes: 7 additions & 7 deletions tests/actions/IOUTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,7 +1638,7 @@ describe('actions/IOU', () => {

expect(resultAction.message).toEqual(REPORT_ACTION.message);
expect(resultAction.person).toEqual(REPORT_ACTION.person);
expect(resultAction.pendingAction).toBeNull();
expect(resultAction.pendingAction).toBeUndefined();

await waitForBatchedUpdates();

Expand All @@ -1647,7 +1647,7 @@ describe('actions/IOU', () => {

// Then check the loading state of our action
const resultActionAfterUpdate = reportActions[reportActionID];
expect(resultActionAfterUpdate.pendingAction).toBeNull();
expect(resultActionAfterUpdate.pendingAction).toBeUndefined();

// When we attempt to delete a money request from the IOU report
fetch.pause();
Expand Down Expand Up @@ -1818,7 +1818,7 @@ describe('actions/IOU', () => {
// Then the report should have 2 actions
expect(_.size(reportActions)).toBe(2);
const resultActionAfter = reportActions[reportActionID];
expect(resultActionAfter.pendingAction).toBeNull();
expect(resultActionAfter.pendingAction).toBeUndefined();

fetch.pause();
// When deleting money request
Expand Down Expand Up @@ -1903,7 +1903,7 @@ describe('actions/IOU', () => {

expect(resultAction.message).toEqual(REPORT_ACTION.message);
expect(resultAction.person).toEqual(REPORT_ACTION.person);
expect(resultAction.pendingAction).toBeNull();
expect(resultAction.pendingAction).toBeUndefined();

await waitForBatchedUpdates();

Expand All @@ -1913,7 +1913,7 @@ describe('actions/IOU', () => {
let resultActionAfterUpdate = reportActions[reportActionID];

// Verify that our action is no longer in the loading state
expect(resultActionAfterUpdate.pendingAction).toBeNull();
expect(resultActionAfterUpdate.pendingAction).toBeUndefined();

await waitForBatchedUpdates();

Expand All @@ -1935,7 +1935,7 @@ describe('actions/IOU', () => {

expect(resultAction.message).toEqual(REPORT_ACTION.message);
expect(resultAction.person).toEqual(REPORT_ACTION.person);
expect(resultAction.pendingAction).toBeNull();
expect(resultAction.pendingAction).toBeUndefined();

await waitForBatchedUpdates();

Expand All @@ -1945,7 +1945,7 @@ describe('actions/IOU', () => {
resultActionAfterUpdate = reportActions[reportActionID];

// Verify that our action is no longer in the loading state
expect(resultActionAfterUpdate.pendingAction).toBeNull();
expect(resultActionAfterUpdate.pendingAction).toBeUndefined();

fetch.pause();
// When we delete the money request
Expand Down
10 changes: 5 additions & 5 deletions tests/actions/ReportTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ describe('actions/Report', () => {

expect(resultAction.message).toEqual(REPORT_ACTION.message);
expect(resultAction.person).toEqual(REPORT_ACTION.person);
expect(resultAction.pendingAction).toBeNull();
expect(resultAction.pendingAction).toBeUndefined();

// We subscribed to the Pusher channel above and now we need to simulate a reportComment action
// Pusher event so we can verify that action was handled correctly and merged into the reportActions.
Expand Down Expand Up @@ -129,7 +129,7 @@ describe('actions/Report', () => {
const resultAction = reportActions[reportActionID];

// Verify that our action is no longer in the loading state
expect(resultAction.pendingAction).toBeNull();
expect(resultAction.pendingAction).toBeUndefined();
});
});

Expand Down Expand Up @@ -607,7 +607,7 @@ describe('actions/Report', () => {
// Expect the reaction to have null where the users reaction used to be
expect(reportActionsReactions).toHaveProperty(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${reportActionID}`);
const reportActionReaction = reportActionsReactions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${reportActionID}`];
expect(reportActionReaction[EMOJI.name].users[TEST_USER_ACCOUNT_ID]).toBeNull();
expect(reportActionReaction[EMOJI.name].users[TEST_USER_ACCOUNT_ID]).toBeUndefined();
})
.then(() => {
reportAction = _.first(_.values(reportActions));
Expand Down Expand Up @@ -649,7 +649,7 @@ describe('actions/Report', () => {
// Expect the reaction to have null where the users reaction used to be
expect(reportActionsReactions).toHaveProperty(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${reportActionID}`);
const reportActionReaction = reportActionsReactions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${reportActionID}`];
expect(reportActionReaction[EMOJI.name].users[TEST_USER_ACCOUNT_ID]).toBeNull();
expect(reportActionReaction[EMOJI.name].users[TEST_USER_ACCOUNT_ID]).toBeUndefined();
});
});
});
Expand Down Expand Up @@ -716,7 +716,7 @@ describe('actions/Report', () => {
// Expect the reaction to have null where the users reaction used to be
expect(reportActionsReactions).toHaveProperty(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${resultAction.reportActionID}`);
const reportActionReaction = reportActionsReactions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${resultAction.reportActionID}`];
expect(reportActionReaction[EMOJI.name].users[TEST_USER_ACCOUNT_ID]).toBeNull();
expect(reportActionReaction[EMOJI.name].users[TEST_USER_ACCOUNT_ID]).toBeUndefined();
});
});
});
Loading