Adding new assertion for absolute path

acquia · Aug 3, 2022 · 5d9e259 · 5d9e259
1 parent d2610ea
commit 5d9e259
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/Command/App/NewCommand.php b/src/Command/App/NewCommand.php
@@ -57,12 +57,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     $output->writeln('<info>Creating project. This may take a few minutes.</info>');
 
     if ($project === 'acquia_next_acms') {
-      $success_message = "<info>New Next JS project created in $dir. 🎉";
+      $success_message = "<info>New Next JS project created in $dir. 🎉</info>";
       $this->localMachineHelper->checkRequiredBinariesExist(['node']);
       $this->createNextJsProject($dir);
     }
     else {
-      $success_message = "<info>New 💧 Drupal project created in $dir. 🎉";
+      $success_message = "<info>New 💧 Drupal project created in $dir. 🎉</info>";
       $this->localMachineHelper->checkRequiredBinariesExist(['composer']);
       $this->createDrupalProject($distros[$project], $dir);
     }
@@ -89,7 +89,7 @@ protected function commandRequiresAuthentication(InputInterface $input): bool {
    *
    * @throws \Exception
    */
-  protected function createNextJsProject(string $dir): void {
+  private function createNextJsProject(string $dir): void {
     $process = $this->localMachineHelper->execute([
       'npx',
       'create-next-app',

diff --git a/tests/phpunit/src/Commands/NewCommandTest.php b/tests/phpunit/src/Commands/NewCommandTest.php
@@ -61,7 +61,7 @@ public function testNewDrupalCommand(array $package, string $directory = 'drupal
 
     $local_machine_helper = $this->mockLocalMachineHelper();
 
-    $this->mockGetFilesystem($local_machine_helper);
+    $mock_file_system = $this->mockGetFilesystem($local_machine_helper);
     $local_machine_helper->checkRequiredBinariesExist(["composer"])->shouldBeCalled();
     $this->mockExecuteComposerCreate($this->newProjectDir, $local_machine_helper, $process, $project);
     $local_machine_helper->checkRequiredBinariesExist(["git"])->shouldBeCalled();
@@ -79,10 +79,11 @@ public function testNewDrupalCommand(array $package, string $directory = 'drupal
     ], $inputs);
     $this->prophet->checkPredictions();
     $output = $this->getDisplay();
+    $this->assertStringContainsString('Acquia recommends most customers use acquia/drupal-recommended-project to setup a Drupal project', $output);
     $this->assertStringContainsString('Choose a starting project', $output);
     $this->assertStringContainsString($project, $output);
+    $this->assertTrue($mock_file_system->isAbsolutePath($this->newProjectDir), 'Directory path is not absolute');
     $this->assertStringContainsString('New 💧 Drupal project created in ' . $this->newProjectDir, $output);
-
   }
 
   /**
@@ -106,7 +107,7 @@ public function testNewNextJSAppCommand(array $package, string $directory = 'nex
 
     $local_machine_helper = $this->mockLocalMachineHelper();
 
-    $this->mockGetFilesystem($local_machine_helper);
+    $mock_file_system = $this->mockGetFilesystem($local_machine_helper);
 
     $local_machine_helper->checkRequiredBinariesExist(["node"])->shouldBeCalled();
     $this->mockExecuteNpxCreate($this->newProjectDir, $local_machine_helper, $process);
@@ -125,8 +126,10 @@ public function testNewNextJSAppCommand(array $package, string $directory = 'nex
     ], $inputs);
     $this->prophet->checkPredictions();
     $output = $this->getDisplay();
+    $this->assertStringContainsString('acquia/next-acms is a starter template for building a headless site', $output);
     $this->assertStringContainsString('Choose a starting project', $output);
     $this->assertStringContainsString($project, $output);
+    $this->assertTrue($mock_file_system->isAbsolutePath($this->newProjectDir), 'Directory path is not absolute');
     $this->assertStringContainsString('New Next JS project created in ' . $this->newProjectDir, $output);
   }