Unit test for self:: to static:: Http\Client update

freax · Nov 27, 2014 · 3e2ef16 · 3e2ef16
1 parent 5589519
commit 3e2ef16
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/tests/ZendTest/Http/ClientTest.php b/tests/ZendTest/Http/ClientTest.php
@@ -18,6 +18,7 @@
 use Zend\Http\Request;
 use Zend\Http\Response;
 use Zend\Http\Client\Adapter\Test;
+use ZendTest\Http\TestAsset\ExtendedClient;
 
 
 class ClientTest extends \PHPUnit_Framework_TestCase
@@ -376,6 +377,7 @@ public function testPrepareHeadersCreateRightHttpField()
     }
 
     /**
+<<<<<<< Upstream, based on zf2/master
      * @group 6231
      */
     public function testHttpQueryParametersCastToString()
@@ -405,5 +407,15 @@ public function testHttpQueryParametersCastToString()
             ->will($this->returnValue($response->toString()));
 
         $client->send($request);
+=======
+     * Test for pull request 6301
+     * Previous functionality would have thrown an exception
+     * This test serves to verify that exception is not thrown
+     */
+    public function testCanSpecifyCustomAuthMethodsInExtendingClasses()
+    {
+        $client = new ExtendedClient();
+        $client->setAuth('username', 'password', ExtendedClient::AUTH_CUSTOM);
+>>>>>>> d0d9ac2 Unit test for self:: to static:: Http\Client update
     }
 }
diff --git a/tests/ZendTest/Http/TestAsset/ExtendedClient.php b/tests/ZendTest/Http/TestAsset/ExtendedClient.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace ZendTest\Http\TestAsset;
+
+use Zend\Http\Client;
+
+class ExtendedClient extends Client
+{
+    const AUTH_CUSTOM = 'custom';
+}