Skip to content

Commit

Permalink
refactor: extract state notification logic (gitify-app#845)
Browse files Browse the repository at this point in the history 
* refactor: extract state notification logic

* refactor tests
  • Loading branch information
@setchy @adufr
setchy authored and adufr committed Mar 25, 2024
1 parent 0be4553 commit c3c4a7d
Show file tree
Hide file tree
Showing 6 changed files with 543 additions and 379 deletions.
80 changes: 0 additions & 80 deletions src/__mocks__/mockedData.ts
View file
Expand Up @@ -497,83 +497,3 @@ export const mockedGraphQLResponse: GraphQLSearch<DiscussionSearchResultEdge> =
},
},
};

export const mockedDiscussionNotifications = [
{
id: 1,
updated_at: '2024-02-26T00:00:00Z',
repository: {
full_name: 'some/repo',
},
subject: {
title: 'This is an answered discussion',
type: 'Discussion',
},
},
{
id: 2,
updated_at: '2024-02-26T00:00:00Z',
repository: {
full_name: 'some/repo',
},
subject: {
title: 'This is a duplicate discussion',
type: 'Discussion',
},
},
{
id: 3,
updated_at: '2024-02-26T00:00:00Z',
repository: {
full_name: 'some/repo',
},
subject: {
title: 'This is an open discussion',
type: 'Discussion',
},
},
{
id: 4,
updated_at: '2024-02-26T00:00:00Z',
repository: {
full_name: 'some/repo',
},
subject: {
title: 'This is nm outdated discussion',
type: 'Discussion',
},
},
{
id: 5,
updated_at: '2024-02-26T00:00:00Z',
repository: {
full_name: 'some/repo',
},
subject: {
title: 'This is a reopened discussion',
type: 'Discussion',
},
},
{
id: 6,
updated_at: '2024-02-26T00:00:00Z',
repository: {
full_name: 'some/repo',
},
subject: {
title: 'This is a resolved discussion',
type: 'Discussion',
},
},
{
id: 7,
updated_at: '2024-02-26T00:00:00Z',
repository: {
full_name: 'some/repo',
},
subject: {
title: 'This is a default discussion',
type: 'Discussion',
},
},
];
232 changes: 25 additions & 207 deletions src/hooks/useNotifications.test.ts
View file
Expand Up @@ -3,10 +3,7 @@ import axios from 'axios';
import nock from 'nock';

import { mockAccounts, mockSettings } from '../__mocks__/mock-state';
import {
mockedDiscussionNotifications,
mockedUser,
} from '../__mocks__/mockedData';
import { mockedUser } from '../__mocks__/mockedData';
import { AuthState } from '../types';
import { useNotifications } from './useNotifications';

Expand Down Expand Up @@ -195,107 +192,45 @@ describe('hooks/useNotifications.ts', () => {
{
id: 1,
subject: {
title: 'This is a notification.',
type: 'Issue',
title: 'This is a Discussion.',
type: 'Discussion',
url: 'https://api.github.com/1',
},
repository: {
full_name: 'some/repo',
},
updated_at: '2024-02-26T00:00:00Z',
},
{
id: 2,
subject: {
title: 'A merged PR.',
type: 'PullRequest',
title: 'This is an Issue.',
type: 'Issue',
url: 'https://api.github.com/2',
},
},
{
id: 3,
subject: {
title: 'A closed PR.',
title: 'This is a Pull Request.',
type: 'PullRequest',
url: 'https://api.github.com/3',
},
},
{
id: 4,
subject: {
title: 'A draft PR.',
type: 'PullRequest',
title: 'This is an invitation.',
type: 'RepositoryInvitation',
url: 'https://api.github.com/4',
},
},
{
id: 5,
subject: {
title: 'A draft PR.',
type: 'PullRequest',
url: 'https://api.github.com/5',
},
},
];

nock('https://api.github.com')
.get('/notifications?participating=false')
.reply(200, notifications);

nock('https://api.github.com').get('/1').reply(200, { state: 'open' });
nock('https://api.github.com')
.get('/2')
.reply(200, { state: 'closed', merged: true });
nock('https://api.github.com')
.get('/3')
.reply(200, { state: 'closed', merged: false });
nock('https://api.github.com')
.get('/4')
.reply(200, { state: 'open', draft: false });
nock('https://api.github.com')
.get('/5')
.reply(200, { state: 'open', draft: true });

const { result } = renderHook(() => useNotifications(true));

act(() => {
result.current.fetchNotifications(accounts, {
...mockSettings,
colors: true,
});
});

expect(result.current.isFetching).toBe(true);

await waitFor(() => {
expect(result.current.notifications[0].hostname).toBe('github.com');
});

expect(result.current.notifications[0].notifications.length).toBe(5);
expect(
result.current.notifications[0].notifications[0].subject.state,
).toBe('open');
expect(
result.current.notifications[0].notifications[1].subject.state,
).toBe('merged');
expect(
result.current.notifications[0].notifications[2].subject.state,
).toBe('closed');
expect(
result.current.notifications[0].notifications[3].subject.state,
).toBe('open');
expect(
result.current.notifications[0].notifications[4].subject.state,
).toBe('draft');
});

