updated tests

Author: oscarotero

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## NEXT
+
+### Changed
+
+* Updated tests
+
 ## 0.2.0 - 2016-11-22
 
 ### Changed

composer.json

@@ -19,7 +19,7 @@
     "require": {
         "php": "^5.6 || ^7.0",
         "http-interop/http-middleware": "^0.3",
-        "middlewares/utils": "~0.5"
+        "middlewares/utils": "~0.6"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.5",

tests/TrailingSlashTest.php

@@ -4,9 +4,7 @@
 
 use Middlewares\TrailingSlash;
 use Middlewares\Utils\Dispatcher;
-use Middlewares\Utils\CallableMiddleware;
-use Zend\Diactoros\ServerRequest;
-use Zend\Diactoros\Response;
+use Middlewares\Utils\Factory;
 
 class TrailingSlashTest extends \PHPUnit_Framework_TestCase
 {
@@ -23,20 +21,17 @@ public function removeProvider()
     /**
      * @dataProvider removeProvider
      */
-    public function testRemove($url, $result)
+    public function testRemove($uri, $result)
     {
-        $dispatcher = new Dispatcher([
-            new TrailingSlash(),
-
-            new CallableMiddleware(function ($request, $next) {
-                $response = new Response();
-                $response->getBody()->write((string) $request->getUri());
+        $request = Factory::createServerRequest([], 'GET', $uri);
 
-                return $response;
-            }),
-        ]);
+        $response = (new Dispatcher([
+            new TrailingSlash(),
 
-        $response = $dispatcher->dispatch(new ServerRequest([], [], $url));
+            function ($request, $next) {
+                echo $request->getUri();
+            },
+        ]))->dispatch($request);
 
         $this->assertInstanceOf('Psr\\Http\\Message\\ResponseInterface', $response);
         $this->assertEquals($result, (string) $response->getBody());
@@ -57,32 +52,29 @@ public function addProvider()
     /**
      * @dataProvider addProvider
      */
-    public function testAdd($url, $result)
+    public function testAdd($uri, $result)
     {
-        $dispatcher = new Dispatcher([
-            new TrailingSlash(true),
+        $request = Factory::createServerRequest([], 'GET', $uri);
 
-            new CallableMiddleware(function ($request, $next) {
-                $response = new Response();
-                $response->getBody()->write((string) $request->getUri());
-
-                return $response;
-            }),
-        ]);
+        $response = (new Dispatcher([
+            new TrailingSlash(true),
 
-        $response = $dispatcher->dispatch(new ServerRequest([], [], $url));
+            function ($request, $next) {
+                echo $request->getUri();
+            },
+        ]))->dispatch($request);
 
         $this->assertInstanceOf('Psr\\Http\\Message\\ResponseInterface', $response);
         $this->assertEquals($result, (string) $response->getBody());
     }
 
     public function testRedirect()
     {
-        $dispatcher = new Dispatcher([
-            (new TrailingSlash())->redirect(),
-        ]);
+        $request = Factory::createServerRequest([], 'GET', '/foo/bar/');
 
-        $response = $dispatcher->dispatch(new ServerRequest([], [], '/foo/bar/'));
+        $response = (new Dispatcher([
+            (new TrailingSlash())->redirect(),
+        ]))->dispatch($request);
 
         $this->assertInstanceOf('Psr\\Http\\Message\\ResponseInterface', $response);
         $this->assertEquals(301, (string) $response->getStatusCode());