Skip to content

Commit

Permalink
Merge branch 'main' into build/vscode-biome-config
Browse files Browse the repository at this point in the history
  • Loading branch information
setchy authored Aug 9, 2024
2 parents bfb2b9a + 1800c04 commit a6d2e73
Show file tree
Hide file tree
Showing 20 changed files with 191 additions and 263 deletions.
5 changes: 4 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ body:
label: Gitify Version
description: What version of Gitify are you using?
options:
- 5.12.1
- 5.12.0
- 5.11.0
- 5.10.0
- 5.9.0
- 5.8.1
- 5.8.0
Expand All @@ -49,7 +53,6 @@ body:
- 5.2.0
- 5.1.0
- 5.0.0
- 4.6.1
- Other
validations:
required: true
Expand Down
Binary file added assets/images/tray-active-update.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/tray-active-update@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/tray-idle-update.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/tray-idle-update@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gitify",
"version": "5.12.0",
"version": "5.12.1",
"description": "GitHub Notifications on your menu bar.",
"main": "src/electron/main.js",
"scripts": {
Expand Down Expand Up @@ -117,7 +117,8 @@
"react-router-dom": "6.26.0",
"tailwind-merge": "2.4.0",
"ts-loader": "9.5.1",
"typescript": "5.5.4"
"typescript": "5.5.4",
"update-electron-app": "3.0.0"
},
"devDependencies": {
"@biomejs/biome": "1.8.3",
Expand All @@ -137,7 +138,7 @@
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"nock": "13.5.4",
"postcss": "8.4.40",
"postcss": "8.4.41",
"postcss-loader": "8.1.1",
"resize-observer-polyfill": "1.5.1",
"rimraf": "6.0.1",
Expand All @@ -149,7 +150,7 @@
"webpack-cli": "5.1.4",
"webpack-merge": "6.0.1"
},
"packageManager": "pnpm@9.6.0",
"packageManager": "pnpm@9.7.0",
"lint-staged": {
"*": "biome check --fix --no-errors-on-unmatched",
"*.{js,ts,tsx}": "pnpm test -- --findRelatedTests -u --passWithNoTests"
Expand Down
108 changes: 66 additions & 42 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 0 additions & 42 deletions src/components/settings/SettingsFooter.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,48 +76,6 @@ describe('routes/components/settings/SettingsFooter.tsx', () => {
});
});

describe('update available visual indicator', () => {
it('using latest version', async () => {
await act(async () => {
render(
<AppContext.Provider
value={{
auth: mockAuth,
settings: mockSettings,
}}
>
<MemoryRouter>
<SettingsFooter isUpdateAvailable={false} />
</MemoryRouter>
</AppContext.Provider>,
);
});

expect(
screen.getByTitle('You are using the latest version'),
).toMatchSnapshot();
});

it('new version available', async () => {
await act(async () => {
render(
<AppContext.Provider
value={{
auth: mockAuth,
settings: mockSettings,
}}
>
<MemoryRouter>
<SettingsFooter isUpdateAvailable={true} />
</MemoryRouter>
</AppContext.Provider>,
);
});

expect(screen.getByTitle('New version available')).toMatchSnapshot();
});
});

it('should open release notes', async () => {
process.env = {
...originalEnv,
Expand Down
Loading

0 comments on commit a6d2e73

Please sign in to comment.