Skip to content

Commit 873b8b5

Browse files
committed
Update DataTableTest to fix formatting and adjust mocks alignment
1 parent e3e0e28 commit 873b8b5

1 file changed

Lines changed: 16 additions & 14 deletions

File tree

tests/unit/Classes/DataTable/DataTableTest.php

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use KikCMS\Classes\Phalcon\Url;
1818
use KikCMS\Classes\Translator;
1919
use KikCMS\Models\User;
20+
use KikCMS\Services\DataTable\DataTableService;
2021
use KikCMS\Services\LanguageService;
2122
use KikCMS\Services\ModelService;
2223
use KikCMS\Services\TwigService;
@@ -226,8 +227,8 @@ public function testFormatBoolean()
226227

227228
$dataTable->translator = (new TestHelper)->getTranslator();
228229

229-
$dataTable->translator->config = new StdClass;
230-
$dataTable->translator->config->application = new StdClass;
230+
$dataTable->translator->config = new StdClass;
231+
$dataTable->translator->config->application = new StdClass;
231232
$dataTable->translator->config->application->path = '';
232233

233234
$this->assertTrue(is_string($dataTable->formatBoolean(true)));
@@ -267,11 +268,9 @@ public function testFormatCheckbox()
267268

268269
public function testFormatFinderImage()
269270
{
270-
$dataTable = new TestableDataTable();
271-
272-
$tagMock = $this->getMockBuilder(Tag::class)->onlyMethods(['element'])->getMock();
273-
$urlMock = $this->getMockBuilder(Url::class)->onlyMethods(['get'])->getMock();
274-
$twigServiceMock = $this->getMockBuilder(TwigService::class)->setConstructorArgs(['', ''])->onlyMethods(['mediaFile'])->getMock();
271+
$tagMock = $this->getMockBuilder(Tag::class)->onlyMethods(['element'])->getMock();
272+
$urlMock = $this->getMockBuilder(Url::class)->onlyMethods(['get'])->getMock();
273+
$twigMock = $this->getMockBuilder(TwigService::class)->setConstructorArgs(['', ''])->onlyMethods(['mediaFile'])->getMock();
275274

276275
$attributes = [
277276
'class' => 'thumb',
@@ -280,17 +279,20 @@ public function testFormatFinderImage()
280279
'style' => 'background-image: url(url)',
281280
];
282281

283-
$tagMock->expects($this->once())->method('element')->willReturn('url')->with('div', '', $attributes);
282+
$twigMock->expects($this->once())->method('mediaFile')->willReturn('url');
284283
$urlMock->expects($this->once())->method('get')->willReturn('url');
285-
$twigServiceMock->expects($this->once())->method('mediaFile')->willReturn('url');
284+
$tagMock->expects($this->once())->method('element')->willReturn('url')->with('div', '', $attributes);
285+
286+
$dataTableService = new DataTableService();
286287

287-
$dataTable->tag = $tagMock;
288-
$dataTable->url = $urlMock;
289-
$dataTable->twigService = $twigServiceMock;
288+
$dataTableService->tag = $tagMock;
289+
$dataTableService->url = $urlMock;
290+
$dataTableService->twigService = $twigMock;
291+
$dataTableService->dataTableService = new DataTableService();
290292

291-
$dataTable->formatFinderImage(1);
293+
$dataTableService->formatFinderImage(1);
292294

293-
$this->assertEquals('', $dataTable->formatFinderImage(null));
295+
$this->assertEquals('', $dataTableService->formatFinderImage(null));
294296
}
295297

296298
public function testFormatValue()

0 commit comments

Comments
 (0)