Merge pull request #986 from cakephp/2.x-assert-nick

[2.x] Correct asserted view code
cakephp · Apr 26, 2024 · 7d7c919 · 7d7c919
2 parents f90d514 + b4167f8
commit 7d7c919
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/tests/TestCase/Command/TemplateCommandTest.php b/tests/TestCase/Command/TemplateCommandTest.php
@@ -439,6 +439,11 @@ public function testGetContentWithRoutingPrefix()
      */
     public function testBakeView()
     {
+        if (version_compare(Configure::version(), '4.5.0', '<')) {
+            $this->markTestSkipped(
+                'CakePHP versions older than 4.5.0 will generate `$author->profile->nick` instead of `$author->profile->id`'
+            );
+        }
         $this->generatedFile = ROOT . 'templates/Authors/view.php';
         $this->exec('bake template authors view');
 

diff --git a/tests/comparisons/Template/testBakeView.php b/tests/comparisons/Template/testBakeView.php
@@ -28,7 +28,7 @@
                 </tr>
                 <tr>
                     <th><?= __('Profile') ?></th>
-                    <td><?= $author->has('profile') ? $this->Html->link($author->profile->id, ['controller' => 'Profiles', 'action' => 'view', $author->profile->id]) : '' ?></td>
+                    <td><?= $author->has('profile') ? $this->Html->link($author->profile->nick, ['controller' => 'Profiles', 'action' => 'view', $author->profile->id]) : '' ?></td>
                 </tr>
                 <tr>
                     <th><?= __('Id') ?></th>