Merge pull request cakephp#711 from cakephp/ADmad-patch-1

Use new styled braced placeholders in route templates
davidspeijer · Nov 9, 2019 · c1c2058 · c1c2058
2 parents 99d5fca + a7eba21
commit c1c2058
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 56 deletions.
diff --git a/config/routes.php b/config/routes.php
@@ -35,7 +35,7 @@ function (RouteBuilder $routes) {
             $routes->connect('/', ['action' => 'index']);
             $routes->connect('/preview', ['action' => 'email']);
             $routes->connect('/preview/*', ['action' => 'email']);
-            $routes->connect('/sent/:panel/:id', ['action' => 'sent'], ['pass' => ['panel', 'id']]);
+            $routes->connect('/sent/{panel}/{id}', ['action' => 'sent'], ['pass' => ['panel', 'id']]);
         }
     );
 });
diff --git a/tests/TestCase/Middleware/DebugKitMiddlewareTest.php b/tests/TestCase/Middleware/DebugKitMiddlewareTest.php
@@ -202,40 +202,6 @@ public function testInvokeNoModifyNonHtmlResponse()
         $this->assertSame('OK', $body);
     }
 
-    /**
-     * Test that requestAction requests are not tracked or modified.
-     *
-     * @return void
-     */
-    public function testInvokeNoModifyRequestAction()
-    {
-        $request = new ServerRequest([
-            'url' => '/articles',
-            'environment' => ['REQUEST_METHOD' => 'GET'],
-            'params' => ['requested' => true],
-        ]);
-        $response = new Response([
-            'statusCode' => 200,
-            'type' => 'text/html',
-            'body' => '<body><p>things</p></body>',
-        ]);
-
-        $handler = $this->handler();
-        $handler->expects($this->once())
-            ->method('handle')
-            ->willReturn($response);
-        $middleware = new DebugKitMiddleware();
-        $result = $middleware->process($request, $handler);
-        $this->assertInstanceOf(Response::class, $result, 'Should return a response');
-
-        $requests = TableRegistry::get('DebugKit.Requests');
-        $total = $requests->find()->where(['url' => '/articles'])->count();
-
-        $this->assertEquals(0, $total, 'Should not track sub-requests');
-        $body = (string)$result->getBody();
-        $this->assertStringNotContainsString('<script', $body);
-    }
-
     /**
      * Test that configuration is correctly passed to the service
      *

diff --git a/tests/TestCase/ToolbarServiceTest.php b/tests/TestCase/ToolbarServiceTest.php
@@ -123,27 +123,6 @@ public function testInitializePanels()
         $this->assertNotEmpty(Log::getConfig('debug_kit_log_panel'), 'Panel attached logger.');
     }
 
-    /**
-     * Test that saveData ignores requestAction
-     *
-     * @return void
-     */
-    public function testSaveDataIgnoreRequestAction()
-    {
-        $request = new Request([
-            'url' => '/articles',
-            'params' => ['plugin' => null, 'requested' => 1],
-        ]);
-        $response = new Response([
-            'statusCode' => 200,
-            'type' => 'text/html',
-            'body' => '<html><title>test</title><body><p>some text</p></body>',
-        ]);
-
-        $bar = new ToolbarService($this->events, []);
-        $this->assertNull($bar->saveData($request, $response));
-    }
-
     /**
      * Test that saveData ignores debugkit paths
      *