Tests fixes

test/Application/ConfigInjectionTest.php

@@ -9,6 +9,7 @@
 
 namespace ZendTest\Expressive\Application;
 
+use Interop\Http\Server\MiddlewareInterface;
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
@@ -60,7 +61,7 @@ public static function assertRoute($spec, array $routes)
                     return false;
                 }
 
-                if ($route->getMiddleware() !== $spec['middleware']) {
+                if (! $route->getMiddleware() instanceof MiddlewareInterface) {
                     return false;
                 }
 
@@ -117,6 +118,9 @@ function () {
      */
     public function testInjectRoutesFromConfigSetsUpRoutesFromConfig($middleware)
     {
+        $this->container->has('HelloWorld')->willReturn(true);
+        $this->container->has('Ping')->willReturn(true);
+
         $config = [
             'routes' => [
                 [

test/ApplicationTest.php

@@ -14,6 +14,7 @@
 use Interop\Http\Server\RequestHandlerInterface;
 use InvalidArgumentException;
 use Mockery;
+use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
@@ -138,15 +139,6 @@ public function testCanCallRouteWithMultipleHttpMethods()
         $this->assertSame($methods, $route->getAllowedMethods());
     }
 
-    public function testCanCallRouteWithARoute()
-    {
-        $route = new Route('/foo', $this->noopMiddleware);
-        $this->router->addRoute($route)->shouldBeCalled();
-        $app   = $this->getApp();
-        $test  = $app->route($route);
-        $this->assertSame($route, $test);
-    }
-
     public function testCallingRouteWithExistingPathAndOmittingMethodsArgumentRaisesException()
     {
         $this->router->addRoute(Argument::type(Route::class))->shouldBeCalledTimes(2);
@@ -543,14 +535,24 @@ public function testRunReturnsResponseWithBadRequestStatusWhenServerRequestFacto
 
     public function testRetrieveRegisteredRoutes()
     {
-        $route = new Route('/foo', $this->noopMiddleware);
-        $this->router->addRoute($route)->shouldBeCalled();
+        // $route = new Route('/foo', $this->noopMiddleware);
+        $this->router->addRoute(Argument::that(function ($arg) {
+            Assert::assertInstanceOf(Route::class, $arg);
+            Assert::assertSame('/foo', $arg->getPath());
+            Assert::assertSame($this->noopMiddleware, $arg->getMiddleware());
+            return true;
+        }))->shouldBeCalled();
+
         $app = $this->getApp();
-        $test = $app->route($route);
-        $this->assertSame($route, $test);
+        $test = $app->route('/foo', $this->noopMiddleware);
+
+        $this->assertInstanceOf(Route::class, $test);
+        $this->assertSame('/foo', $test->getPath());
+        $this->assertSame($this->noopMiddleware, $test->getMiddleware());
+
         $routes = $app->getRoutes();
         $this->assertCount(1, $routes);
-        $this->assertInstanceOf(Route::class, $routes[0]);
+        $this->assertContainsOnlyInstancesOf(Route::class, $routes);
     }
 
     /**

test/Container/ApplicationFactoryTest.php

@@ -10,6 +10,7 @@
 namespace ZendTest\Expressive\Container;
 
 use ArrayObject;
+use Interop\Http\Server\MiddlewareInterface;
 use Interop\Http\Server\RequestHandlerInterface;
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
@@ -82,7 +83,7 @@ public static function assertRoute($spec, array $routes)
                     return false;
                 }
 
-                if ($route->getMiddleware() !== $spec['middleware']) {
+                if (! $route->getMiddleware() instanceof MiddlewareInterface) {
                     return false;
                 }
 
@@ -129,7 +130,6 @@ public function callableMiddlewares()
             'service-name' => 'HelloWorld',
             'closure' => function () {
             },
-            'callable' => [InvokableMiddleware::class, 'staticallyCallableMiddleware'],
         ];
 
         $configTypes = [
@@ -153,6 +153,9 @@ public function callableMiddlewares()
      */
     public function testFactorySetsUpRoutesFromConfig($middleware, $configType)
     {
+        $this->container->has('HelloWorld')->willReturn(true);
+        $this->container->has('Ping')->willReturn(true);
+
         $config = [
             'routes' => [
                 [
@@ -233,9 +236,12 @@ public function testMiddlewareIsNotAddedIfSpecIsInvalid($configType)
      * @dataProvider configTypes
      *
      * @param null|string $configType
+     * @group xya
      */
     public function testCanSpecifyRouteViaConfigurationWithNoMethods($configType)
     {
+        $this->container->has('HelloWorld')->willReturn(true);
+
         $config = [
             'routes' => [
                 [
@@ -265,6 +271,8 @@ public function testCanSpecifyRouteViaConfigurationWithNoMethods($configType)
      */
     public function testCanSpecifyRouteOptionsViaConfiguration($configType)
     {
+        $this->container->has('HelloWorld')->willReturn(true);
+
         $expected = [
             'values' => [
                 'foo' => 'bar',
@@ -331,6 +339,8 @@ public function testExceptionIsRaisedInCaseOfInvalidRouteMethodsConfiguration($c
      */
     public function testExceptionIsRaisedInCaseOfInvalidRouteOptionsConfiguration($configType)
     {
+        $this->container->has('HelloWorld')->willReturn(true);
+
         $config = [
             'routes' => [
                 [

test/Middleware/RouteMiddlewareTest.php

@@ -67,7 +67,7 @@ public function testRoutingFailureDueToHttpMethodCallsNextWithNotAllowedResponse
 
     public function testGeneralRoutingFailureInvokesDelegateWithSameRequest()
     {
-        $result = RouteResult::fromRouteFailure([]);
+        $result = RouteResult::fromRouteFailure(Route::HTTP_METHOD_ANY);
 
         $this->router->match($this->request->reveal())->willReturn($result);
         $this->response->withStatus()->shouldNotBeCalled();