From fe7e01c60d9d0c540112fa2ffe4265240e2fe0cb Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Sun, 21 Nov 2010 20:35:10 +0000 Subject: #931736 by dww: Fixed No upgrade path for the D6 'file_directory_temp' setting. --- modules/simpletest/tests/upgrade/drupal-6.filled.database.php | 10 +++++++++- modules/simpletest/tests/upgrade/upgrade.upload.test | 9 +++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'modules/simpletest/tests') diff --git a/modules/simpletest/tests/upgrade/drupal-6.filled.database.php b/modules/simpletest/tests/upgrade/drupal-6.filled.database.php index 9f33ee0a7..25092e70f 100644 --- a/modules/simpletest/tests/upgrade/drupal-6.filled.database.php +++ b/modules/simpletest/tests/upgrade/drupal-6.filled.database.php @@ -19735,7 +19735,15 @@ db_insert('variable')->fields(array( )) ->values(array( 'name' => 'file_directory_temp', - 'value' => 's:26:"/Applications/MAMP/tmp/php";', + 'value' => 's:29:"/drupal-6/file/directory/temp";', +)) +->values(array( + 'name' => 'file_directory_path', + 'value' => 's:29:"/drupal-6/file/directory/path";', +)) +->values(array( + 'name' => 'file_downloads', + 'value' => 'i:2;', )) ->values(array( 'name' => 'filter_html_1', diff --git a/modules/simpletest/tests/upgrade/upgrade.upload.test b/modules/simpletest/tests/upgrade/upgrade.upload.test index 761d6558d..a0402a38e 100644 --- a/modules/simpletest/tests/upgrade/upgrade.upload.test +++ b/modules/simpletest/tests/upgrade/upgrade.upload.test @@ -65,5 +65,14 @@ class UploadUpgradePathTestCase extends UpgradePathTestCase { } $this->assertIdentical($filenames, $recorded_filenames, 'The uploaded files are present in the same order after the upgrade.'); } + // Make sure the file settings were properly migrated. + $d6_file_directory_temp = '/drupal-6/file/directory/temp'; + $d6_file_directory_path = '/drupal-6/file/directory/path'; + $d6_file_downloads = 2; // FILE_DOWNLOADS_PRIVATE + + $this->assertNull(variable_get('file_directory_temp', NULL), "The 'file_directory_temp' variable was properly removed."); + $this->assertEqual(variable_get('file_temporary_path', 'drupal-7-bogus'), $d6_file_directory_temp, "The 'file_temporary_path' setting was properly migrated."); + $this->assertEqual(variable_get('file_default_scheme', 'drupal-7-bogus'), 'private', "The 'file_default_scheme' setting was properly migrated."); + $this->assertEqual(variable_get('file_private_path', 'drupal-7-bogus'), $d6_file_directory_path, "The 'file_private_path' setting was properly migrated."); } } -- cgit v1.2.3