fix validation follow-up for oauth branch

Author: jonmartin721

.github/workflows/ci.yml

@@ -2,7 +2,10 @@ name: CI
 
 on:
   push:
-    branches: [ main, master ]
+    branches:
+      - '**'
+    tags-ignore:
+      - 'v*'
   pull_request:
     branches: [ main, master ]
 

options/options.js

@@ -29,7 +29,6 @@ const state = {
   searchQuery: '',
   hidePinnedRepos: false
 };
-let persistedSession = null;
 
 if (typeof document !== 'undefined') {
   document.addEventListener('DOMContentLoaded', async () => {
@@ -200,16 +199,10 @@ function setupEventListeners() {
 
   document.getElementById('addRepoBtn').addEventListener('click', addRepo);
   document.getElementById('connectGitHubBtn').addEventListener('click', async () => {
-    const connectionResult = await connectGitHub(toastManager);
-    if (connectionResult.isValid) {
-      persistedSession = connectionResult.authSession;
-    }
+    await connectGitHub(toastManager);
   });
   document.getElementById('clearTokenBtn').addEventListener('click', async () => {
-    const tokenCleared = await clearToken();
-    if (tokenCleared) {
-      persistedSession = null;
-    }
+    await clearToken();
   });
 
   // Action button toggles
@@ -578,7 +571,6 @@ async function loadSettings() {
     applyTheme(theme);
 
     if (authSession?.accessToken) {
-      persistedSession = authSession;
       applyStoredConnection(authSession);
     } else {
       syncTokenUiWithStoredCredential(false);

package-lock.json

@@ -7,8 +7,8 @@
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
     "test:coverage": "node --experimental-vm-modules node_modules/jest/bin/jest.js --coverage",
     "test:watch": "node --experimental-vm-modules node_modules/jest/bin/jest.js --watch",
-    "lint": "eslint .",
-    "typecheck": "tsc --noEmit -p jsconfig.json",
+    "lint": "node node_modules/eslint/bin/eslint.js .",
+    "typecheck": "node node_modules/typescript/bin/tsc --noEmit -p jsconfig.json",
     "build": "node scripts/build.js",
     "validate": "npm run lint && npm run typecheck && npm run test:coverage && npm run build",
     "format": "prettier --write \"**/*.{js,json,md}\"",

package.json

@@ -88,7 +88,25 @@ describe('Options Main Functions', () => {
       storage: {
         local: {
           get: jest.fn((keys, callback) => {
-            callback({ activities: [], readItems: [] });
+            const requestedKeys = Array.isArray(keys) ? keys : [keys];
+            const result = {};
+
+            requestedKeys.forEach((key) => {
+              if (key === 'activities') {
+                result.activities = [];
+              }
+              if (key === 'readItems') {
+                result.readItems = [];
+              }
+              if (key === 'githubOAuthClientId') {
+                result.githubOAuthClientId = 'Iv1.test-client-id';
+              }
+              if (key === 'encryptedGithubAuthSession') {
+                result.encryptedGithubAuthSession = null;
+              }
+            });
+
+            callback(result);
           }),
           set: jest.fn((data, callback) => {
             if (callback) callback();

tests/options-main.test.js

@@ -21,6 +21,8 @@ global.chrome = {
 jest.unstable_mockModule('../shared/storage-helpers.js', () => ({
   getSyncItems: jest.fn(async () => ({})),
   getLocalItems: jest.fn(async () => ({})),
+  getWatchedRepos: jest.fn(async () => []),
+  setWatchedRepos: jest.fn(async () => {}),
   STORAGE_KEYS: {
     SETTINGS: ['watchedRepos', 'mutedRepos', 'snoozedRepos', 'filters', 'notifications', 'checkInterval', 'theme', 'itemExpiryHours'],
     ACTIVITY: ['activities', 'readItems']