mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-05-31 20:03:32 +00:00
Merge branch 'master' into 2.5
This commit is contained in:
commit
71312932e8
4 changed files with 22 additions and 19 deletions
lib/Cake/Test/Case/Model
|
@ -155,17 +155,17 @@ class ModelIntegrationTest extends BaseModelTest {
|
|||
}
|
||||
|
||||
/**
|
||||
* Tests that $cacheSources can only be disabled in the db using model settings, not enabled
|
||||
* Tests that $cacheSources is restored despite the settings on the model.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testCacheSourcesDisabling() {
|
||||
public function testCacheSourcesRestored() {
|
||||
$this->loadFixtures('JoinA', 'JoinB', 'JoinAB', 'JoinC', 'JoinAC');
|
||||
$this->db->cacheSources = true;
|
||||
$TestModel = new JoinA();
|
||||
$TestModel->cacheSources = false;
|
||||
$TestModel->setSource('join_as');
|
||||
$this->assertFalse($this->db->cacheSources);
|
||||
$this->assertTrue($this->db->cacheSources);
|
||||
|
||||
$this->db->cacheSources = false;
|
||||
$TestModel = new JoinA();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue