Merge "resourceloader: Simplify StringSet fallback"

[lhc/web/wiklou.git] / tests / integration / includes / http / MWHttpRequestTestCase.php

diff --git a/tests/integration/includes/http/MWHttpRequestTestCase.php b/tests/integration/includes/http/MWHttpRequestTestCase.php
index cc769d7..603f4c2 100644 (file)
--- a/tests/integration/includes/http/MWHttpRequestTestCase.php
+++ b/tests/integration/includes/http/MWHttpRequestTestCase.php
@@ -2,7 +2,7 @@
 
 use Wikimedia\TestingAccessWrapper;
 
-abstract class MWHttpRequestTestCase extends PHPUnit_Framework_TestCase {
+abstract class MWHttpRequestTestCase extends PHPUnit\Framework\TestCase {
        protected static $httpEngine;
        protected $oldHttpEngine;
 
@@ -105,17 +105,16 @@ abstract class MWHttpRequestTestCase extends PHPUnit_Framework_TestCase {
                $this->assertHasCookie( 'foo', 'bar', $request->getCookieJar() );
 
                $this->markTestIncomplete( 'CookieJar does not handle deletion' );
-               return;
 
-               $request = MWHttpRequest::factory( 'http://httpbin.org/cookies/delete?foo' );
-               $cookieJar = new CookieJar();
-               $cookieJar->setCookie( 'foo', 'bar', [ 'domain' => 'httpbin.org' ] );
-               $cookieJar->setCookie( 'foo2', 'bar2', [ 'domain' => 'httpbin.org' ] );
-               $request->setCookieJar( $cookieJar );
-               $status = $request->execute();
-               $this->assertTrue( $status->isGood() );
-               $this->assertNotHasCookie( 'foo', $request->getCookieJar() );
-               $this->assertHasCookie( 'foo2', 'bar2', $request->getCookieJar() );
+               // $request = MWHttpRequest::factory( 'http://httpbin.org/cookies/delete?foo' );
+               // $cookieJar = new CookieJar();
+               // $cookieJar->setCookie( 'foo', 'bar', [ 'domain' => 'httpbin.org' ] );
+               // $cookieJar->setCookie( 'foo2', 'bar2', [ 'domain' => 'httpbin.org' ] );
+               // $request->setCookieJar( $cookieJar );
+               // $status = $request->execute();
+               // $this->assertTrue( $status->isGood() );
+               // $this->assertNotHasCookie( 'foo', $request->getCookieJar() );
+               // $this->assertHasCookie( 'foo2', 'bar2', $request->getCookieJar() );
        }
 
        public function testGetResponseHeaders() {