diff options
author | David Rothstein <drothstein@gmail.com> | 2013-03-10 15:44:11 -0400 |
---|---|---|
committer | David Rothstein <drothstein@gmail.com> | 2013-03-10 15:44:11 -0400 |
commit | 851bcf12f0304adf5d9a0ee988848002809e6ca3 (patch) | |
tree | e681f6454c76956d4f1dde75d46d5478dd17507a /modules/simpletest | |
parent | b5d7ec61998fcb0d21ceabdce41ff0d5c58648c6 (diff) | |
download | brdo-851bcf12f0304adf5d9a0ee988848002809e6ca3.tar.gz brdo-851bcf12f0304adf5d9a0ee988848002809e6ca3.tar.bz2 |
Issue #1475342 by iamEAP | Kasper Souren: Fixed D6->D7 upgrade: system_update_7007() fail.
Diffstat (limited to 'modules/simpletest')
-rw-r--r-- | modules/simpletest/tests/upgrade/drupal-6.duplicate-permission.database.php | 8 | ||||
-rw-r--r-- | modules/simpletest/tests/upgrade/upgrade.user.test | 29 |
2 files changed, 37 insertions, 0 deletions
diff --git a/modules/simpletest/tests/upgrade/drupal-6.duplicate-permission.database.php b/modules/simpletest/tests/upgrade/drupal-6.duplicate-permission.database.php new file mode 100644 index 000000000..5da5e8444 --- /dev/null +++ b/modules/simpletest/tests/upgrade/drupal-6.duplicate-permission.database.php @@ -0,0 +1,8 @@ +<?php + +// Simulate duplicated permission condition. +db_update('permission')->fields(array( + 'perm' => 'access content, access content', +)) +->condition('pid', 1) +->execute(); diff --git a/modules/simpletest/tests/upgrade/upgrade.user.test b/modules/simpletest/tests/upgrade/upgrade.user.test index c33ba1179..d33234e43 100644 --- a/modules/simpletest/tests/upgrade/upgrade.user.test +++ b/modules/simpletest/tests/upgrade/upgrade.user.test @@ -61,3 +61,32 @@ class UserUpgradePathNoPasswordTokenTestCase extends UpgradePathTestCase { $this->assertEqual(variable_get('user_mail_register_no_approval_required_body'), '[user:name], [site:name], [site:url], [site:url-brief], [user:mail], [date:medium], [site:login-url], [user:edit-url], [user:one-time-login-url].', 'Existing email templates have been modified (password token not involved).'); } } + +/** + * Upgrade test for user.module (duplicated permission). + */ +class UserUpgradePathDuplicatedPermissionTestCase extends UpgradePathTestCase { + public static function getInfo() { + return array( + 'name' => 'User upgrade path (duplicated permission)', + 'description' => 'User upgrade path tests (duplicated permission).', + 'group' => 'Upgrade path', + ); + } + + public function setUp() { + // Path to the database dump files. + $this->databaseDumpFiles = array( + drupal_get_path('module', 'simpletest') . '/tests/upgrade/drupal-6.bare.database.php', + drupal_get_path('module', 'simpletest') . '/tests/upgrade/drupal-6.duplicate-permission.database.php', + ); + parent::setUp(); + } + + /** + * Test a successful upgrade. + */ + public function testUserUpgrade() { + $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.'); + } +} |