Fix new upstream tests

Author: pol-rivero

app/test/helpers/mock-api.ts

@@ -22,7 +22,11 @@ type APIMethodOverrides = {
  * ```
  */
 export function createMockAPI(overrides: APIMethodOverrides = {}): API {
-  const api = new API('https://api.github.com', 'mock-token-for-testing')
+  const api = new API(
+    'https://api.github.com',
+    'mock-token-for-testing',
+    'mock-login-for-testing'
+  )
   const mockedMethods = new Set(Object.keys(overrides))
 
   for (const [method, impl] of Object.entries(overrides)) {

app/test/unit/app-store-test-harness-test.ts

@@ -41,6 +41,8 @@ describe('app-store-test-harness', () => {
         'test-user',
         getDotComAPIEndpoint(),
         'test-token',
+        '',
+        0,
         [],
         '',
         1,

app/test/unit/cloning-repositories-store-test.ts

@@ -14,7 +14,8 @@ describe('CloningRepositoriesStore', () => {
       const store = new CloningRepositoriesStore()
       const repo = new CloningRepository(
         '/tmp/test',
-        'https://github.com/owner/repo.git'
+        'https://github.com/owner/repo.git',
+        null
       )
 
       // Manually push to simulate the clone starting
@@ -29,7 +30,8 @@ describe('CloningRepositoriesStore', () => {
       const store = new CloningRepositoriesStore()
       const repo = new CloningRepository(
         '/tmp/test',
-        'https://github.com/owner/repo.git'
+        'https://github.com/owner/repo.git',
+        null
       )
 
       // Should not throw
@@ -43,7 +45,8 @@ describe('CloningRepositoriesStore', () => {
       const store = new CloningRepositoriesStore()
       const repo = new CloningRepository(
         '/tmp/test',
-        'https://github.com/owner/repo.git'
+        'https://github.com/owner/repo.git',
+        null
       )
       assert.equal(store.getRepositoryState(repo), null)
     })
@@ -59,7 +62,8 @@ describe('CloningRepositoriesStore', () => {
 
       const repo = new CloningRepository(
         '/tmp/test',
-        'https://github.com/owner/repo.git'
+        'https://github.com/owner/repo.git',
+        null
       )
       store.remove(repo) // triggers emitUpdate
 

app/test/unit/cloning-repository-test.ts

@@ -39,11 +39,13 @@ describe('CloningRepository', () => {
     it('generates unique IDs', () => {
       const firstRepository = new CloningRepository(
         '/tmp/a',
-        'https://github.com/owner/a.git'
+        'https://github.com/owner/a.git',
+        null
       )
       const secondRepository = new CloningRepository(
         '/tmp/b',
-        'https://github.com/owner/b.git'
+        'https://github.com/owner/b.git',
+        null
       )
 
       assert.notEqual(firstRepository.id, secondRepository.id)
@@ -52,7 +54,8 @@ describe('CloningRepository', () => {
     it('generates a hash from the repository identity', () => {
       const repository = new CloningRepository(
         '/tmp/test',
-        'https://github.com/owner/repo.git'
+        'https://github.com/owner/repo.git',
+        null
       )
 
       assert.ok(repository.hash.length > 0)

app/test/unit/git/clone-test.ts

@@ -31,7 +31,7 @@ describe('git/clone', () => {
     const destPath = await createTempDirectory(t)
     const clonePath = path.join(destPath, 'cloned')
 
-    await clone(source.path, clonePath, {})
+    await clone(source.path, clonePath, {}, null)
 
     assert.equal(existsSync(path.join(clonePath, '.git')), true)
     assert.equal(existsSync(path.join(clonePath, 'README.md')), true)
@@ -56,7 +56,7 @@ describe('git/clone', () => {
     const destPath = await createTempDirectory(t)
     const clonePath = path.join(destPath, 'cloned')
 
-    await clone(source.path, clonePath, { branch: 'feature' })
+    await clone(source.path, clonePath, { branch: 'feature' }, null)
 
     // Verify the feature branch was checked out
     const result = await exec(['rev-parse', '--abbrev-ref', 'HEAD'], clonePath)
@@ -75,7 +75,7 @@ describe('git/clone', () => {
     const clonePath = path.join(destPath, 'cloned')
 
     const progressEvents: Array<{ kind: string }> = []
-    await clone(source.path, clonePath, {}, progress => {
+    await clone(source.path, clonePath, {}, null, progress => {
       progressEvents.push({ kind: progress.kind })
     })
 
@@ -104,7 +104,7 @@ describe('git/clone', () => {
     const destPath = await createTempDirectory(t)
     const clonePath = path.join(destPath, 'cloned')
 
-    await clone(source, clonePath, { defaultBranch: 'trunk' })
+    await clone(source, clonePath, { defaultBranch: 'trunk' }, null)
 
     assert.equal(existsSync(path.join(clonePath, '.git')), true)
 

app/test/unit/ipc-contract-test.ts

@@ -69,6 +69,9 @@ describe('IPC channel contract', () => {
     'show-installing-update',
     'install-windows-cli',
     'uninstall-windows-cli',
+    'open-repository-in-new-window',
+    'set-window-title',
+    'restart-app',
   ] as const
 
   const expectedResponseChannels = [
@@ -98,6 +101,8 @@ describe('IPC channel contract', () => {
     'show-notification',
     'get-notifications-permission',
     'request-notifications-permission',
+    'update-main-process-config',
+    'get-main-process-config',
   ] as const
 
   describe('RequestChannels', () => {

app/test/unit/model-type-guards-test.ts

@@ -18,7 +18,9 @@ function createGitHubRepository(): Repository {
   const owner = new Owner('owner', 'https://api.github.com', 1)
   const ghRepo = new GitHubRepository(
     'repo',
+    'github',
     owner,
+    null,
     1,
     false,
     'https://github.com/owner/repo',
@@ -35,7 +37,9 @@ function createForkedGitHubRepository(): Repository {
   const upstreamOwner = new Owner('upstream-owner', 'https://api.github.com', 1)
   const parentGhRepo = new GitHubRepository(
     'repo',
+    'github',
     upstreamOwner,
+    null,
     1,
     false,
     'https://github.com/upstream-owner/repo',
@@ -48,7 +52,9 @@ function createForkedGitHubRepository(): Repository {
   const forkOwner = new Owner('fork-owner', 'https://api.github.com', 2)
   const forkedGhRepo = new GitHubRepository(
     'repo',
+    'github',
     forkOwner,
+    null,
     2,
     false,
     'https://github.com/fork-owner/repo',

app/test/unit/sign-in-store-test.ts

@@ -31,6 +31,8 @@ function createDotComAccount(login = 'octocat'): Account {
     login,
     getDotComAPIEndpoint(),
     'test-token',
+    '',
+    0,
     [],
     'https://avatars.githubusercontent.com/u/1',
     1,
@@ -43,7 +45,18 @@ function createEnterpriseAccount(
   login = 'enterprise-user',
   endpoint = 'https://github.example.com/api/v3'
 ): Account {
-  return new Account(login, endpoint, 'ent-token', [], '', 2, login, 'free')
+  return new Account(
+    login,
+    endpoint,
+    'ent-token',
+    '',
+    0,
+    [],
+    '',
+    2,
+    login,
+    'free'
+  )
 }
 
 describe('SignInStore', () => {
@@ -74,7 +87,7 @@ describe('SignInStore', () => {
       }
     })
 
-    it('transitions to ExistingAccountWarning when a dotcom account exists', async () => {
+    it('transitions to Authentication even if a dotcom account exists', async () => {
       const existingAccount = createDotComAccount()
       accountsStore = createAccountsStore()
       signInStore = new SignInStore(accountsStore)
@@ -84,7 +97,7 @@ describe('SignInStore', () => {
       signInStore.beginDotComSignIn()
       const state = signInStore.getState()
       assert.notEqual(state, null)
-      assert.equal(state?.kind, SignInStep.ExistingAccountWarning)
+      assert.equal(state?.kind, SignInStep.Authentication)
     })
 
     it('calls resultCallback when provided', async () => {
@@ -171,7 +184,7 @@ describe('SignInStore', () => {
       }
     })
 
-    it('shows ExistingAccountWarning if enterprise account exists', async () => {
+    it('shows Authentication even if enterprise account exists', async () => {
       const endpoint = 'https://github.example.com/api/v3'
       const existingAccount = createEnterpriseAccount('user', endpoint)
       accountsStore = createAccountsStore()
@@ -183,7 +196,7 @@ describe('SignInStore', () => {
       await signInStore.setEndpoint('https://github.example.com')
 
       const state = signInStore.getState()
-      assert.equal(state?.kind, SignInStep.ExistingAccountWarning)
+      assert.equal(state?.kind, SignInStep.Authentication)
     })
   })