Skip to content

Commit 7f717ae

Browse files
committed
fix. saveData must true after false
1 parent 8f5f680 commit 7f717ae

3 files changed

Lines changed: 13 additions & 9 deletions

File tree

tests/system/View/ParserTest.php

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -940,25 +940,29 @@ public function testRenderCantFindView()
940940

941941
public function testRenderSavingData()
942942
{
943-
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
943+
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
944+
$expected = "<h1>Hello World</h1>\n";
945+
944946
$parser->setData(['testString' => 'Hello World']);
947+
$this->assertEquals($expected, $parser->render('Simpler', [], false));
948+
$this->assertArrayNotHasKey('testString', $parser->getData());
945949

946-
$expected = "<h1>Hello World</h1>\n";
950+
$parser->setData(['testString' => 'Hello World']);
947951
$this->assertEquals($expected, $parser->render('Simpler', [], true));
948952
$this->assertArrayHasKey('testString', $parser->getData());
949-
$this->assertEquals($expected, $parser->render('Simpler', [], false));
950-
$this->assertArrayNotHasKey('testString', $parser->getData());
951953
}
952954

953955
public function testRenderStringSavingData()
954956
{
955-
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
956-
$parser->setData(['testString' => 'Hello World']);
957-
957+
$parser = new Parser($this->config, $this->viewsDir, $this->loader);
958958
$expected = '<h1>Hello World</h1>';
959959
$pattern = '<h1>{testString}</h1>';
960+
961+
$parser->setData(['testString' => 'Hello World']);
960962
$this->assertEquals($expected, $parser->renderString($pattern, [], false));
961963
$this->assertArrayNotHasKey('testString', $parser->getData());
964+
//last set data is not saved
965+
$parser->setData(['testString' => 'Hello World']);
962966
$this->assertEquals($expected, $parser->renderString($pattern, [], true));
963967
$this->assertArrayHasKey('testString', $parser->getData());
964968
}

tests/system/View/ViewTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ public function testRenderSaveDataUseAflterSaveDataFalse()
361361
$view->setVar('testString', 'test');
362362
$view->render('simple', null, true);
363363
$view->render('simple', null, false);
364-
$this->assertEquals('test', $view->render('simple', null, false));
364+
$this->assertStringContainsString('<h1>test</h1>', $view->render('simple', null, false));
365365
}
366366

367367
}

tests/system/View/Views/simple.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<h1><?= $testString ?></h1>
1+
<h1><?= $testString ?></h1>

0 commit comments

Comments
 (0)