From 7852af42a2ace4ba2061d7a257f9abc93835dfbd Mon Sep 17 00:00:00 2001
From: Alex Barth <alex_b@53995.no-reply.drupal.org>
Date: Tue, 7 Sep 2010 17:55:03 +0000
Subject: [PATCH] Rename createFeedConfiguration() to
createImporterConfiguration().
---
tests/feeds.test | 22 +++++++++++-----------
tests/feeds.test.inc | 8 +++-----
tests/feeds_mapper_content.test | 2 +-
tests/feeds_mapper_date.test | 2 +-
tests/feeds_mapper_filefield.test | 4 ++--
tests/feeds_mapper_link.test | 4 ++--
tests/feeds_mapper_locale.test | 2 +-
tests/feeds_mapper_og.test | 2 +-
tests/feeds_mapper_profile.test | 4 ++--
tests/feeds_mapper_taxonomy.test | 2 +-
10 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/tests/feeds.test b/tests/feeds.test
index 54037a3d..168a9a06 100644
--- a/tests/feeds.test
+++ b/tests/feeds.test
@@ -50,8 +50,8 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
);
$this->drupalPost('admin/content/node-settings', $edit, 'Save configuration');
- // Create a feed.
- $this->createFeedConfiguration('Syndication', 'syndication');
+ // Create an importer configuration.
+ $this->createImporterConfiguration('Syndication', 'syndication');
$this->addMappings('syndication',
array(
array(
@@ -262,8 +262,8 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
// Remove all items again so that next test can check for them.
$this->drupalPost('node/'. $nid .'/delete-items', array(), 'Delete');
- // Create a feed, not attached to content type.
- $this->createFeedConfiguration('Syndication standalone', 'syndication_standalone');
+ // Create an importer, not attached to content type.
+ $this->createImporterConfiguration('Syndication standalone', 'syndication_standalone');
$edit = array(
'content_type' => '',
);
@@ -441,8 +441,8 @@ class FeedsRSStoDataTest extends FeedsWebTestCase {
*/
public function test() {
- // Create a feed.
- $this->createFeedConfiguration('Data feed', 'rss');
+ // Create an importer.
+ $this->createImporterConfiguration('Data feed', 'rss');
// Go to edit page and select the data processor.
$edit = array(
@@ -601,8 +601,8 @@ class FeedsCSVtoUsersTest extends FeedsWebTestCase {
*/
public function test() {
- // Create a feed.
- $this->createFeedConfiguration('User import', 'user_import');
+ // Create an importer.
+ $this->createImporterConfiguration('User import', 'user_import');
// Set and configure plugins.
$this->setPlugin('user_import', 'FeedsFileFetcher');
@@ -694,7 +694,7 @@ class FeedsSchedulerTestCase extends FeedsWebTestCase {
)
)
);
- $this->createFeedConfiguration();
+ $this->createImporterConfiguration();
$this->addMappings('syndication',
array(
array(
@@ -891,7 +891,7 @@ class FeedsSyndicationParserTestCase extends FeedsWebTestCase {
* Run tests.
*/
public function test() {
- $this->createFeedConfiguration('Syndication', 'syndication');
+ $this->createImporterConfiguration('Syndication', 'syndication');
foreach (array('FeedsSyndicationParser', 'FeedsSimplePieParser') as $parser) {
$this->setPlugin('syndication', $parser);
@@ -953,7 +953,7 @@ class FeedsSitemapParserTestCase extends FeedsWebTestCase {
* Run tests.
*/
public function test() {
- $this->createFeedConfiguration('Sitemap', 'sitemap');
+ $this->createImporterConfiguration('Sitemap', 'sitemap');
$this->setPlugin('sitemap', 'FeedsSitemapParser');
$this->addMappings('sitemap',
diff --git a/tests/feeds.test.inc b/tests/feeds.test.inc
index fee90f87..9a0e5c23 100644
--- a/tests/feeds.test.inc
+++ b/tests/feeds.test.inc
@@ -75,8 +75,6 @@ class FeedsWebTestCase extends DrupalWebTestCase {
/**
* Create an importer configuration.
*
- * @todo Rename to createImporterConfig()
- *
* @param $name
* The natural name of the feed.
* @param $id
@@ -85,7 +83,7 @@ class FeedsWebTestCase extends DrupalWebTestCase {
* Optional array that defines the basic settings for the feed in a format
* that can be posted to the feed's basic settings form.
*/
- public function createFeedConfiguration($name = 'Syndication', $id = 'syndication') {
+ public function createImporterConfiguration($name = 'Syndication', $id = 'syndication') {
// Create new feed configuration.
$this->drupalGet('admin/build/feeds');
$this->clickLink('New importer');
@@ -145,8 +143,8 @@ class FeedsWebTestCase extends DrupalWebTestCase {
* * create [type] content
* * use feeds
*
- * Assumes that page content type has been configured with createFeedConfiguration()
- * as a feed content type.
+ * Assumes that page content type has been configured with
+ * createImporterConfiguration() as a feed content type.
*
* @return
* The node id of the node created.
diff --git a/tests/feeds_mapper_content.test b/tests/feeds_mapper_content.test
index 022e0ffa..1a29fec1 100644
--- a/tests/feeds_mapper_content.test
+++ b/tests/feeds_mapper_content.test
@@ -53,7 +53,7 @@ class FeedsMapperContentTestCase extends FeedsMapperTestCase {
));
// Create and configure importer.
- $this->createFeedConfiguration('Content CSV', 'csv');
+ $this->createImporterConfiguration('Content CSV', 'csv');
$this->setSettings('csv', NULL, array('content_type' => '','import_period' => FEEDS_SCHEDULE_NEVER,));
$this->setPlugin('csv', 'FeedsFileFetcher');
$this->setPlugin('csv', 'FeedsCSVParser');
diff --git a/tests/feeds_mapper_date.test b/tests/feeds_mapper_date.test
index 7e544b24..d24a967d 100644
--- a/tests/feeds_mapper_date.test
+++ b/tests/feeds_mapper_date.test
@@ -54,7 +54,7 @@ class FeedsMapperDateTestCase extends FeedsMapperTestCase {
));
// Create and configure importer.
- $this->createFeedConfiguration('Date RSS', 'daterss');
+ $this->createImporterConfiguration('Date RSS', 'daterss');
$this->setSettings('daterss', NULL, array('content_type' => '', 'import_period' => FEEDS_SCHEDULE_NEVER,));
$this->setPlugin('daterss', 'FeedsFileFetcher');
$this->setPlugin('daterss', 'FeedsSyndicationParser');
diff --git a/tests/feeds_mapper_filefield.test b/tests/feeds_mapper_filefield.test
index 09115ff3..fc463d64 100644
--- a/tests/feeds_mapper_filefield.test
+++ b/tests/feeds_mapper_filefield.test
@@ -59,8 +59,8 @@ class FeedsMapperFileFieldTestCase extends FeedsMapperTestCase {
),
));
- //Create importer configuration
- $this->createFeedConfiguration(); //Create a default importer configuration
+ // Create importer configuration.
+ $this->createImporterConfiguration(); //Create a default importer configuration
$this->setPlugin('syndication', 'FeedsSimplePieParser');
$this->setSettings('syndication', 'FeedsNodeProcessor', array('content_type' => $typename)); //Processor settings
$this->addMappings('syndication', array(
diff --git a/tests/feeds_mapper_link.test b/tests/feeds_mapper_link.test
index 3a6fd312..df816f81 100644
--- a/tests/feeds_mapper_link.test
+++ b/tests/feeds_mapper_link.test
@@ -80,8 +80,8 @@ class FeedsMapperLinkTestCase extends FeedsMapperTestCase {
),
));
- //Create importer configuration
- $this->createFeedConfiguration(); //Create a default importer configuration
+ // Create importer configuration.
+ $this->createImporterConfiguration(); //Create a default importer configuration
$this->setSettings('syndication', 'FeedsNodeProcessor', array('content_type' => $typename)); //Processor settings
$this->addMappings('syndication', array(
array(
diff --git a/tests/feeds_mapper_locale.test b/tests/feeds_mapper_locale.test
index aa029243..c4986b75 100644
--- a/tests/feeds_mapper_locale.test
+++ b/tests/feeds_mapper_locale.test
@@ -53,7 +53,7 @@ class FeedsMapperLocaleTestCase extends FeedsMapperTestCase {
}
// Create an importer configuration with basic mapping.
- $this->createFeedConfiguration('Syndication', 'syndication');
+ $this->createImporterConfiguration('Syndication', 'syndication');
$this->addMappings('syndication',
array(
array(
diff --git a/tests/feeds_mapper_og.test b/tests/feeds_mapper_og.test
index 4eeac37b..3dd4e526 100644
--- a/tests/feeds_mapper_og.test
+++ b/tests/feeds_mapper_og.test
@@ -54,7 +54,7 @@ class FeedsMapperOGTestCase extends FeedsMapperTestCase {
}
// Create an importer configuration with basic mapping.
- $this->createFeedConfiguration('Syndication', 'syndication');
+ $this->createImporterConfiguration('Syndication', 'syndication');
$this->addMappings('syndication',
array(
array(
diff --git a/tests/feeds_mapper_profile.test b/tests/feeds_mapper_profile.test
index 05842874..1d7d42d0 100644
--- a/tests/feeds_mapper_profile.test
+++ b/tests/feeds_mapper_profile.test
@@ -58,8 +58,8 @@ class FeedsMapperProfileTestCase extends FeedsMapperTestCase {
);
$name = $this->drupalPost('admin/user/profile/add/selection', $edit, t('Save field'));
- // Create a feed.
- $this->createFeedConfiguration('Profile import', 'profile_import');
+ // Create an importer.
+ $this->createImporterConfiguration('Profile import', 'profile_import');
// Set and configure plugins.
$this->setPlugin('profile_import', 'FeedsFileFetcher');
diff --git a/tests/feeds_mapper_taxonomy.test b/tests/feeds_mapper_taxonomy.test
index 0e448261..b9725e98 100644
--- a/tests/feeds_mapper_taxonomy.test
+++ b/tests/feeds_mapper_taxonomy.test
@@ -48,7 +48,7 @@ class FeedsMapperTaxonomyTestCase extends FeedsMapperTestCase {
);
$this->drupalPost('admin/content/taxonomy/add/vocabulary', $edit, 'Save');
// Create an importer configuration with basic mapping.
- $this->createFeedConfiguration('Syndication', 'syndication');
+ $this->createImporterConfiguration('Syndication', 'syndication');
$this->addMappings('syndication',
array(
array(
--
GitLab