Fix tests

Chi-teck · Apr 13, 2019 · 6f7bdab · 6f7bdab
1 parent 598b6c5
commit 6f7bdab
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 32 deletions.
diff --git a/tests/dcg/Generator/Drupal_8/_project/_full/scripts/composer/create_required_files.php b/tests/dcg/Generator/Drupal_8/_project/_full/scripts/composer/create_required_files.php
@@ -2,20 +2,11 @@
 <?php
 
 // -- settings.php file.
-$default_settings_file = './docroot/sites/default/default.settings.php';
-$settings_file = './docroot/sites/default/settings.php';
+$default_settings_file = './web/sites/default/default.settings.php';
+$settings_file = './web/sites/default/settings.php';
 
 if (!file_exists($settings_file) && file_exists($default_settings_file)) {
-  $default_content = file_get_contents($default_settings_file);
-
-  // Specify a directory for configuration data.
-  $current_code = '$config_directories = [];';
-  $new_code = <<<'EOS'
-$config_directories = [
-  CONFIG_SYNC_DIRECTORY => DRUPAL_ROOT . '/../config/sync',
-];
-EOS;
-  $content = str_replace($current_code, $new_code, $default_content);
+  $content = file_get_contents($default_settings_file);
 
   // Allow local development configuration.
   $current_code = <<<'EOS'
@@ -34,16 +25,18 @@
 
 // -- settings.local.php file.
 $example_local_settings_file = './web/sites/example.settings.local.php';
-$local_settings_file = './docroot/sites/default/settings.local.php';
+$local_settings_file = './web/sites/default/settings.local.php';
 if (!file_exists($local_settings_file) && file_exists($example_local_settings_file)) {
-  if (!@copy($example_local_settings_file, $local_settings_file)) {
+  if (@copy($example_local_settings_file, $local_settings_file)) {
+    chmod($settings_file, 0666);
+  }
+  else {
     file_put_contents('php://stderr', "Could not create $local_settings_file file.\n", FILE_APPEND);
   }
-  chmod($settings_file, 0666);
 }
 
 // -- files directory.
-$default_dir = './docroot/sites/default';
+$default_dir = './web/sites/default';
 $files_dir = $default_dir . '/files';
 if (file_exists($default_dir) && !file_exists($files_dir)) {
   $original_umask = umask(0);

diff --git a/tests/dcg/Generator/Drupal_8/_project/_light/scripts/composer/create_required_files.php b/tests/dcg/Generator/Drupal_8/_project/_light/scripts/composer/create_required_files.php
@@ -2,20 +2,11 @@
 <?php
 
 // -- settings.php file.
-$default_settings_file = './docroot/sites/default/default.settings.php';
-$settings_file = './docroot/sites/default/settings.php';
+$default_settings_file = './sites/default/default.settings.php';
+$settings_file = './sites/default/settings.php';
 
 if (!file_exists($settings_file) && file_exists($default_settings_file)) {
-  $default_content = file_get_contents($default_settings_file);
-
-  // Specify a directory for configuration data.
-  $current_code = '$config_directories = [];';
-  $new_code = <<<'EOS'
-$config_directories = [
-  CONFIG_SYNC_DIRECTORY => DRUPAL_ROOT . '/../config/sync',
-];
-EOS;
-  $content = str_replace($current_code, $new_code, $default_content);
+  $content = file_get_contents($default_settings_file);
 
   // Allow local development configuration.
   $current_code = <<<'EOS'
@@ -34,16 +25,18 @@
 
 // -- settings.local.php file.
 $example_local_settings_file = './sites/example.settings.local.php';
-$local_settings_file = './docroot/sites/default/settings.local.php';
+$local_settings_file = './sites/default/settings.local.php';
 if (!file_exists($local_settings_file) && file_exists($example_local_settings_file)) {
-  if (!@copy($example_local_settings_file, $local_settings_file)) {
+  if (@copy($example_local_settings_file, $local_settings_file)) {
+    chmod($settings_file, 0666);
+  }
+  else {
     file_put_contents('php://stderr', "Could not create $local_settings_file file.\n", FILE_APPEND);
   }
-  chmod($settings_file, 0666);
 }
 
 // -- files directory.
-$default_dir = './docroot/sites/default';
+$default_dir = './sites/default';
 $files_dir = $default_dir . '/files';
 if (file_exists($default_dir) && !file_exists($files_dir)) {
   $original_umask = umask(0);