Fix OPML tests.

8937be36 · Alex Barth · 242d0284 · 8937be36 · 8937be36 · 8937be36
Commit 8937be36 authored 14 years ago by Alex Barth
--- a/feeds_news/feeds_news.test
+++ b/feeds_news/feeds_news.test
@@ -115,7 +115,7 @@ class FeedsExamplesOPMLTestCase extends FeedsWebTestCase {
    // Import OPML and assert.
    $file = $this->generateOPML();
    $this->importFile('opml', $file);
-    $this->assertText('Created 3 feed nodes.');
+    $this->assertText('Created 3 Feed nodes.');
    $count = db_query("SELECT COUNT(*) FROM {feeds_source}")->fetchField();
    $this->assertEqual($count, 4, 'Found correct number of items.');

--- a/plugins/FeedsNodeProcessor.inc
+++ b/plugins/FeedsNodeProcessor.inc
@@ -357,7 +357,7 @@ class FeedsNodeProcessor extends FeedsProcessor {
          $nid = db_query("SELECT nid FROM {node} WHERE nid = :nid", array(':nid' => $value))->fetchField();
          break;
        case 'feeds_source':
-          if ($id = feeds_get_importer_id($this->importer->config['content_type'])) {
+          if ($id = feeds_get_importer_id($this->config['content_type'])) {
            $nid = db_query("SELECT fs.feed_nid FROM {node} n JOIN {feeds_source} fs ON n.nid = fs.feed_nid WHERE fs.id = :id AND fs.source = :source", array(':id' => $id, ':source' => $value))->fetchField();
          }
          break;

--- a/tests/feeds.test.inc
+++ b/tests/feeds.test.inc
@@ -130,20 +130,19 @@ class FeedsWebTestCase extends DrupalWebTestCase {
 </head>
 <body>
  <outline text="Feeds test group" >
-       <outline title="Development Seed - Technological Solutions for Progressive Organizations" text="" xmlUrl="'. $path .'developmentseed.rss2" type="rss" />
+    <outline title="Development Seed - Technological Solutions for Progressive Organizations" text="" xmlUrl="'. $path .'developmentseed.rss2" type="rss" />
-       <outline title="Magyar Nemzet Online - H’rek" text="" xmlUrl="'. $path .'feed_without_guid.rss2" type="rss" />
+    <outline title="Magyar Nemzet Online - H’rek" text="" xmlUrl="'. $path .'feed_without_guid.rss2" type="rss" />
-       <outline title="Drupal planet" text="" type="rss" xmlUrl="'. $path .'drupalplanet.rss2" />
+    <outline title="Drupal planet" text="" type="rss" xmlUrl="'. $path .'drupalplanet.rss2" />
-    </outline>
+  </outline>
 </body>
 </opml>';
    // UTF 8 encode output string and write it to disk
    $output = utf8_encode($output);
-    $file = $this->absolute() .'/'. file_directory_path() .'/test-opml-'. $this->randomName() .'.opml';
+    $filename = file_default_scheme() . '://test-opml-'. $this->randomName() . '.opml';
-    $handle = fopen($file, 'w');
-    fwrite($handle, $output);
+    $filename = file_unmanaged_save_data($output, $filename);
-    fclose($handle);
+    return $filename;
-    return $file;
  }
  /**