Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-04-17 23:34:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move understanding of Chats tab location into Nav

Browse Source
This commit is contained in:
Scott Nonnenberg
2026-02-21 06:49:02 +10:00
committed by GitHub
parent e7d1efbf99
commit 2ce5f92693
60 changed files with 1010 additions and 919 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ts/test-electron/services/AttachmentDownloadManager_test.preload.ts
View File

@@ -669,7 +669,7 @@ describe('AttachmentDownloadManager', () => {
);
assert.strictEqual(runJob.callCount, 1);
});
it('will not retry a job if manually cancelled', async () => {
it('will not retry a job if manually canceled', async () => {
const jobs = await addJobs(1);
const jobAttempts = getPromisesForAttempts(jobs[0], 2);
@@ -679,7 +679,7 @@ describe('AttachmentDownloadManager', () => {
await jobAttempts[0].started;
await downloadStarted.promise;
// user-cancelled behavior
// user-canceled behavior
downloadManager?.cancelJobs(JobCancelReason.UserInitiated, () => true);
await assert.isRejected(jobAttempts[0].completed as Promise<void>);

116
ts/test-electron/state/ducks/conversations_test.preload.ts
View File

@@ -476,52 +476,7 @@ describe('both/state/ducks/conversations', () => {
}
describe('showConversation', () => {
it('does not select a conversation if it does not exist', () => {
const state = {
...getEmptyState(),
};
const dispatch = sinon.spy();
showConversation({ conversationId: 'abc123' })(
dispatch,
getEmptyRootState,
null
);
const action = dispatch.getCall(0).args[0];
const nextState = reducer(state, action);
assert.isUndefined(nextState.selectedConversationId);
assert.isUndefined(nextState.targetedMessage);
});
it('selects a conversation id', () => {
const conversation = getDefaultConversation({
id: 'abc123',
});
const state = {
...getEmptyState(),
conversationLookup: {
[conversation.id]: conversation,
},
};
const dispatch = sinon.spy();
showConversation({ conversationId: 'abc123' })(
dispatch,
getEmptyRootState,
null
);
const action = dispatch
.getCalls()
.map(call => call.args[0])
.find(a => {
return a.type === TARGETED_CONVERSATION_CHANGED;
});
const nextState = reducer(state, action);
assert.equal(nextState.selectedConversationId, 'abc123');
assert.isUndefined(nextState.targetedMessage);
});
it('selects a conversation and a message', () => {
it('selects a conversation and a message', async () => {
const conversation = getDefaultConversation({
id: 'abc123',
});
@@ -533,7 +488,7 @@ describe('both/state/ducks/conversations', () => {
};
const dispatch = sinon.spy();
showConversation({
await showConversation({
conversationId: 'abc123',
messageId: 'xyz987',
})(dispatch, getEmptyRootState, null);
@@ -543,16 +498,15 @@ describe('both/state/ducks/conversations', () => {
.find(a => a.type === TARGETED_CONVERSATION_CHANGED);
const nextState = reducer(state, action);
assert.equal(nextState.selectedConversationId, 'abc123');
assert.equal(nextState.targetedMessage, 'xyz987');
});
describe('showConversation switchToAssociatedView=true', () => {
let action: TargetedConversationChangedActionType;
beforeEach(() => {
beforeEach(async () => {
const dispatch = sinon.spy();
showConversation({
await showConversation({
conversationId: 'fake-conversation-id',
switchToAssociatedView: true,
})(dispatch, getEmptyRootState, null);
@@ -2692,68 +2646,6 @@ describe('both/state/ducks/conversations', () => {
};
assert.deepEqual(actual, expected);
});
it('updates root state if conversation is selected', () => {
const conversation1 = getDefaultConversation({ isArchived: true });
const conversation2 = getDefaultConversation();
strictAssert(conversation1.serviceId, 'must exist');
strictAssert(conversation1.e164, 'must exist');
strictAssert(conversation2.serviceId, 'must exist');
strictAssert(conversation2.e164, 'must exist');
const state: ConversationsStateType = {
...getEmptyState(),
selectedConversationId: conversation1.id,
showArchived: true,
conversationLookup: {
[conversation1.id]: conversation1,
[conversation2.id]: conversation2,
},
conversationsByE164: {
[conversation1.e164]: conversation1,
[conversation2.e164]: conversation2,
},
conversationsByServiceId: {
[conversation1.serviceId]: conversation1,
[conversation2.serviceId]: conversation2,
},
};
const updatedConversation1 = {
...conversation1,
isArchived: false,
};
const updatedConversation2 = {
...conversation2,
active_at: 12345,
};
const action: ConversationsUpdatedActionType = {
type: 'CONVERSATIONS_UPDATED',
payload: {
data: [updatedConversation1, updatedConversation2],
},
};
const actual = reducer(state, action);
const expected: ConversationsStateType = {
...state,
showArchived: false,
conversationLookup: {
[conversation1.id]: updatedConversation1,
[conversation2.id]: updatedConversation2,
},
conversationsByE164: {
[conversation1.e164]: updatedConversation1,
[conversation2.e164]: updatedConversation2,
},
conversationsByServiceId: {
[conversation1.serviceId]: updatedConversation1,
[conversation2.serviceId]: updatedConversation2,
},
};
assert.deepEqual(actual, expected);
});
});
});
});