Added more tests for other drivers

bryanadamloh97 · bryanadamloh97 · commit ef5f113b8149 · 2021-06-15T14:33:15.000+08:00
diff --git a/src/Drivers/CuttLyDriverShortener.php b/src/Drivers/CuttLyDriverShortener.php
@@ -7,6 +7,7 @@
 use CodeOfDigital\LaravelUrlShortener\Exceptions\InvalidDataException;
 use CodeOfDigital\LaravelUrlShortener\Exceptions\InvalidResponseException;
 use CodeOfDigital\LaravelUrlShortener\Exceptions\ShortUrlException;
+use CodeOfDigital\LaravelUrlShortener\Exceptions\TooManyRequestException;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Psr7\Request;
@@ -39,14 +40,15 @@ public function shortenAsync($url, array $options = [])
         if (!Str::startsWith($url, ['http://', 'https://']))
             throw new ShortUrlException('The given URL must begin with http:// or https://');
 
-        $options = array_merge_recursive(Arr::add($this->object, 'query.short', urlencode($url)), ['query' => $options]);
+        $options = array_merge_recursive(Arr::add($this->object, 'query.short', $url), ['query' => $options]);
         $request = new Request('GET', '/api/api.php');
 
         return $this->client->sendAsync($request, $options)->then(
             function (ResponseInterface $response) {
-                $statusCode = json_decode($response->getBody()->getContents())->url->status;
+                $data = json_decode($response->getBody()->getContents());
+                $statusCode = $data->url->status;
                 if ($statusCode != 7) $this->getErrorMessage($statusCode);
-                return str_replace('http://', 'https://', json_decode($response->getBody()->getContents())->url->shortLink);
+                return str_replace('http://', 'https://', $data->url->shortLink);
             },
             function (RequestException $e) {
                 $this->getErrorMessage($e->getCode(), $e->getMessage());
@@ -65,7 +67,9 @@ protected function getErrorMessage($code, $message = null)
                 throw new InvalidDataException("The preferred link name is already taken.");
             case 4:
             case 401:
-                throw new InvalidApiTokenException("Your API Key is invalid and incorrect.");
+                throw new InvalidApiTokenException($message ?? "Your API Key is invalid and incorrect.");
+            case 429:
+                throw new TooManyRequestException($message);
             case 5:
                 throw new InvalidDataException("The link has not passed validated. There is invalid characters.");
             case 6:
diff --git a/src/Drivers/IsGdDriverShortener.php b/src/Drivers/IsGdDriverShortener.php
@@ -25,7 +25,7 @@ public function __construct(ClientInterface $client, $statistic)
             'allow_redirects' => false,
             'base_uri' => 'https://is.gd',
             'query' => [
-                'format' => 'json',
+                'format' => 'simple',
                 'logstats' => intval($statistic)
             ]
         ];
@@ -44,7 +44,7 @@ public function shortenAsync($url, array $options = [])
 
         return $this->client->sendAsync($request, $options)->then(
             function (ResponseInterface $response) {
-                return str_replace('http://', 'https://', json_decode($response->getBody()->getContents())->shorturl);
+                return str_replace('http://', 'https://', $response->getBody()->getContents());
             },
             function (RequestException $e) {
                 $this->getErrorMessage($e->getCode(), $e->getMessage());
diff --git a/src/Exceptions/TooManyRequestException.php b/src/Exceptions/TooManyRequestException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace CodeOfDigital\LaravelUrlShortener\Exceptions;
+
+class TooManyRequestException extends \RuntimeException
+{
+}
diff --git a/tests/Responses/cutt_ly/http-200.php b/tests/Responses/cutt_ly/http-200.php
@@ -0,0 +1,19 @@
+<?php
+
+use GuzzleHttp\Psr7\Message;
+
+return Message::parseResponse(trim('
+HTTP/1.1 200 OK
+Server: nginx
+Date: Mon, 14 Jun 2021 16:55:09 GMT
+Content-Type: application/json
+Content-Length: 263
+Connection: keep-alive
+Strict-Transport-Security: max-age=31536000; includeSubDomains
+X-XSS-Protection: 1; mode=blockFilter
+X-Content-Type-Options: nosniff
+X-Frame-Options: DENY
+Content-Security-Policy: default-src \'none
+
+{"url":{"status":7,"fullLink":"https://laravel.com","date":"2021-06-15","shortLink":"https://cutt.ly/lnHBR1m","title":"Laravel - The PHP Framework For Web Artisans"}}
+'));
diff --git a/tests/Responses/cutt_ly/http-401.php b/tests/Responses/cutt_ly/http-401.php
@@ -0,0 +1,19 @@
+<?php
+
+use GuzzleHttp\Psr7\Message;
+
+return Message::parseResponse(trim('
+HTTP/1.1 401 Unauthorized
+Server: nginx
+Date: Mon, 14 Jun 2021 16:55:09 GMT
+Content-Type: application/json
+Content-Length: 263
+Connection: keep-alive
+Strict-Transport-Security: max-age=31536000; includeSubDomains
+X-XSS-Protection: 1; mode=blockFilter
+X-Content-Type-Options: nosniff
+X-Frame-Options: DENY
+Content-Security-Policy: default-src \'none
+
+Your API Key is invalid and incorrect.
+'));
diff --git a/tests/Responses/is_gd/http-200.php b/tests/Responses/is_gd/http-200.php
@@ -0,0 +1,19 @@
+<?php
+
+use GuzzleHttp\Psr7\Message;
+
+return Message::parseResponse(trim('
+HTTP/1.1 200 OK
+Server: nginx
+Date: Mon, 14 Jun 2021 16:55:09 GMT
+Content-Type: application/json
+Content-Length: 263
+Connection: keep-alive
+Strict-Transport-Security: max-age=31536000; includeSubDomains
+X-XSS-Protection: 1; mode=blockFilter
+X-Content-Type-Options: nosniff
+X-Frame-Options: DENY
+Content-Security-Policy: default-src \'none
+
+https://is.gd/Qn8dwg
+'));
diff --git a/tests/Responses/is_gd/http-400.php b/tests/Responses/is_gd/http-400.php
@@ -0,0 +1,19 @@
+<?php
+
+use GuzzleHttp\Psr7\Message;
+
+return Message::parseResponse(trim('
+HTTP/1.1 400 Bad Request
+Server: nginx
+Date: Mon, 14 Jun 2021 16:55:09 GMT
+Content-Type: application/json
+Content-Length: 263
+Connection: keep-alive
+Strict-Transport-Security: max-age=31536000; includeSubDomains
+X-XSS-Protection: 1; mode=blockFilter
+X-Content-Type-Options: nosniff
+X-Frame-Options: DENY
+Content-Security-Policy: default-src \'none
+
+Error: Please enter a valid URL to shorten
+'));
diff --git a/tests/Responses/shorte_st/http-200.php b/tests/Responses/shorte_st/http-200.php
@@ -0,0 +1,19 @@
+<?php
+
+use GuzzleHttp\Psr7\Message;
+
+return Message::parseResponse(trim('
+HTTP/1.1 200 OK
+Server: nginx
+Date: Mon, 14 Jun 2021 16:55:09 GMT
+Content-Type: application/json
+Content-Length: 263
+Connection: keep-alive
+Strict-Transport-Security: max-age=31536000; includeSubDomains
+X-XSS-Protection: 1; mode=blockFilter
+X-Content-Type-Options: nosniff
+X-Frame-Options: DENY
+Content-Security-Policy: default-src \'none
+
+{"status":"ok","shortenedUrl":"http:\/\/gestyy.com\/ei4Z9l"}
+'));
diff --git a/tests/Responses/shorte_st/http-302.php b/tests/Responses/shorte_st/http-302.php
@@ -0,0 +1,19 @@
+<?php
+
+use GuzzleHttp\Psr7\Message;
+
+return Message::parseResponse(trim('
+HTTP/1.1 302 Found
+Server: nginx
+Date: Mon, 14 Jun 2021 16:55:09 GMT
+Content-Type: application/json
+Content-Length: 263
+Connection: keep-alive
+Strict-Transport-Security: max-age=31536000; includeSubDomains
+X-XSS-Protection: 1; mode=blockFilter
+X-Content-Type-Options: nosniff
+X-Frame-Options: DENY
+Content-Security-Policy: default-src \'none
+
+Location: https://api.shorte.st/login/
+'));
diff --git a/tests/Responses/tiny_url/http-200.php b/tests/Responses/tiny_url/http-200.php
@@ -0,0 +1,19 @@
+<?php
+
+use GuzzleHttp\Psr7\Message;
+
+return Message::parseResponse(trim('
+HTTP/1.1 200 OK
+Server: nginx
+Date: Mon, 14 Jun 2021 16:55:09 GMT
+Content-Type: application/json
+Content-Length: 263
+Connection: keep-alive
+Strict-Transport-Security: max-age=31536000; includeSubDomains
+X-XSS-Protection: 1; mode=blockFilter
+X-Content-Type-Options: nosniff
+X-Frame-Options: DENY
+Content-Security-Policy: default-src \'none
+
+{"code":0,"data":{"url":"https://laravel.com","domain":"tinyurl.com","alias":"3ffwsk3p","tags":[],"tiny_url":"https://tinyurl.com/3ffwsk3p"},"errors":[]}
+'));
diff --git a/tests/Responses/tiny_url/http-401.php b/tests/Responses/tiny_url/http-401.php
@@ -0,0 +1,19 @@
+<?php
+
+use GuzzleHttp\Psr7\Message;
+
+return Message::parseResponse(trim('
+HTTP/1.1 401 Unauthorized
+Server: nginx
+Date: Mon, 14 Jun 2021 16:55:09 GMT
+Content-Type: application/json
+Content-Length: 263
+Connection: keep-alive
+Strict-Transport-Security: max-age=31536000; includeSubDomains
+X-XSS-Protection: 1; mode=blockFilter
+X-Content-Type-Options: nosniff
+X-Frame-Options: DENY
+Content-Security-Policy: default-src \'none
+
+{"code":1,"data":null,"errors":["Unauthenticated."]}
+'));
diff --git a/tests/Unit/BitLyShortenerTest.php b/tests/Unit/BitLyShortenerTest.php
@@ -19,7 +19,7 @@ protected function setUp(): void
     /**
      * Test the URL Shortening through Bit.ly
      *
-     * @throws \CodeOfDigital\LaravelUrlShortener\Exceptions\ShortUrlException
+     * @throws ShortUrlException
      */
     public function testUrlShortening()
     {
@@ -41,7 +41,7 @@ public function testUrlShortening()
     /**
      * Test failure to authenticate with Bit.ly
      *
-     * @throws \CodeOfDigital\LaravelUrlShortener\Exceptions\ShortUrlException
+     * @throws ShortUrlException
      */
     public function testUnauthorized()
     {
diff --git a/tests/Unit/CuttLyShortenerTest.php b/tests/Unit/CuttLyShortenerTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace CodeOfDigital\LaravelUrlShortener\Tests\Unit;
+
+use CodeOfDigital\LaravelUrlShortener\Drivers\CuttLyDriverShortener;
+use CodeOfDigital\LaravelUrlShortener\Exceptions\InvalidApiTokenException;
+use CodeOfDigital\LaravelUrlShortener\Exceptions\ShortUrlException;
+
+class CuttLyShortenerTest extends TestCase
+{
+    protected $shortener;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->shortener = new CuttLyDriverShortener($this->client, 'API_TOKEN');
+    }
+
+    /**
+     * Test the URL Shortening through Cutt.ly
+     *
+     * @throws ShortUrlException
+     */
+    public function testUrlShortening()
+    {
+        $this->client->queue(require __DIR__ . '/../Responses/cutt_ly/http-200.php');
+
+        $shortUrl = $this->shortener->shorten('https://laravel.com');
+        $request = $this->client->getRequest(0);
+
+        $this->assertNotNull($request);
+        $this->assertEquals('GET', $request->getMethod());
+        $this->assertEquals('cutt.ly', $request->getUri()->getHost());
+        $this->assertEquals('/api/api.php?key=API_TOKEN&short=https%3A%2F%2Flaravel.com', $request->getRequestTarget());
+
+        $this->assertEquals('https://cutt.ly/lnHBR1m', $shortUrl);
+    }
+
+    /**
+     * Test failure to authenticate with Cutt.ly
+     *
+     * @throws ShortUrlException
+     */
+    public function testUnauthorized()
+    {
+        $this->client->queue(require __DIR__ . '/../Responses/cutt_ly/http-401.php');
+        $this->expectException(InvalidApiTokenException::class);
+        $this->shortener->shorten('https://laravel.com');
+    }
+
+    /**
+     * Test failure if parsed URL is invalid or incorrect format
+     *
+     * @throws ShortUrlException
+     */
+    public function testInvalidUrl()
+    {
+        $this->expectException(ShortUrlException::class);
+        $this->shortener->shorten('some-string.com');
+    }
+}
diff --git a/tests/Unit/IsGdShortenerTest.php b/tests/Unit/IsGdShortenerTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace CodeOfDigital\LaravelUrlShortener\Tests\Unit;
+
+use CodeOfDigital\LaravelUrlShortener\Drivers\IsGdDriverShortener;
+use CodeOfDigital\LaravelUrlShortener\Exceptions\BadRequestException;
+use CodeOfDigital\LaravelUrlShortener\Exceptions\ShortUrlException;
+
+class IsGdShortenerTest extends TestCase
+{
+    protected $shortener;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->shortener = new IsGdDriverShortener($this->client, false);
+    }
+
+    /**
+     * Test the URL Shortening through Is.gd
+     *
+     * @throws ShortUrlException
+     */
+    public function testShortening()
+    {
+        $this->client->queue(require __DIR__ . '/../Responses/is_gd/http-200.php');
+
+        $shortUrl = $this->shortener->shorten('https://laravel.com');
+        $request = $this->client->getRequest(0);
+
+        $this->assertNotNull($request);
+        $this->assertEquals('GET', $request->getMethod());
+        $this->assertEquals('is.gd', $request->getUri()->getHost());
+        $this->assertEquals('/create.php?format=simple&logstats=0&url=https%3A%2F%2Flaravel.com', $request->getRequestTarget());
+
+        $this->assertEquals('https://is.gd/Qn8dwg', $shortUrl);
+    }
+
+    /**
+     * Test failure if there is invalid syntax in request
+     *
+     * @throws ShortUrlException
+     */
+    public function testFailure()
+    {
+        $this->client->queue(require __DIR__ . '/../Responses/is_gd/http-400.php');
+        $this->expectException(BadRequestException::class);
+        $this->shortener->shorten('https://laravel,com');
+    }
+
+    /**
+     * Test failure if parsed URL is invalid or incorrect format
+     *
+     * @throws ShortUrlException
+     */
+    public function testInvalidUrl()
+    {
+        $this->expectException(ShortUrlException::class);
+        $this->shortener->shorten('some-string.com');
+    }
+}
diff --git a/tests/Unit/ShorteStShortenerTest.php b/tests/Unit/ShorteStShortenerTest.php
diff --git a/tests/Unit/TinyUrlShortenerTest.php b/tests/Unit/TinyUrlShortenerTest.php

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +<?php
++
 +namespace CodeOfDigital\LaravelUrlShortener\Exceptions;
++
 +class TooManyRequestException extends \RuntimeException
 +{
 +}