Skip to content

Increased test coverage for Acquia env settings. #2298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlexSkrypnyk merged 1 commit into from
Feb 17, 2026
Merged

Increased test coverage for Acquia env settings. #2298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...taller/tests/Fixtures/handler_process/_baseline/tests/phpunit/Drupal/SettingsTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ protected function unsetEnvVars(): void {
/**
* Require settings file.
*/
protected function requireSettingsFile(): void {
protected function requireSettingsFile(array $pre_settings = []): void {
$app_root = getcwd() . '/web';

if (!file_exists($app_root)) {
Expand All @@ -210,7 +210,7 @@ protected function requireSettingsFile(): void {

$site_path = 'sites/default';
$config = [];
$settings = [];
$settings = $pre_settings;
$databases = [];

require $app_root . DIRECTORY_SEPARATOR . $site_path . DIRECTORY_SEPARATOR . 'settings.php';
Expand Down
56 changes: 55 additions & 1 deletion .../Fixtures/handler_process/hosting_acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
];
}

@@ -325,6 +369,229 @@
@@ -325,6 +369,283 @@
$settings['skip_permissions_hardening'] = TRUE;
$settings['config_sync_directory'] = '../config/default';
$settings['suspend_mail_send'] = TRUE;
Expand Down Expand Up @@ -275,6 +275,60 @@
+ 'bower_components',
+ ];
+ $settings['hash_salt'] = hash('sha256', getenv('DATABASE_HOST') ?: 'localhost');
+ $settings['maintenance_theme'] = 'claro';
+ $settings['trusted_host_patterns'] = [
+ '^localhost$',
+ ];
+ $this->assertSettings($settings);
+ }
+
+ /**
+ * Test Acquia config_sync_directory fallback to config_vcs_directory.
+ *
+ * When DRUPAL_CONFIG_PATH is not set but config_vcs_directory is provided
+ * by the Acquia-included settings file, config_sync_directory should fall
+ * back to config_vcs_directory.
+ */
+ public function testEnvironmentAcquiaConfigVcsDirectoryFallback(): void {
+ $this->setEnvVars([
+ 'AH_SITE_ENVIRONMENT' => 1,
+ ]);
+
+ // Pre-seed config_vcs_directory to simulate the value set by the
+ // Acquia-included settings file from /var/www/site-php/.
+ $this->requireSettingsFile([
+ 'config_vcs_directory' => '/var/www/site-php/mysite/config',
+ ]);
+
+ $config['acquia_hosting_settings_autoconnect'] = FALSE;
+ $config['config_split.config_split.dev']['status'] = TRUE;
+ $config['environment_indicator.indicator']['bg_color'] = '#4caf50';
+ $config['environment_indicator.indicator']['fg_color'] = '#000000';
+ $config['environment_indicator.indicator']['name'] = self::ENVIRONMENT_DEV;
+ $config['environment_indicator.settings']['favicon'] = TRUE;
+ $config['environment_indicator.settings']['toolbar_integration'] = [TRUE];
+ $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /";
+ $config['shield.settings']['shield_enable'] = TRUE;
+ $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE;
+ $config['xmlsitemap_engines.settings']['submit'] = FALSE;
+ $config['system.performance']['cache']['page']['max_age'] = 900;
+ $this->assertConfig($config);
+
+ $settings['auto_create_htaccess'] = TRUE;
+ $settings['config_exclude_modules'] = [];
+ $settings['config_sync_directory'] = '/var/www/site-php/mysite/config';
+ $settings['config_vcs_directory'] = '/var/www/site-php/mysite/config';
+ $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml';
+ $settings['entity_update_batch_size'] = 50;
+ $settings['environment'] = self::ENVIRONMENT_DEV;
+ $settings['file_public_path'] = 'sites/default/files';
+ $settings['file_private_path'] = 'sites/default/files/private';
+ $settings['file_temp_path'] = '/tmp';
+ $settings['file_scan_ignore_directories'] = [
+ 'node_modules',
+ 'bower_components',
+ ];
+ $settings['hash_salt'] = hash('sha256', getenv('DATABASE_HOST') ?: 'localhost');
+ $settings['maintenance_theme'] = 'claro';
$settings['trusted_host_patterns'] = [
'^localhost$',
Expand Down
2 changes: 1 addition & 1 deletion ...r/tests/Fixtures/handler_process/hosting_acquia/tests/phpunit/Drupal/SettingsTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@@ -202,7 +202,7 @@
* Require settings file.
*/
protected function requireSettingsFile(): void {
protected function requireSettingsFile(array $pre_settings = []): void {
- $app_root = getcwd() . '/web';
+ $app_root = getcwd() . '/docroot';

Expand Down
56 changes: 55 additions & 1 deletion ...er_process/hosting_project_name___acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
];
}

@@ -325,6 +369,229 @@
@@ -325,6 +369,283 @@
$settings['skip_permissions_hardening'] = TRUE;
$settings['config_sync_directory'] = '../config/default';
$settings['suspend_mail_send'] = TRUE;
Expand Down Expand Up @@ -275,6 +275,60 @@
+ 'bower_components',
+ ];
+ $settings['hash_salt'] = hash('sha256', getenv('DATABASE_HOST') ?: 'localhost');
+ $settings['maintenance_theme'] = 'claro';
+ $settings['trusted_host_patterns'] = [
+ '^localhost$',
+ ];
+ $this->assertSettings($settings);
+ }
+
+ /**
+ * Test Acquia config_sync_directory fallback to config_vcs_directory.
+ *
+ * When DRUPAL_CONFIG_PATH is not set but config_vcs_directory is provided
+ * by the Acquia-included settings file, config_sync_directory should fall
+ * back to config_vcs_directory.
+ */
+ public function testEnvironmentAcquiaConfigVcsDirectoryFallback(): void {
+ $this->setEnvVars([
+ 'AH_SITE_ENVIRONMENT' => 1,
+ ]);
+
+ // Pre-seed config_vcs_directory to simulate the value set by the
+ // Acquia-included settings file from /var/www/site-php/.
+ $this->requireSettingsFile([
+ 'config_vcs_directory' => '/var/www/site-php/mysite/config',
+ ]);
+
+ $config['acquia_hosting_settings_autoconnect'] = FALSE;
+ $config['config_split.config_split.dev']['status'] = TRUE;
+ $config['environment_indicator.indicator']['bg_color'] = '#4caf50';
+ $config['environment_indicator.indicator']['fg_color'] = '#000000';
+ $config['environment_indicator.indicator']['name'] = self::ENVIRONMENT_DEV;
+ $config['environment_indicator.settings']['favicon'] = TRUE;
+ $config['environment_indicator.settings']['toolbar_integration'] = [TRUE];
+ $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /";
+ $config['shield.settings']['shield_enable'] = TRUE;
+ $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE;
+ $config['xmlsitemap_engines.settings']['submit'] = FALSE;
+ $config['system.performance']['cache']['page']['max_age'] = 900;
+ $this->assertConfig($config);
+
+ $settings['auto_create_htaccess'] = TRUE;
+ $settings['config_exclude_modules'] = [];
+ $settings['config_sync_directory'] = '/var/www/site-php/mysite/config';
+ $settings['config_vcs_directory'] = '/var/www/site-php/mysite/config';
+ $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml';
+ $settings['entity_update_batch_size'] = 50;
+ $settings['environment'] = self::ENVIRONMENT_DEV;
+ $settings['file_public_path'] = 'sites/default/files';
+ $settings['file_private_path'] = 'sites/default/files/private';
+ $settings['file_temp_path'] = '/tmp';
+ $settings['file_scan_ignore_directories'] = [
+ 'node_modules',
+ 'bower_components',
+ ];
+ $settings['hash_salt'] = hash('sha256', getenv('DATABASE_HOST') ?: 'localhost');
+ $settings['maintenance_theme'] = 'claro';
$settings['trusted_host_patterns'] = [
'^localhost$',
Expand Down
2 changes: 1 addition & 1 deletion ...s/handler_process/hosting_project_name___acquia/tests/phpunit/Drupal/SettingsTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@@ -202,7 +202,7 @@
* Require settings file.
*/
protected function requireSettingsFile(): void {
protected function requireSettingsFile(array $pre_settings = []): void {
- $app_root = getcwd() . '/web';
+ $app_root = getcwd() . '/docroot';

Expand Down
55 changes: 55 additions & 0 deletions tests/phpunit/Drupal/EnvironmentSettingsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,6 +847,61 @@ public function testEnvironmentAcquiaConfigPathOverride(): void {
];
$this->assertSettings($settings);
}

/**
* Test Acquia config_sync_directory fallback to config_vcs_directory.
*
* When DRUPAL_CONFIG_PATH is not set but config_vcs_directory is provided
* by the Acquia-included settings file, config_sync_directory should fall
* back to config_vcs_directory.
*/
public function testEnvironmentAcquiaConfigVcsDirectoryFallback(): void {
$this->setEnvVars([
'AH_SITE_ENVIRONMENT' => 1,
]);

// Pre-seed config_vcs_directory to simulate the value set by the
// Acquia-included settings file from /var/www/site-php/.
$this->requireSettingsFile([
'config_vcs_directory' => '/var/www/site-php/mysite/config',
]);

$config['acquia_hosting_settings_autoconnect'] = FALSE;
$config['config_split.config_split.dev']['status'] = TRUE;
$config['environment_indicator.indicator']['bg_color'] = '#4caf50';
$config['environment_indicator.indicator']['fg_color'] = '#000000';
$config['environment_indicator.indicator']['name'] = self::ENVIRONMENT_DEV;
$config['environment_indicator.settings']['favicon'] = TRUE;
$config['environment_indicator.settings']['toolbar_integration'] = [TRUE];
$config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /";
$config['shield.settings']['shield_enable'] = TRUE;
$config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE;
$config['xmlsitemap_engines.settings']['submit'] = FALSE;
$config['system.performance']['cache']['page']['max_age'] = 900;
$this->assertConfig($config);

$settings['auto_create_htaccess'] = TRUE;
$settings['config_exclude_modules'] = [];
$settings['config_sync_directory'] = '/var/www/site-php/mysite/config';
$settings['config_vcs_directory'] = '/var/www/site-php/mysite/config';
$settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml';
$settings['entity_update_batch_size'] = 50;
$settings['environment'] = self::ENVIRONMENT_DEV;
$settings['file_public_path'] = 'sites/default/files';
$settings['file_private_path'] = 'sites/default/files/private';
$settings['file_temp_path'] = '/tmp';
$settings['file_scan_ignore_directories'] = [
'node_modules',
'bower_components',
];
$settings['hash_salt'] = hash('sha256', getenv('DATABASE_HOST') ?: 'localhost');
$settings['maintenance_theme'] = 'claro';
$settings['trusted_host_patterns'] = [
'^localhost$',
];
$this->assertSettings($settings);
}

// phpcs:ignore #;> SETTINGS_PROVIDER_ACQUIA
// phpcs:ignore #;< SETTINGS_PROVIDER_LAGOON
/**
Expand Down
4 changes: 2 additions & 2 deletions tests/phpunit/Drupal/SettingsTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ protected function unsetEnvVars(): void {
/**
* Require settings file.
*/
protected function requireSettingsFile(): void {
protected function requireSettingsFile(array $pre_settings = []): void {
$app_root = getcwd() . '/web';

if (!file_exists($app_root)) {
Expand All @@ -214,7 +214,7 @@ protected function requireSettingsFile(): void {

$site_path = 'sites/default';
$config = [];
$settings = [];
$settings = $pre_settings;
$databases = [];

require $app_root . DIRECTORY_SEPARATOR . $site_path . DIRECTORY_SEPARATOR . 'settings.php';
Expand Down