reorder sites in question

acquia · Jan 7, 2025 · 3be9d41 · 3be9d41
1 parent e62becf
commit 3be9d41
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/Command/CommandBase.php b/src/Command/CommandBase.php
@@ -1409,6 +1409,10 @@ private function getCloudSites(EnvironmentResponse $cloudEnvironment): array
         $process = $this->sshHelper->executeCommand($cloudEnvironment->sshUrl, $command, false);
         $sites = array_filter(explode("\n", trim($process->getOutput())));
         if ($process->isSuccessful() && $sites) {
+            if ($key = array_search('default', $sites, true)) {
+                unset($sites[$key]);
+                $sites = array_merge([0 => 'default'], $sites);
+            }
             return $sites;
         }
 

diff --git a/src/Command/Pull/PullCommandBase.php b/src/Command/Pull/PullCommandBase.php
@@ -458,10 +458,6 @@ private function determineSite(string|EnvironmentResponse|array $environment, In
             return $input->getArgument('site');
         }
 
-        if (!$this->input->isInteractive()) {
-            return 'default';
-        }
-
         $this->site = $this->promptChooseDrupalSite($environment);
 
         return $this->site;

diff --git a/tests/phpunit/src/Commands/Pull/PullCommandTest.php b/tests/phpunit/src/Commands/Pull/PullCommandTest.php
@@ -55,7 +55,7 @@ public function testPull(): void
         $this->mockGetFilesystem($localMachineHelper);
         $parts = explode('.', $environment->ssh_url);
         $sitegroup = reset($parts);
-        $this->mockExecuteRsync($localMachineHelper, $environment, '/mnt/files/' . $sitegroup . '.' . $environment->name . '/sites/bar/files/', $this->projectDir . '/docroot/sites/bar/files');
+        $this->mockExecuteRsync($localMachineHelper, $environment, '/mnt/files/' . $sitegroup . '.' . $environment->name . '/sites/default/files/', $this->projectDir . '/docroot/sites/default/files');
         $this->command->sshHelper = $sshHelper->reveal();
 
         // Pull database.

diff --git a/tests/phpunit/src/Commands/Pull/PullFilesCommandTest.php b/tests/phpunit/src/Commands/Pull/PullFilesCommandTest.php
@@ -81,7 +81,7 @@ public function testRefreshCloudFiles(): void
         $this->mockGetFilesystem($localMachineHelper);
         $parts = explode('.', $selectedEnvironment->ssh_url);
         $sitegroup = reset($parts);
-        $this->mockExecuteRsync($localMachineHelper, $selectedEnvironment, '/mnt/files/' . $sitegroup . '.' . $selectedEnvironment->name . '/sites/bar/files/', $this->projectDir . '/docroot/sites/bar/files');
+        $this->mockExecuteRsync($localMachineHelper, $selectedEnvironment, '/mnt/files/' . $sitegroup . '.' . $selectedEnvironment->name . '/sites/default/files/', $this->projectDir . '/docroot/sites/default/files');
 
         $this->command->sshHelper = $sshHelper->reveal();
 

diff --git a/tests/phpunit/src/Commands/Push/PushFilesCommandTest.php b/tests/phpunit/src/Commands/Push/PushFilesCommandTest.php
@@ -145,8 +145,8 @@ protected function mockExecuteCloudRsync(
             'rsync',
             '-avPhze',
             'ssh -o StrictHostKeyChecking=no',
-            $this->projectDir . '/docroot/sites/bar/files/',
-            $environment->ssh_url . ':/mnt/files/' . $sitegroup . '.' . $environment->name . '/sites/bar/files',
+            $this->projectDir . '/docroot/sites/default/files/',
+            $environment->ssh_url . ':/mnt/files/' . $sitegroup . '.' . $environment->name . '/sites/default/files',
         ];
         $localMachineHelper->execute($command, Argument::type('callable'), null, true)
             ->willReturn($process->reveal())