From fcae83b0c01eedec8470be5a09176d3c6772cb80 Mon Sep 17 00:00:00 2001
From: Adrian Palmer <navitronic@gmail.com>
Date: Mon, 19 Oct 2015 15:02:53 +1100
Subject: [PATCH] Improve tests for actually test subscriber is called by
 Guzzle

---
 .../GuzzleHttp/RequestSubscriber.php          |  5 ---
 tests/GuzzleHttpSignerTest.php                | 35 ++++++++++++-------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/HttpSignatures/GuzzleHttp/RequestSubscriber.php b/src/HttpSignatures/GuzzleHttp/RequestSubscriber.php
index 6edaea3..d466a80 100644
--- a/src/HttpSignatures/GuzzleHttp/RequestSubscriber.php
+++ b/src/HttpSignatures/GuzzleHttp/RequestSubscriber.php
@@ -27,11 +27,6 @@ class RequestSubscriber implements SubscriberInterface
     public function onBefore(BeforeEvent $event)
     {
         $request = $event->getRequest();
-
-        if ($request->getConfig()['auth'] != 'http-signatures') {
-            return;
-        }
-
         $this->context->signer()->sign(new Message($request));
     }
 }
diff --git a/tests/GuzzleHttpSignerTest.php b/tests/GuzzleHttpSignerTest.php
index 47da96d..3c9aac5 100644
--- a/tests/GuzzleHttpSignerTest.php
+++ b/tests/GuzzleHttpSignerTest.php
@@ -2,6 +2,10 @@
 
 namespace HttpSignatures\Test;
 
+use GuzzleHttp\Client;
+use GuzzleHttp\Message\Response;
+use GuzzleHttp\Subscriber\History;
+use GuzzleHttp\Subscriber\Mock;
 use HttpSignatures\GuzzleHttp\Message;
 use HttpSignatures\GuzzleHttp\RequestSubscriber;
 use HttpSignatures\Context;
@@ -14,7 +18,7 @@ class GuzzleHttpSignerTest extends \PHPUnit_Framework_TestCase
     private $context;
 
     /**
-     * @var \GuzzleHttp\Client
+     * @var Client
      */
     private $client;
 
@@ -26,9 +30,17 @@ class GuzzleHttpSignerTest extends \PHPUnit_Framework_TestCase
             'headers' => array('(request-target)', 'date'),
         ));
 
-        $this->client = new \GuzzleHttp\Client([
-            'auth' => 'http-signatures'
+        $this->client = new Client();
+
+        $mock = new Mock([
+            new Response(200)
         ]);
+
+        $this->client->getEmitter()->attach($mock);
+
+        $this->history = new History();
+        $this->client->getEmitter()->attach($this->history);
+
         $this->client->getEmitter()->attach(new RequestSubscriber($this->context));
     }
 
@@ -37,11 +49,10 @@ class GuzzleHttpSignerTest extends \PHPUnit_Framework_TestCase
      */
     public function testGuzzleRequestHasExpectedHeaders()
     {
-        $message = $this->client->createRequest('GET', '/path?query=123', array(
+        $this->client->get('/path?query=123', array(
             'headers' => array('date' => 'today', 'accept' => 'llamas')
         ));
-
-        $this->context->signer()->sign(new Message($message));
+        $message = $this->history->getLastRequest();
 
         $expectedString = implode(
             ',',
@@ -69,11 +80,10 @@ class GuzzleHttpSignerTest extends \PHPUnit_Framework_TestCase
      */
     public function testGuzzleRequestHasExpectedHeaders2()
     {
-        $message = $this->client->createRequest('GET', '/path', array(
+        $this->client->get('/path', array(
             'headers' => array('date' => 'today', 'accept' => 'llamas')
         ));
-
-        $this->context->signer()->sign(new Message($message));
+        $message = $this->history->getLastRequest();
 
         $expectedString = implode(
             ',',
@@ -98,11 +108,10 @@ class GuzzleHttpSignerTest extends \PHPUnit_Framework_TestCase
 
     public function testVerifyGuzzleRequest()
     {
-        $message = $this->client->createRequest('GET', '/path?query=123', array(
-            'headers' => array('date' => 'today', 'accept' => 'dogs')
+        $this->client->get('/path?query=123', array(
+            'headers' => array('date' => 'today', 'accept' => 'llamas')
         ));
-
-        $this->context->signer()->sign(new Message($message));
+        $message = $this->history->getLastRequest();
 
         $this->assertTrue($this->context->verifier()->isValid(new Message($message)));
     }