Fix e2e tests

Author: pol-rivero

.github/workflows/ci.yml

@@ -278,17 +278,17 @@ jobs:
       - name: Install app on macOS
         if: runner.os == 'macOS'
         run: |
-          rm -rf "/Applications/GitHub Desktop.app"
-          ditto "dist/GitHub Desktop-darwin-arm64/GitHub Desktop.app" "/Applications/GitHub Desktop.app"
-          echo "DESKTOP_E2E_APP_PATH=/Applications/GitHub Desktop.app/Contents/MacOS/GitHub Desktop" >> "$GITHUB_ENV"
+          rm -rf "/Applications/GitHub Desktop Plus.app"
+          ditto "dist/GitHub Desktop Plus-darwin-arm64/GitHub Desktop Plus.app" "/Applications/GitHub Desktop Plus.app"
+          echo "DESKTOP_E2E_APP_PATH=/Applications/GitHub Desktop Plus.app/Contents/MacOS/GitHub Desktop Plus" >> "$GITHUB_ENV"
       - name: Install app on Windows
         if: runner.os == 'Windows'
         shell: pwsh
         run: |
           function Write-SquirrelLogs {
             $logPaths = @(
               "$env:LOCALAPPDATA\SquirrelSetup.log",
-              "$env:LOCALAPPDATA\GitHubDesktop\SquirrelSetup.log"
+              "$env:LOCALAPPDATA\GitHubDesktopPlus\SquirrelSetup.log"
             )
 
             foreach ($logPath in $logPaths) {
@@ -299,7 +299,14 @@ jobs:
             }
           }
 
-          $setupExe = "dist/GitHubDesktopSetup-${{ matrix.arch }}.exe"
+          $setupExe = Get-ChildItem "dist/GitHubDesktopPlus-*-windows-${{ matrix.arch }}.exe" -ErrorAction SilentlyContinue |
+            Sort-Object FullName -Descending |
+            Select-Object -First 1 -ExpandProperty FullName
+
+          if (-not $setupExe) {
+            throw "Unable to locate Windows installer executable"
+          }
+
           $installer = Start-Process -FilePath $setupExe -ArgumentList "/S" -PassThru
 
           try {
@@ -309,11 +316,11 @@ jobs:
             throw "Windows installer timed out after 300 seconds"
           }
 
-          Get-Process GitHubDesktop -ErrorAction SilentlyContinue | Stop-Process -Force
+          Get-Process GitHubDesktopPlus -ErrorAction SilentlyContinue | Stop-Process -Force
 
           $installedExe = $null
           for ($attempt = 0; $attempt -lt 30 -and -not $installedExe; $attempt++) {
-            $installedExe = Get-ChildItem "$env:LOCALAPPDATA\GitHubDesktop\app-*\GitHubDesktop.exe" -ErrorAction SilentlyContinue |
+            $installedExe = Get-ChildItem "$env:LOCALAPPDATA\GitHubDesktopPlus\app-*\GitHubDesktopPlus.exe" -ErrorAction SilentlyContinue |
               Sort-Object FullName -Descending |
               Select-Object -First 1 -ExpandProperty FullName
 

app/src/ui/branches/branch-list.tsx

@@ -373,7 +373,7 @@ export class BranchList extends React.Component<IBranchListProps> {
 
   private onRenderNewButton = () => {
     return this.props.canCreateNewBranch ? (
-      <Button onClick={this.onCreateNewBranch}>
+      <Button className="new-branch-button" onClick={this.onCreateNewBranch}>
         <Octicon symbol={octicons.plus} className="mr" />
         {__DARWIN__ ? 'New Branch' : 'New branch'}
       </Button>

app/test/e2e/app-launch.e2e.ts

@@ -252,10 +252,7 @@ test.describe('GitHub Desktop - App Launch', () => {
 // ── Auto-update tests ───────────────────────────────────────────────
 
 test.describe('Auto-update', () => {
-  test.skip(
-    process.platform === 'win32' && !process.env.DESKTOP_E2E_APP_PATH,
-    'Windows auto-update requires an installed Squirrel app, not a packaged app directory.'
-  )
+  test.skip(true, 'Auto-update has been removed in GitHub Desktop Plus.')
 
   test.describe('startup update check', () => {
     test('sends an update check to the mock server on launch', async ({

app/test/e2e/e2e-fixtures.ts

@@ -101,7 +101,7 @@ export function terminateWindowsUpdaterProcesses() {
     return
   }
 
-  for (const imageName of ['Update.exe', 'GitHubDesktop.exe']) {
+  for (const imageName of ['Update.exe', 'GitHubDesktopPlus.exe']) {
     spawnSync('taskkill', ['/F', '/T', '/IM', imageName], {
       stdio: 'ignore',
       windowsHide: true,

script/testing-docker/entrypoint.sh

@@ -6,7 +6,6 @@ set -e
 cd /app
 
 yarn test:unit
-yarn test:eslint
 yarn test:script
 
 echo '-------------------'