Browse Source

Fix failing tests from 4.x backport

Mark Story 6 years ago
parent
commit
a3a007b37f

+ 1 - 1
src/ORM/Association/Loader/SelectWithPivotLoader.php

@@ -130,7 +130,7 @@ class SelectWithPivotLoader extends SelectLoader
     /**
      * @inheritDoc
      */
-    protected function _assertFieldsPresent(Query $fetchQuery, array $key)
+    protected function _assertFieldsPresent($fetchQuery, $key)
     {
         // _buildQuery() manually adds in required fields from junction table
     }

+ 1 - 1
tests/TestCase/View/ViewTest.php

@@ -1086,7 +1086,7 @@ class ViewTest extends TestCase
             'path' => CACHE . 'views/',
             'prefix' => '',
         ]);
-        Cache::clear('test_view');
+        Cache::clear(true, 'test_view');
 
         $View = $this->PostsController->createView();
         $View->setElementCache('test_view');

tests/test_app/TestApp/Template/Element/subfolder/test_element.php → tests/test_app/TestApp/Template/Element/subfolder/test_element.ctp