3 files changed, 47 insertions, 6 deletions

diff --git a/vendor/fguillot/picofeed/tests/Client/ClientTest.php b/vendor/fguillot/picofeed/tests/Client/ClientTest.php
index 3f094d04c..8eaa34690 100644
--- a/vendor/fguillot/picofeed/tests/Client/ClientTest.php
+++ b/vendor/fguillot/picofeed/tests/Client/ClientTest.php
@@ -18,6 +18,20 @@ class ClientTest extends PHPUnit_Framework_TestCase
         $this->assertNotEmpty($client->getLastModified());
     }
 
+//    // disabled due to https://github.com/sebastianbergmann/phpunit/issues/1452
+//    /**
+//     * @runInSeparateProcess
+//     */
+//    public function testPassthrough()
+//    {
+//        $client = Client::getInstance();
+//        $client->setUrl('http://miniflux.net/favicon.ico');
+//        $client->enablePassthroughMode();
+//        $client->execute();
+//
+//        $this->expectOutputString('no_to_be_defined');
+//    }
+
     public function testCacheBothHaveToMatch()
     {
         $client = Client::getInstance();
diff --git a/vendor/fguillot/picofeed/tests/Client/CurlTest.php b/vendor/fguillot/picofeed/tests/Client/CurlTest.php
index 4509dbc67..0ade6d207 100644
--- a/vendor/fguillot/picofeed/tests/Client/CurlTest.php
+++ b/vendor/fguillot/picofeed/tests/Client/CurlTest.php
@@ -18,18 +18,31 @@ class CurlTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('text/html; charset=utf-8', $result['headers']['Content-Type']);
     }
 
+//    // disabled due to https://github.com/sebastianbergmann/phpunit/issues/1452
+//    /**
+//     * @runInSeparateProcess
+//     */
+//    public function testPassthrough()
+//    {
+//        $client = new Curl;
+//        $client->setUrl('http://miniflux.net/favicon.ico');
+//        $client->enablePassthroughMode();
+//        $client->doRequest();
+//
+//        $this->expectOutputString('no_to_be_defined');
+//    }
 
     public function testRedirect()
     {
         $client = new Curl;
-        $client->setUrl('http://www.miniflux.net/index.html');
+        $client->setUrl('http://rss.feedsportal.com/c/629/f/502199/s/42e50391/sc/44/l/0L0S0A1net0N0Ceditorial0C6437220Candroid0Egoogle0Enow0Es0Eouvre0Eaux0Eapplications0Etierces0C0T0Dxtor0FRSS0E16/story01.htm');
         $result = $client->doRequest();
 
         $this->assertTrue(is_array($result));
         $this->assertEquals(200, $result['status']);
         $this->assertEquals('<!DOCTYPE', substr($result['body'], 0, 9));
-        $this->assertEquals('text/html; charset=utf-8', $result['headers']['Content-Type']);
-        $this->assertEquals('http://miniflux.net/', $client->getUrl());
+        $this->assertEquals('text/html', $result['headers']['Content-Type']);
+        $this->assertEquals('http://www.01net.com/editorial/643722/android-google-now-s-ouvre-aux-applications-tierces/', str_replace('#?xtor=RSS-16', '', $client->getUrl()));
     }
 
     /**
diff --git a/vendor/fguillot/picofeed/tests/Client/StreamTest.php b/vendor/fguillot/picofeed/tests/Client/StreamTest.php
index 91f52c898..83a5a20fb 100644
--- a/vendor/fguillot/picofeed/tests/Client/StreamTest.php
+++ b/vendor/fguillot/picofeed/tests/Client/StreamTest.php
@@ -27,17 +27,31 @@ class StreamTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('</html>', substr(trim($result['body']), -7));
     }
 
+//    // disabled due to https://github.com/sebastianbergmann/phpunit/issues/1452
+//    /**
+//     * @runInSeparateProcess
+//     */
+//    public function testPassthrough()
+//    {
+//        $client = new Stream;
+//        $client->setUrl('http://miniflux.net/favicon.ico');
+//        $client->enablePassthroughMode();
+//        $client->doRequest();
+//
+//        $this->expectOutputString('no_to_be_defined');
+//    }
+
     public function testRedirect()
     {
         $client = new Stream;
-        $client->setUrl('http://www.miniflux.net/index.html');
+        $client->setUrl('http://rss.feedsportal.com/c/629/f/502199/s/42e50391/sc/44/l/0L0S0A1net0N0Ceditorial0C6437220Candroid0Egoogle0Enow0Es0Eouvre0Eaux0Eapplications0Etierces0C0T0Dxtor0FRSS0E16/story01.htm');
         $result = $client->doRequest();
 
         $this->assertTrue(is_array($result));
         $this->assertEquals(200, $result['status']);
         $this->assertEquals('<!DOCTYPE', substr($result['body'], 0, 9));
-        $this->assertEquals('text/html; charset=utf-8', $result['headers']['Content-Type']);
-        $this->assertEquals('http://miniflux.net/', $client->getUrl());
+        $this->assertEquals('text/html', $result['headers']['Content-Type']);
+        $this->assertEquals('http://www.01net.com/editorial/643722/android-google-now-s-ouvre-aux-applications-tierces/#?xtor=RSS-16', $client->getUrl());
     }
 
     /**