Move HTTP comments to new directory layout and add auth unit test (#9)

CVO-Technologies · Aug 14, 2016 · f32f66f · f32f66f
1 parent 3ed649e
commit f32f66f
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 8 deletions.
diff --git a/src/Network/Http/Adapter/TwitterStream.php → src/Http/Adapter/TwitterStream.php b/src/Network/Http/Adapter/TwitterStream.php → src/Http/Adapter/TwitterStream.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CvoTechnologies\Twitter\Network\Http\Adapter;
+namespace CvoTechnologies\Twitter\Http\Adapter;
 
 use Cake\Network\Http\Adapter\Stream;
 use Cake\Network\Http\Request;

diff --git a/src/Network/Http/Auth/Twitter.php → src/Http/Client/Auth/Twitter.php b/src/Network/Http/Auth/Twitter.php → src/Http/Client/Auth/Twitter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CvoTechnologies\Twitter\Network\Http\Auth;
+namespace CvoTechnologies\Twitter\Http\Client\Auth;
 
 use Cake\Http\Client\Auth\Oauth;
 

diff --git a/src/Network/Http/StreamClient.php → src/Http/StreamClient.php b/src/Network/Http/StreamClient.php → src/Http/StreamClient.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CvoTechnologies\Twitter\Network\Http;
+namespace CvoTechnologies\Twitter\Http;
 
 use Cake\Http\Client;
 use Cake\Http\Client\Request;

diff --git a/src/Webservice/Driver/Twitter.php b/src/Webservice/Driver/Twitter.php
@@ -5,7 +5,7 @@
 use Cake\Cache\Cache;
 use Cake\Network\Http\Client;
 use Cake\Utility\Hash;
-use CvoTechnologies\Twitter\Network\Http\StreamClient;
+use CvoTechnologies\Twitter\Http\StreamClient;
 use Muffin\Webservice\AbstractDriver;
 
 /**
@@ -50,7 +50,7 @@ public function initialize()
         $this->client(new Client($clientConfig));
         $this->streamClient(new StreamClient(Hash::merge($clientConfig, [
             'host' => 'stream.twitter.com',
-            'adapter' => 'CvoTechnologies\Twitter\Network\Http\Adapter\TwitterStream'
+            'adapter' => 'CvoTechnologies\Twitter\Http\Adapter\TwitterStream'
         ])));
     }
 

diff --git a/tests/TestCase/Network/Http/Adapter/TwitterStreamTest.php b/tests/TestCase/Network/Http/Adapter/TwitterStreamTest.php
@@ -5,7 +5,7 @@
 use Cake\Network\Http\Adapter\Stream;
 use Cake\Network\Http\Request;
 use Cake\TestSuite\TestCase;
-use CvoTechnologies\Twitter\Network\Http\Adapter\TwitterStream;
+use CvoTechnologies\Twitter\Http\Adapter\TwitterStream;
 
 /**
  * HTTP stream adapter test.

diff --git a/tests/TestCase/Network/Http/Auth/TwitterTest.php b/tests/TestCase/Network/Http/Auth/TwitterTest.php
@@ -1,16 +1,34 @@
 <?php
 
-namespace CvoTechnologies\Twitter\Test\TestCase\Network\Http\Auth;
+namespace CvoTechnologies\Twitter\Test\TestCase\Http\Client\Auth;
 
+use Cake\Http\Client;
 use Cake\Network\Http\Request;
 use Cake\TestSuite\TestCase;
-use CvoTechnologies\Twitter\Network\Http\Auth\Twitter;
+use CvoTechnologies\StreamEmulation\Emulation\HttpEmulation;
+use CvoTechnologies\StreamEmulation\StreamWrapper;
+use CvoTechnologies\Twitter\Http\Client\Auth\Twitter;
+use GuzzleHttp\Psr7\Response;
 
 /**
  * Oauth test.
  */
 class TwitterTest extends TestCase
 {
+    public function setUp()
+    {
+        parent::setUp();
+
+        StreamWrapper::overrideWrapper('https');
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+
+        StreamWrapper::restoreWrapper('https');
+    }
+
     /**
      * @expectedException \Cake\Core\Exception\Exception
      */
@@ -172,4 +190,18 @@ public function testHmacSigning()
             urldecode($result)
         );
     }
+
+    public function testUsingAuth()
+    {
+        StreamWrapper::emulate(HttpEmulation::fromCallable(function () {
+            return new Response();
+        }));
+
+        $client = new Client([
+            'auth' => [
+                'type' => 'CvoTechnologies/Twitter.Twitter'
+            ]
+        ]);
+        $client->get('https://example.com');
+    }
 }