diff --git a/tests/TitleAdminSettingsTestCase.test b/tests/TitleAdminSettingsTestCase.test index 8c6cea0..453e64b 100644 --- a/tests/TitleAdminSettingsTestCase.test +++ b/tests/TitleAdminSettingsTestCase.test @@ -21,15 +21,16 @@ class TitleAdminSettingsTestCase extends DrupalWebTestCase { /** * {@inheritdoc} */ - function setUp(array $modules = array()) { - // Core. - $modules[] = 'field_test'; - $modules[] = 'taxonomy'; + function setUp(array $added_modules = array()) { // This module. - $modules[] = 'title'; - $modules[] = 'title_test'; - parent::setUp($modules); - $admin_user = $this->drupalCreateUser(array('administer site configuration', 'administer taxonomy')); + $modules = array('title', 'title_test', 'field_test', 'entity_translation','entity', 'locale', 'taxonomy'); + $added_modules = array_merge($modules, $added_modules); + parent::setUp($added_modules); + /* Reset the permissions cache prior to calling drupalCreateUser + * see notes here: https://api.drupal.org/comment/28739#comment-28739 + */ + $this->checkPermissions(array(), TRUE); + $admin_user = $this->drupalCreateUser(array('administer site configuration', 'administer taxonomy', 'administer fields')); $this->drupalLogin($admin_user); } diff --git a/tests/TitleFieldReplacementTestCase.test b/tests/TitleFieldReplacementTestCase.test index 69732f7..9da591b 100644 --- a/tests/TitleFieldReplacementTestCase.test +++ b/tests/TitleFieldReplacementTestCase.test @@ -22,7 +22,7 @@ class TitleFieldReplacementTestCase extends DrupalWebTestCase { /** * {@inheritdoc} */ - function setUp(array $modules = array()) { + function setUp(array $added_modules = array()) { // Core. $modules[] = 'comment'; $modules[] = 'field_test'; @@ -32,7 +32,8 @@ class TitleFieldReplacementTestCase extends DrupalWebTestCase { $modules[] = 'title_test'; // Other dependencies. $modules[] = 'entity'; - parent::setUp($modules); + $added_modules = array_merge($modules, $added_modules); + parent::setUp($added_modules); } /** diff --git a/tests/title_test.info b/tests/title_test.info index b2af18b..31c8a3d 100644 --- a/tests/title_test.info +++ b/tests/title_test.info @@ -4,5 +4,6 @@ core = 7.x package = Testing hidden = TRUE dependencies[] = title +dependencies[] = taxonomy dependencies[] = entity dependencies[] = entity_translation diff --git a/title.info b/title.info index 1eb02ba..d8a7bda 100644 --- a/title.info +++ b/title.info @@ -9,6 +9,7 @@ files[] = title.module files[] = views/views_handler_title_field.inc ; Tests. +test_dependencies[] = taxonomy test_dependencies[] = entity test_dependencies[] = entity_translation files[] = tests/TitleAdminSettingsTestCase.test