Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / OStatus / tests / FeedDiscoveryTest.php
diff --git a/plugins/OStatus/tests/FeedDiscoveryTest.php b/plugins/OStatus/tests/FeedDiscoveryTest.php

index 3be4bf736c704f2ab58c307f75c501e612fbc539..28ac549c8983a87d6df7fda37484d052f2aa4098 100644 (file)
--- a/plugins/OStatus/tests/FeedDiscoveryTest.php
+++ b/plugins/OStatus/tests/FeedDiscoveryTest.php
@@ -6,8 +6,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
  }
  
  define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
-define('STATUSNET', true);
-define('LACONICA', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
  
  require_once INSTALLDIR . '/lib/common.php';
  require_once INSTALLDIR . '/plugins/OStatus/lib/feeddiscovery.php';
@@ -75,9 +75,10 @@ END;
                             '<body><pre><LINK rel=alternate hRef=http://example.com/feed/rss type=application/rss+xml><fnork',
                             'http://example.com/feed/rss'),
                       // 'rel' attribute must be lowercase, alone per http://www.rssboard.org/rss-autodiscovery
+                     // but we're going to be liberal in what we receive.
                       array('http://example.com/tagsoup2',
                             '<body><pre><LINK rel=" feeders    alternate 467" hRef=http://example.com/feed/rss type=application/rss+xml><fnork',
-                           false),
+                           'http://example.com/feed/rss'),
                       array('http://example.com/tagsoup3',
                             '<body><pre><LINK rel=ALTERNATE hRef=http://example.com/feed/rss type=application/rss+xml><fnork',
                             false),
@@ -87,18 +88,20 @@ END;
                       array('http://example.com/relative/link2',
                             '<html><link rel="alternate" href="../feed/rss" type="application/rss+xml">',
                             'http://example.com/feed/rss'),
+                     // This one can't resolve correctly; relative link is bogus.
                       array('http://example.com/relative/link3',
                             '<html><link rel="alternate" href="http:/feed/rss" type="application/rss+xml">',
-                           'http://example.com/feed/rss'),
+                           'http:/feed/rss'),
                       array('http://example.com/base/link1',
                             '<html><link rel="alternate" href="/feed/rss" type="application/rss+xml"><base href="http://target.example.com/">',
                             'http://target.example.com/feed/rss'),
                       array('http://example.com/base/link2',
                             '<html><link rel="alternate" href="feed/rss" type="application/rss+xml"><base href="http://target.example.com/">',
                             'http://target.example.com/feed/rss'),
+                     // This one can't resolve; relative link is bogus.
                       array('http://example.com/base/link3',
                             '<html><link rel="alternate" href="http:/feed/rss" type="application/rss+xml"><base href="http://target.example.com/">',
-                           'http://target.example.com/feed/rss'),
+                           'http:/feed/rss'),
                       // Trick question! There's a <base> but no href on it
                       array('http://example.com/relative/fauxbase',
                             '<html><link rel="alternate" href="../feed/rss" type="application/rss+xml"><base target="top">',