diff --git a/feeds.pages.inc b/feeds.pages.inc
index 87f3ee64bcdb1d1cb2410751d05ca03188a98476..258a7569f3cccaae1ffd60961e10bdbd843cbf03 100644
--- a/feeds.pages.inc
+++ b/feeds.pages.inc
@@ -33,7 +33,7 @@ function feeds_page() {
}
}
if (empty($rows)) {
- drupal_set_message(t('There are no importers, go to !importers to create one or enable an existing one.', array('!importers' => l(t('Feeds importers'), 'admin/structure/feeds'))));
+ drupal_set_message(t('There are no importers, go to <a href="@importers">Feed importers</a> to create one or enable an existing one.', array('@importers' => url('admin/structure/feeds'))));
}
$header = array(
t('Import'),
diff --git a/tests/feeds.test b/tests/feeds.test
index 9b381b9033b44d1e62f4f2232f3c3d8fd44dcfc7..e43719a08a1bd8b53c1bd5385528ea07dbbfeb6d 100644
--- a/tests/feeds.test
+++ b/tests/feeds.test
@@ -11,19 +11,19 @@
class FeedsWebTestCase extends DrupalWebTestCase {
protected $profile = 'testing';
- /**
- * This override of setUp requires that modules are passed as an array, also
- * please don't pass duplicates of what is defined below!
- */
- function setUp() {
-
+ public function setUp() {
$args = func_get_args();
- if (isset($args[0]) && is_array($args[0])) {
+
+ // Build the list of required modules which can be altered by passing in an
+ // array of module names to setUp().
+ if (isset($args[0])) {
+ if (is_array($args[0])) {
$modules = $args[0];
}
- elseif (count($args) > 1) {
+ else {
$modules = $args;
}
+ }
else {
$modules = array();
}
@@ -35,6 +35,7 @@ class FeedsWebTestCase extends DrupalWebTestCase {
$modules[] = 'field_ui';
$modules[] = 'feeds';
$modules[] = 'feeds_ui';
+ $modules[] = 'feeds_tests';
$modules[] = 'ctools';
$modules[] = 'job_scheduler';
$modules = array_unique($modules);
@@ -71,16 +72,26 @@ class FeedsWebTestCase extends DrupalWebTestCase {
$filtered_html_format = (object) $filtered_html_format;
filter_format_save($filtered_html_format);
+ // Build the list of required administration permissions. Additional
+ // permissions can be passed as an array into setUp()'s second parameter.
+ if (isset($args[1]) && is_array($args[1])) {
+ $permissions = $args[1];
+ }
+ else {
+ $permissions = array();
+ }
+
+ $permissions[] = 'access content';
+ $permissions[] = 'administer site configuration';
+ $permissions[] = 'administer content types';
+ $permissions[] = 'administer nodes';
+ $permissions[] = 'bypass node access';
+ $permissions[] = 'administer taxonomy';
+ $permisisons[] = 'administer users';
+ $permissions[] = 'administer feeds';
+
// Create an admin user and log in.
- $this->admin_user = $this->drupalCreateUser(array(
- 'access content',
- 'administer site configuration',
- 'administer feeds',
- 'administer nodes',
- 'administer content types',
- 'bypass node access',
- 'administer users',
- ));
+ $this->admin_user = $this->drupalCreateUser($permissions);
$this->drupalLogin($this->admin_user);
$types = array(
diff --git a/tests/feeds_date_time.test b/tests/feeds_date_time.test
index 618590fd0972ab4bde4c4020e4d5770cfe8b22f8..1dc207324abc259cced052654b957f1ac0e79147 100644
--- a/tests/feeds_date_time.test
+++ b/tests/feeds_date_time.test
@@ -23,13 +23,6 @@ class FeedsDateTimeTest extends DrupalWebTestCase {
);
}
- /**
- * Set up.
- */
- public function setUp() {
- parent::setUp('feeds', 'feeds_ui', 'ctools', 'job_scheduler');
- }
-
/**
* Dispatch tests, only use one entry point method testX to save time.
*/
diff --git a/tests/feeds_fetcher_file.test b/tests/feeds_fetcher_file.test
index 2af242ca452771fff618ebfc87df80bd319934d4..fa227d51e85155c9a36c610d24362f4105e7d1e3 100644
--- a/tests/feeds_fetcher_file.test
+++ b/tests/feeds_fetcher_file.test
@@ -9,7 +9,6 @@
* File fetcher test class.
*/
class FeedsFileFetcherTestCase extends FeedsWebTestCase {
-
public static function getInfo() {
return array(
'name' => 'File fetcher',
diff --git a/tests/feeds_mapper_date.test b/tests/feeds_mapper_date.test
index d9fdc745b289f4fbd1b374c75e22f00ea4d47c82..4c90ce4327ae65d9897382582ce71301743b85a7 100644
--- a/tests/feeds_mapper_date.test
+++ b/tests/feeds_mapper_date.test
@@ -12,7 +12,6 @@
* @todo: Add test method for end date
*/
class FeedsMapperDateTestCase extends FeedsMapperTestCase {
-
public static function getInfo() {
return array(
'name' => 'Mapper: Date',
@@ -22,11 +21,7 @@ class FeedsMapperDateTestCase extends FeedsMapperTestCase {
);
}
- /**
- * Set up the test.
- */
public function setUp() {
- // Call parent setup with the required module.
parent::setUp(array('date_api', 'date'));
variable_set('date_default_timezone', 'UTC');
}
diff --git a/tests/feeds_mapper_field.test b/tests/feeds_mapper_field.test
index 71c5ef3e4650187986b54184e9621c4298b0b318..3829803e685c7520320daaff63f43beba7b39077 100644
--- a/tests/feeds_mapper_field.test
+++ b/tests/feeds_mapper_field.test
@@ -9,7 +9,6 @@
* Class for testing Feeds field mapper.
*/
class FeedsMapperFieldTestCase extends FeedsMapperTestCase {
-
public static function getInfo() {
return array(
'name' => 'Mapper: Fields',
@@ -18,25 +17,6 @@ class FeedsMapperFieldTestCase extends FeedsMapperTestCase {
);
}
- /**
- * Set up the test.
- */
- function setUp() {
- // Call parent setup with required modules.
- parent::setUp();
-
- // Create user and login.
- $this->drupalLogin($this->drupalCreateUser(array(
- 'access content',
- 'administer content types',
- 'administer feeds',
- 'administer nodes',
- 'administer site configuration',
- 'administer permissions',
- 'bypass node access',
- )));
- }
-
/**
* Basic test loading a double entry CSV file.
*/
diff --git a/tests/feeds_mapper_file.test b/tests/feeds_mapper_file.test
index 0436c75325f29dca9cd531c295d394750acab86b..af5cdc6de1afb852c523520595b581b4a93736b8 100644
--- a/tests/feeds_mapper_file.test
+++ b/tests/feeds_mapper_file.test
@@ -13,7 +13,6 @@
* b) needs to be copied from one location to another.
*/
class FeedsMapperFileTestCase extends FeedsMapperTestCase {
-
public static function getInfo() {
return array(
'name' => 'Mapper: File field',
@@ -22,14 +21,6 @@ class FeedsMapperFileTestCase extends FeedsMapperTestCase {
);
}
- /**
- * Set up the
- */
- public function setUp() {
- // Call parent setup with the required module
- parent::setUp(array('file', 'feeds_tests'));
- }
-
/**
* Basic test loading a single entry CSV file.
*/
diff --git a/tests/feeds_mapper_link.test b/tests/feeds_mapper_link.test
index 4b82e01b221a2da0f10f69dbbf2a7a7d5c7270f5..8d463b7d5ead2638443d29b34af8013d0b7b3196 100644
--- a/tests/feeds_mapper_link.test
+++ b/tests/feeds_mapper_link.test
@@ -9,7 +9,6 @@
* Class for testing Feeds <em>link</em> mapper.
*/
class FeedsMapperLinkTestCase extends FeedsMapperTestCase {
-
public static function getInfo() {
return array(
'name' => 'Mapper: Link',
@@ -19,22 +18,8 @@ class FeedsMapperLinkTestCase extends FeedsMapperTestCase {
);
}
- /**
- * Set up the test.
- */
public function setUp() {
- // Call parent setup with the required module
parent::setUp(array('link'));
-
- // Create user and login
- $this->drupalLogin($this->drupalCreateUser(
- array(
- 'administer content types',
- 'administer feeds',
- 'bypass node access',
- 'administer site configuration',
- )
- ));
}
/**
diff --git a/tests/feeds_mapper_taxonomy.test b/tests/feeds_mapper_taxonomy.test
index e0f5956a861a98819c9c45a6ed30898fc674ac32..a3e21bd0519f85a4829a422e00226ca97944a8a6 100644
--- a/tests/feeds_mapper_taxonomy.test
+++ b/tests/feeds_mapper_taxonomy.test
@@ -9,7 +9,6 @@
* Class for testing Feeds <em>content</em> mapper.
*/
class FeedsMapperTaxonomyTestCase extends FeedsMapperTestCase {
-
public static function getInfo() {
return array(
'name' => 'Mapper: Taxonomy',
@@ -18,23 +17,8 @@ class FeedsMapperTaxonomyTestCase extends FeedsMapperTestCase {
);
}
- /**
- * Set up the test.
- */
function setUp() {
- // Call parent setup with required modules.
- parent::setUp('feeds', 'feeds_ui', 'ctools', 'job_scheduler', 'taxonomy');
-
- // Create user and login.
- $this->drupalLogin($this->drupalCreateUser(
- array(
- 'administer content types',
- 'administer feeds',
- 'administer nodes',
- 'administer site configuration',
- 'administer taxonomy',
- )
- ));
+ parent::setUp();
// Add a new taxonomy vocabulary, add to article content type.
$edit = array(
diff --git a/tests/feeds_parser_sitemap.test b/tests/feeds_parser_sitemap.test
index 1ac466a21b20ccc57a94adbb1d83acf85636093b..3be92213a503f5a36311b7b4093637d684fde05a 100644
--- a/tests/feeds_parser_sitemap.test
+++ b/tests/feeds_parser_sitemap.test
@@ -9,7 +9,6 @@
* Test Sitemap parser.
*/
class FeedsSitemapParserTestCase extends FeedsWebTestCase {
-
public static function getInfo() {
return array(
'name' => 'Sitemap parser',
@@ -18,21 +17,6 @@ class FeedsSitemapParserTestCase extends FeedsWebTestCase {
);
}
- /**
- * Set up test.
- */
- public function setUp() {
- parent::setUp('feeds', 'feeds_ui', 'ctools', 'job_scheduler');
-
- $this->drupalLogin(
- $this->drupalCreateUser(
- array(
- 'administer feeds', 'administer nodes',
- )
- )
- );
- }
-
/**
* Run tests.
*/
diff --git a/tests/feeds_parser_syndication.test b/tests/feeds_parser_syndication.test
index 5079499a478febeccedfd3be66cce316c18d4067..6831c5e2bec546a129d74b055f21f17a4379bcb2 100644
--- a/tests/feeds_parser_syndication.test
+++ b/tests/feeds_parser_syndication.test
@@ -9,12 +9,12 @@
* Test single feeds.
*/
class FeedsSyndicationParserTestCase extends FeedsWebTestCase {
-
public static function getInfo() {
return array(
'name' => 'Syndication parsers',
'description' => 'Regression tests for syndication parsers Common syndication and SimplePie. Tests parsers against a set of feeds in the context of Feeds module. <strong>Requires SimplePie parser to be configured correctly.</strong>',
'group' => 'Feeds',
+ 'dependencies' => array('libraries'),
);
}
@@ -22,15 +22,7 @@ class FeedsSyndicationParserTestCase extends FeedsWebTestCase {
* Set up test.
*/
public function setUp() {
- parent::setUp('feeds', 'feeds_ui', 'ctools', 'job_scheduler', 'libraries');
-
- $this->drupalLogin(
- $this->drupalCreateUser(
- array(
- 'administer feeds', 'administer nodes',
- )
- )
- );
+ parent::setUp(array('libraries'));
}
/**
diff --git a/tests/feeds_processor_node.test b/tests/feeds_processor_node.test
index 068c4c544421091146596cd91104913e19073894..327bc0c9e9fe4db527ffe30c1bddf95cc4392107 100644
--- a/tests/feeds_processor_node.test
+++ b/tests/feeds_processor_node.test
@@ -25,8 +25,7 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
parent::setUp();
// Set the front page to show 20 nodes so we can easily see what is aggregated.
- $edit = array('default_nodes_main' => 20);
- $this->drupalPost('admin/config/system/site-information', $edit, 'Save configuration');
+ variable_set('default_nodes_main', 20);
// Set the teaser length display to unlimited otherwise tests looking for
// text on nodes will fail.
diff --git a/tests/feeds_processor_term.test b/tests/feeds_processor_term.test
index c663a8b45dc39acb865573ec4c58a9c7e030489a..3c25fa5d710fde4aae67577e10047a430c1eae0d 100644
--- a/tests/feeds_processor_term.test
+++ b/tests/feeds_processor_term.test
@@ -9,7 +9,6 @@
* Test aggregating a feed as data records.
*/
class FeedsCSVtoTermsTest extends FeedsWebTestCase {
-
public static function getInfo() {
return array(
'name' => 'CSV import to taxonomy',
@@ -18,19 +17,6 @@ class FeedsCSVtoTermsTest extends FeedsWebTestCase {
);
}
- /**
- * Set up test.
- */
- public function setUp() {
- parent::setUp();
-
- $this->drupalLogin($this->drupalCreateUser(array(
- 'access content',
- 'administer feeds',
- 'administer taxonomy',
- )));
- }
-
/**
* Test node creation, refreshing/deleting feeds and feed items.
*/
diff --git a/tests/feeds_scheduler.test b/tests/feeds_scheduler.test
index 07320bdadec578cd2c448f9a48a4a8a66be9ae9a..532744acb05672ed3090c6469b853ff71b5baccb 100644
--- a/tests/feeds_scheduler.test
+++ b/tests/feeds_scheduler.test
@@ -257,21 +257,4 @@ class FeedsSchedulerTestCase extends FeedsWebTestCase {
$this->cronRun();
$this->assertEqual(84, db_query("SELECT COUNT(*) FROM {node} WHERE type = 'article'")->fetchField());
}
-
- /**
- * Helper, log in as an admin user.
- */
- protected function loginAdmin() {
- $this->drupalLogin($this->admin_user);
- }
-
- /**
- * Print schedule as notice.
- */
- protected function showSchedule() {
- $jobs = db_query("SELECT * FROM {job_schedule}");
- foreach ($jobs as $job) {
- $this->error('<pre>' . print_r($job, true) . '</pre>');
- }
- }
}