Merge pull request #9489 from davidyell/patch-2

Add a clear of the TableRegistry to tearDown

src/TestSuite/TestCase.php

@@ -120,6 +120,7 @@ abstract class TestCase extends PHPUnit_Framework_TestCase
             Configure::clear();
             Configure::write($this->_configure);
         }
+        TableRegistry::clear();
     }
 
     /**

tests/TestCase/View/Form/EntityContextTest.php

@@ -631,6 +631,8 @@ class EntityContextTest extends TestCase
      */
     public function testValAssociatedCustomIds()
     {
+        $this->_setupTables();
+
         $row = new Article([
             'title' => 'First post',
             'user' => new Entity([