Merge branch 'main' into feat/codegen-discussions

Signed-off-by: Adam Setch <[email protected]>

Author: setchy

CONTRIBUTING.md

@@ -18,6 +18,11 @@ pnpm install
 > OAUTH_CLIENT_ID="123" OAUTH_CLIENT_SECRET="456789" pnpm build
 > ```
 
+Copy the `.env.template` to `.env` and add update `GITHUB_TOKEN` with a GitHub Personal Access Token.  This is used for fetching the latest GitHub GraphQL API schema for `graphql-codegen`.
+```shell
+GITHUB_TOKEN=<some personal access token>
+```  
+
 To watch for changes (`webpack`) in the `src` directory:
 
 ```shell

jest.config.ts

@@ -2,6 +2,7 @@ import type { Config } from 'jest';
 
 const config: Config = {
   preset: 'ts-jest',
+  globalSetup: '<rootDir>/src/renderer/__helpers__/jest.setup.env.ts',
   setupFilesAfterEnv: ['<rootDir>/src/renderer/__helpers__/jest.setup.ts'],
   testEnvironment: 'jsdom',
   collectCoverage: true,

src/renderer/__helpers__/jest.setup.env.ts

@@ -0,0 +1,12 @@
+/**
+ * Jest Global Setup
+ * This runs once before all test suites
+ */
+export default () => {
+  // Sets timezone to UTC for consistent date/time in tests and snapshots
+  process.env.TZ = 'UTC';
+
+  // Mock OAuth client ID and secret
+  process.env.OAUTH_CLIENT_ID = 'FAKE_CLIENT_ID_123';
+  process.env.OAUTH_CLIENT_SECRET = 'FAKE_CLIENT_SECRET_123';
+};

src/renderer/__helpers__/jest.setup.ts

@@ -45,10 +45,6 @@ window.gitify = {
   raiseNativeNotification: jest.fn(),
 };
 
-// Mock OAuth client ID and secret
-process.env.OAUTH_CLIENT_ID = 'FAKE_CLIENT_ID_123';
-process.env.OAUTH_CLIENT_SECRET = 'FAKE_CLIENT_SECRET_123';
-
 globalThis.HTMLMediaElement.prototype.play = jest.fn();
 
 globalThis.matchMedia = (query: string): MediaQueryList => ({

src/renderer/utils/notifications/handlers/issue.ts

@@ -53,7 +53,7 @@ class IssueHandler extends DefaultHandler {
 
     return {
       number: issue.number,
-      state: issue.state_reason ?? issue.state,
+      state: issueState,
       user: getSubjectUser([issueCommentUser, issue.user]),
       comments: issue.comments,
       labels: issue.labels?.map((label) => label.name) ?? [],