Skip to content

Commit

Permalink
Rename WebView methods setJsFiles, setJsStrings, setJsVars, setCssFil…
Browse files Browse the repository at this point in the history
…es, setCssStrings to add* (#153)
  • Loading branch information
vjik committed May 24, 2021
1 parent 606fc14 commit d2c063a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
10 changes: 5 additions & 5 deletions src/WebView.php
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ public function getTitle(): string
*
* @param array $cssFiles
*/
public function setCssFiles(array $cssFiles): void
public function addCssFiles(array $cssFiles): void
{
foreach ($cssFiles as $key => $value) {
$this->registerCssFileByConfig(
Expand All @@ -625,7 +625,7 @@ public function setCssFiles(array $cssFiles): void
/**
* @param array $cssStrings
*/
public function setCssStrings(array $cssStrings): void
public function addCssStrings(array $cssStrings): void
{
/** @var mixed $value */
foreach ($cssStrings as $key => $value) {
Expand All @@ -641,7 +641,7 @@ public function setCssStrings(array $cssStrings): void
*
* @param array $jsFiles
*/
public function setJsFiles(array $jsFiles): void
public function addJsFiles(array $jsFiles): void
{
foreach ($jsFiles as $key => $value) {
$this->registerJsFileByConfig(
Expand All @@ -658,7 +658,7 @@ public function setJsFiles(array $jsFiles): void
*
* @throws InvalidArgumentException
*/
public function setJsStrings(array $jsStrings): void
public function addJsStrings(array $jsStrings): void
{
/** @var mixed $value */
foreach ($jsStrings as $key => $value) {
Expand All @@ -676,7 +676,7 @@ public function setJsStrings(array $jsStrings): void
*
* @throws InvalidArgumentException
*/
public function setJsVars(array $jsVars): void
public function addJsVars(array $jsVars): void
{
foreach ($jsVars as $key => $value) {
if (is_string($key)) {
Expand Down
28 changes: 14 additions & 14 deletions tests/WebViewTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -343,11 +343,11 @@ public function testRegisterJsAndRegisterScriptTagWithAjax(): void
$this->assertSame($expected, $html);
}

public function testSetCssStrings(): void
public function testAddCssStrings(): void
{
$webView = TestHelper::createWebView();

$webView->setCssStrings([
$webView->addCssStrings([
'.a1 { color: red; }',
['.a2 { color: red; }', WebView::POSITION_HEAD],
['.a3 { color: red; }', WebView::POSITION_BEGIN],
Expand Down Expand Up @@ -380,11 +380,11 @@ public function testSetCssStrings(): void
$this->assertEqualStringsIgnoringLineEndings($expected, $html);
}

public function testSetJsStrings(): void
public function testAddJsStrings(): void
{
$webView = TestHelper::createWebView();

$webView->setJsStrings([
$webView->addJsStrings([
'uniqueName' => 'app1.start();',
'app2.start();',
'uniqueName2' => ['app3.start();', WebView::POSITION_BEGIN],
Expand All @@ -404,7 +404,7 @@ public function testSetJsStrings(): void
$this->assertSame($expected, $html);
}

public function dataFailSetJsStrings(): array
public function dataFailAddJsStrings(): array
{
return [
['Do not set JS string.', [[]]],
Expand All @@ -417,20 +417,20 @@ public function dataFailSetJsStrings(): array
}

/**
* @dataProvider dataFailSetJsStrings
* @dataProvider dataFailAddJsStrings
*/
public function testFailSetJsStrings(string $message, array $jsStrings): void
public function testFailAddJsStrings(string $message, array $jsStrings): void
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage($message);
TestHelper::createWebView()->setJsStrings($jsStrings);
TestHelper::createWebView()->addJsStrings($jsStrings);
}

public function testSetJsVars(): void
public function testAddJsVars(): void
{
$webView = TestHelper::createWebView();

$webView->setJsVars([
$webView->addJsVars([
'var1' => 'value1',
'var2' => [1, 2],
['var3', 'value3', WebView::POSITION_END],
Expand All @@ -448,7 +448,7 @@ public function testSetJsVars(): void
$this->assertSame($expected, $html);
}

public function dataFailSetJsVars(): array
public function dataFailAddJsVars(): array
{
return [
['Do not set JS variable name.', [[]]],
Expand All @@ -459,12 +459,12 @@ public function dataFailSetJsVars(): array
}

/**
* @dataProvider dataFailSetJsVars
* @dataProvider dataFailAddJsVars
*/
public function testFailSetJsVars(string $message, array $jsVars): void
public function testFailAddJsVars(string $message, array $jsVars): void
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage($message);
TestHelper::createWebView()->setJsVars($jsVars);
TestHelper::createWebView()->addJsVars($jsVars);
}
}

0 comments on commit d2c063a

Please sign in to comment.