Merge pull request #129 from acquia/feature/site-studio-7.4

Merge `feature/site-studio-7.4` into `develop`
acquia · Dec 16, 2023 · 5582b3a · 5582b3a
1 parent a187a46
commit 5582b3a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/acms/acms.yml b/acms/acms.yml
@@ -17,6 +17,7 @@ starter_kits:
         - shield
       install:
         - acquia_cms_site_studio
+        - sitestudio_claro
         - acquia_cms_page
         - acquia_cms_search
         - acquia_cms_tour

diff --git a/acms/build.yml b/acms/build.yml
@@ -2,6 +2,7 @@ sites:
   default:
     modules:
       - acquia_cms_site_studio
+      - sitestudio_claro
       - acquia_cms_article
       - acquia_cms_document
       - acquia_cms_event

diff --git a/src/Helpers/Task/InstallTask.php b/src/Helpers/Task/InstallTask.php
@@ -229,6 +229,14 @@ public function run(array $args): void {
     // Get User password from shared factory or from option argument.
     $password = $siteInstallArgs['account-pass'] ?? SharedFactory::getData('password');
     $this->print("User name: admin, User password: $password", 'info');
+
+    // Enable themes.
+    $this->print("Enabling themes for the starter-kit:", 'headline');
+    $this->enableThemes->execute([
+      'themes' => $this->buildInformation['themes'],
+      'starter_kit' => $this->bundle,
+    ]);
+
     $this->print("Enabling modules for the starter-kit:", 'headline');
     $isDemoContent = FALSE;
     $modulesList = JsonParser::installPackages($bundleModules);
@@ -244,13 +252,6 @@ public function run(array $args): void {
       'keys' => $args['keys'],
     ]);
 
-    // Enable themes.
-    $this->print("Enabling themes for the starter-kit:", 'headline');
-    $this->enableThemes->execute([
-      'themes' => $this->buildInformation['themes'],
-      'starter_kit' => $this->bundle,
-    ]);
-
     // Toggle modules based on environments.
     $this->print("Toggle modules for the starter-kit:", 'headline');
     $this->toggleModules->execute([

diff --git a/tests/unit/CliTest.php b/tests/unit/CliTest.php
@@ -97,6 +97,7 @@ protected function getAcmsFileContents() :array {
             ],
             "install" => [
               "acquia_cms_site_studio",
+              "sitestudio_claro",
               "acquia_cms_page",
               "acquia_cms_search",
               "acquia_cms_tour",