it('should fetch discussion notifications with success - with colors', async () => {
const accounts: AuthState = {
...mockAccounts,
enterpriseAccounts: [],
user: mockedUser,
};

nock('https://api.github.com')
.get('/notifications?participating=false')
.reply(200, mockedDiscussionNotifications);

nock('https://api.github.com')
.post('/graphql')
.reply(200, {
Expand All @@ -313,117 +248,19 @@ describe('hooks/useNotifications.ts', () => {
],
},
},
})
.post('/graphql')
.reply(200, {
data: {
search: {
edges: [
{
node: {
title: 'This is a duplicate discussion',
viewerSubscription: 'SUBSCRIBED',
stateReason: 'DUPLICATE',
isAnswered: false,
},
},
],
},
},
})
.post('/graphql')
.reply(200, {
data: {
search: {
edges: [
{
node: {
title: 'This is an open discussion',
viewerSubscription: 'SUBSCRIBED',
stateReason: null,
isAnswered: false,
},
},
{
node: {
title: 'This is an open discussion',
viewerSubscription: 'IGNORED',
stateReason: null,
isAnswered: false,
},
},
],
},
},
})
.post('/graphql')
.reply(200, {
data: {
search: {
edges: [
{
node: {
title: 'This is nm outdated discussion',
viewerSubscription: 'SUBSCRIBED',
stateReason: 'OUTDATED',
isAnswered: false,
},
},
],
},
},
})
.post('/graphql')
.reply(200, {
data: {
search: {
edges: [
{
node: {
title: 'This is a reopened discussion',
viewerSubscription: 'SUBSCRIBED',
stateReason: 'REOPENED',
isAnswered: false,
},
},
],
},
},
})
.post('/graphql')
.reply(200, {
data: {
search: {
edges: [
{
node: {
title: 'This is a resolved discussion',
viewerSubscription: 'SUBSCRIBED',
stateReason: 'RESOLVED',
isAnswered: false,
},
},
],
},
},
})
.post('/graphql')
.reply(200, {
data: {
search: {
edges: [
{
node: {
title: 'unknown search result',
viewerSubscription: 'SUBSCRIBED',
stateReason: null,
isAnswered: false,
},
},
],
},
},
});
nock('https://api.github.com')
.get('/2')
.reply(200, { state: 'closed', merged: true });
nock('https://api.github.com')
.get('/3')
.reply(200, { state: 'closed', merged: false });
nock('https://api.github.com')
.get('/4')
.reply(200, { state: 'open', draft: false });
nock('https://api.github.com')
.get('/5')
.reply(200, { state: 'open', draft: true });

const { result } = renderHook(() => useNotifications(true));

Expand All @@ -440,26 +277,7 @@ describe('hooks/useNotifications.ts', () => {
expect(result.current.notifications[0].hostname).toBe('github.com');
});

const resultNotifications = result.current.notifications[0];

expect(resultNotifications.notifications.length).toBe(7);
expect(resultNotifications.notifications[0].subject.state).toBe(
'ANSWERED',
);
expect(resultNotifications.notifications[1].subject.state).toBe(
'DUPLICATE',
);
expect(resultNotifications.notifications[2].subject.state).toBe('OPEN');
expect(resultNotifications.notifications[3].subject.state).toBe(
'OUTDATED',
);
expect(resultNotifications.notifications[4].subject.state).toBe(
'REOPENED',
);
expect(resultNotifications.notifications[5].subject.state).toBe(
'RESOLVED',
);
expect(resultNotifications.notifications[6].subject.state).toBe('OPEN');
expect(result.current.notifications[0].notifications.length).toBe(4);
});
});
});
Expand Down

0 comments on commit c3c4a7d

Please sign in to comment.