Resolve Tests, Remove Webhooks Api Spec

Author: Brandin

spec/NewTwitchApi/HelixGuzzleClientSpec.php

@@ -2,15 +2,19 @@
 
 namespace spec\NewTwitchApi;
 
-use GuzzleHttp\Psr7\Uri;
+use NewTwitchApi\HelixGuzzleClient;
 use PhpSpec\ObjectBehavior;
 
 class HelixGuzzleClientSpec extends ObjectBehavior
 {
+    function let(HelixGuzzleClient $guzzleClient)
+    {
+        $this->beConstructedWith('TEST_CLIENT_ID');
+    }
+
     function it_should_have_correct_base_uri()
     {
-        $this->beConstructedThrough('getClient', ['client-id']);
-        $this->shouldHaveType('\GuzzleHttp\Client');
+        $this->shouldHaveType('\NewTwitchApi\HelixGuzzleClient');
 
         /** @var Uri $uri */
         $uri = $this->getConfig('base_uri');
@@ -21,22 +25,21 @@ function it_should_have_correct_base_uri()
 
     function it_should_have_client_id_header()
     {
-        $this->beConstructedThrough('getClient', ['client-id']);
-        $this->shouldHaveType('\GuzzleHttp\Client');
-        $this->getConfig('headers')->shouldHaveKeyWithValue('Client-ID', 'client-id');
+        $this->shouldHaveType('\NewTwitchApi\HelixGuzzleClient');
+        $this->getConfig('headers')->shouldHaveKeyWithValue('Client-ID', 'TEST_CLIENT_ID');
     }
 
     function it_should_have_json_content_type_header()
     {
-        $this->beConstructedThrough('getClient', ['client-id']);
-        $this->shouldHaveType('\GuzzleHttp\Client');
+
+        $this->shouldHaveType('\NewTwitchApi\HelixGuzzleClient');
         $this->getConfig('headers')->shouldHaveKeyWithValue('Content-Type', 'application/json');
     }
 
     function it_should_have_passed_in_config_params_instead_of_defaults()
     {
-        $this->beConstructedThrough('getClient', ['client-id', ['base_uri' => 'https://different.url']]);
-        $this->shouldHaveType('\GuzzleHttp\Client');
+        $this->beConstructedWith('TEST_CLIENT_ID', ['base_uri' => 'https://different.url']);
+        $this->shouldHaveType('\NewTwitchApi\HelixGuzzleClient');
         $this->getConfig('base_uri')->getHost()->shouldBe('different.url');
     }
 }

spec/NewTwitchApi/Webhooks/WebhooksSubscriptionApiSpec.php

@@ -13,13 +13,13 @@ class HelixGuzzleClient
 
     public function __construct(string $clientId, array $config = [], string $baseUri = null)
     {
-        if ($baseUri === null) {
-            $baseUri = self::BASE_URI;
-        }
+      if($baseUri == null) {
+        $baseUri = self::BASE_URI;
+      }
 
         $headers = [
           'Client-ID' => $clientId,
-          'Accept' => 'application/json',
+          'Content-Type' => 'application/json',
         ];
 
         $client_config = [
@@ -36,9 +36,9 @@ public function __construct(string $clientId, array $config = [], string $baseUr
         $this->client = new Client($client_config);
     }
 
-    public static function getClient(string $clientId, array $config = []): Client
+    public function getConfig($option = null)
     {
-        return $this->client;
+        return $this->client->getConfig($option);
     }
 
     public function send($request)