Merge pull request #27 from Soapbox/change/SOAP-13-make-tests-pass

Make tests pass

Author: Isaac Andrade

.travis.yml

@@ -13,4 +13,4 @@ script:
 after_script:
   - mkdir -p build/logs
   - vendor/bin/phpunit --coverage-clover build/logs/clover.xml
-  - php vendor/bin/coveralls -v
+  - vendor/bin/php-coveralls --exclude-no-stmt -v

composer.json

@@ -9,21 +9,27 @@
             "email": "[email protected]"
         }
     ],
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/Soapbox/fake-requests"
+        }
+    ],
     "minimum-stability": "stable",
     "require": {
         "php": ">=7.2",
         "guzzlehttp/guzzle": "^6.2",
-        "illuminate/http": "^6.0",
-        "illuminate/support": "^6.0",
+        "illuminate/http": "^7.0",
+        "illuminate/support": "^7.0",
         "nesbot/carbon": "^2.0",
         "ramsey/uuid": "^3.6"
     },
     "require-dev": {
-        "jshayes/fake-requests": "^3.0",
+        "jshayes/fake-requests": "dev-master",
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^4.0",
+        "orchestra/testbench": "^5.0",
         "phpunit/phpunit": "^8.0",
-        "satooshi/php-coveralls": "^1.0"
+        "php-coveralls/php-coveralls": "^2.0"
     },
     "autoload": {
         "psr-4": {

src/Requests/Verifier.php

@@ -161,11 +161,11 @@ public function getContent($asResource = false)
      */
     public function isValid(string $key) : bool
     {
-        if (!$this->headers->has($this->algorithmHeader)) {
+        if (!$this->algorithmHeader || !$this->headers->has($this->algorithmHeader)) {
             return false;
         }
 
-        if (!$this->headers->has($this->signatureHeader)) {
+        if (!$this->signatureHeader || !$this->headers->has($this->signatureHeader)) {
             return false;
         }
 

tests/Exceptions/InvalidConfigurationExceptionTest.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Tests\Exceptions;
+
+use Tests\TestCase;
+use Symfony\Component\HttpFoundation\Response;
+use SoapBox\SignedRequests\Exceptions\InvalidConfigurationException;
+
+class InvalidConfigurationExceptionTest extends TestCase
+{
+    /**
+     * @test
+     */
+    public function an_invalid_configuration_exception_is_constructed_with_a_default_message()
+    {
+        $exception = new InvalidConfigurationException();
+        $this->assertEquals(InvalidConfigurationException::MESSAGE, $exception->getMessage());
+    }
+
+    /**
+     * @test
+     */
+    public function the_message_for_the_exception_can_be_overwritten_during_construction()
+    {
+        $message = "So broken";
+        $exception = new InvalidConfigurationException($message);
+        $this->assertNotEquals(InvalidConfigurationException::MESSAGE, $exception->getMessage());
+        $this->assertEquals($message, $exception->getMessage());
+    }
+
+    /**
+     * @test
+     */
+    public function it_returns_a_bad_request_status_code()
+    {
+        $exception = new InvalidConfigurationException();
+        $this->assertEquals(Response::HTTP_UNPROCESSABLE_ENTITY, $exception->getStatusCode());
+    }
+
+    /**
+     * @test
+     */
+    public function it_returns_an_empty_set_of_response_headers()
+    {
+        $exception = new InvalidConfigurationException();
+        $this->assertEmpty($exception->getHeaders());
+    }
+}

tests/Middlewares/Laravel/VerifySignatureTest.php

@@ -13,6 +13,9 @@
 use SoapBox\SignedRequests\Requests\Payload;
 use Illuminate\Contracts\Cache\Repository as Cache;
 use Illuminate\Contracts\Config\Repository as Configurations;
+use SoapBox\SignedRequests\Exceptions\ExpiredRequestException;
+use SoapBox\SignedRequests\Exceptions\InvalidConfigurationException;
+use SoapBox\SignedRequests\Exceptions\InvalidSignatureException;
 use SoapBox\SignedRequests\Middlewares\Laravel\VerifySignature;
 
 class VerifySignatureTest extends TestCase
@@ -70,10 +73,11 @@ public function it_can_be_constructed()
 
     /**
      * @test
-     * @expectedException \SoapBox\SignedRequests\Exceptions\InvalidSignatureException
      */
     public function it_throws_an_invalid_signature_exception_if_the_request_is_not_valid()
     {
+        $this->expectException(InvalidSignatureException::class);
+
         $this->configurations->shouldReceive('get')
             ->with('signed-requests.default.headers.signature')
             ->andReturn('HTTP_SIGNATURE');
@@ -190,10 +194,11 @@ public function it_should_set_the_key_when_one_is_passed()
 
     /**
      * @test
-     * @expectedException \SoapBox\SignedRequests\Exceptions\InvalidConfigurationException
      */
     public function it_should_throw_an_exception_when_it_cannot_find_the_key()
     {
+        $this->expectException(InvalidConfigurationException::class);
+
         $id = (string) Uuid::uuid4();
 
         $query = [];
@@ -217,10 +222,11 @@ public function it_should_throw_an_exception_when_it_cannot_find_the_key()
 
     /**
      * @test
-     * @expectedException \SoapBox\SignedRequests\Exceptions\ExpiredRequestException
      */
     public function it_throws_an_expired_request_exception_if_the_timestamp_on_the_request_is_outside_of_the_tolerance_allowed_for_requests()
     {
+        $this->expectException(ExpiredRequestException::class);
+
         $id = (string) Uuid::uuid4();
 
         $this->configurations->shouldReceive('get')
@@ -302,10 +308,11 @@ public function it_should_call_our_callback_if_the_id_has_not_previously_been_se
 
     /**
      * @test
-     * @expectedException \SoapBox\SignedRequests\Exceptions\ExpiredRequestException
      */
     public function it_should_throw_an_expired_request_exception_if_the_request_id_has_previously_been_seen()
     {
+        $this->expectException(ExpiredRequestException::class);
+
         $id = (string) Uuid::uuid4();
 
         $this->configurations->shouldReceive('get')
@@ -348,10 +355,11 @@ public function it_should_throw_an_expired_request_exception_if_the_request_id_h
 
     /**
      * @test
-     * @expectedException \SoapBox\SignedRequests\Exceptions\ExpiredRequestException
      */
     public function it_should_throw_an_expired_request_exception_if_the_same_request_is_played_multiple_times()
     {
+        $this->expectException(ExpiredRequestException::class);
+
         $id = (string) Uuid::uuid4();
 
         $this->configurations->shouldReceive('get')
@@ -395,10 +403,11 @@ public function it_should_throw_an_expired_request_exception_if_the_same_request
 
     /**
      * @test
-     * @expectedException \SoapBox\SignedRequests\Exceptions\ExpiredRequestException
      */
     public function it_throws_an_expired_request_exception_if_the_timestamp_on_the_request_does_not_have_the_correct_format()
     {
+        $this->expectException(ExpiredRequestException::class);
+
         $id = (string) Uuid::uuid4();
 
         $this->configurations->shouldReceive('get')