Issue #3151360 by quietone, benjifisher, ToneLoc: Improve description…

… for file paths on the CredentialFrom (cherry picked from commit 98057144512a246cabb14b89eb7ecaf8ccd1bc74)
drupal · Jul 15, 2020 · f7fc507 · f7fc507
1 parent c7ab244
commit f7fc507
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/modules/migrate_drupal_ui/src/Form/CredentialForm.php b/modules/migrate_drupal_ui/src/Form/CredentialForm.php
@@ -167,7 +167,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     ];
     $form['source']['d6_source_base_path'] = [
       '#type' => 'textfield',
-      '#title' => $this->t('Files directory'),
+      '#title' => $this->t('Document root for files'),
       '#description' => $this->t('To import files from your current Drupal site, enter a local file directory containing your site (e.g. /var/www/docroot), or your site address (for example http://example.com).'),
       '#states' => [
         'visible' => [
@@ -179,7 +179,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
 
     $form['source']['source_base_path'] = [
       '#type' => 'textfield',
-      '#title' => $this->t('Public files directory'),
+      '#title' => $this->t('Document root for public files'),
       '#description' => $this->t('To import public files from your current Drupal site, enter a local file directory containing your site (e.g. /var/www/docroot), or your site address (for example http://example.com).'),
       '#states' => [
         'visible' => [
@@ -191,7 +191,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
 
     $form['source']['source_private_file_path'] = [
       '#type' => 'textfield',
-      '#title' => $this->t('Private files directory'),
+      '#title' => $this->t('Document root for private files'),
       '#default_value' => '',
       '#description' => $this->t('To import private files from your current Drupal site, enter a local file directory containing your site (e.g. /var/www/docroot).'),
       '#states' => [

diff --git a/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php b/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php
@@ -100,11 +100,11 @@ public function testMigrateUpgradeExecute() {
     }
     $this->drupalPostForm(NULL, $paths + $edits, t('Review upgrade'));
     if ($version == 6) {
-      $session->responseContains('Failed to read from Files directory.');
+      $session->responseContains('Failed to read from Document root for files.');
     }
     else {
-      $session->responseContains('Failed to read from Public files directory.');
-      $session->responseContains('Failed to read from Private files directory.');
+      $session->responseContains('Failed to read from Document root for public files.');
+      $session->responseContains('Failed to read from Document root for private files.');
     }
 
     // Restart the upgrade process.