diff options
author | MaurĂcio Meneghini Fauth <mauricio@fauth.dev> | 2021-05-07 19:01:36 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-07 19:01:36 +0300 |
commit | 06b01ac63fcdd6246f8966ec5c1191e8cf4bbeb4 (patch) | |
tree | f6602f63875f79b786e1ca9ecff9f79fc6ed7049 /test/classes | |
parent | d8a224ec6ce4a2114d289d3e108dbd34397c2f24 (diff) | |
parent | debb6af80f33544dd222b917b9fb69ea4decd239 (diff) |
Merge pull request #16875 from danielTiringer/14801-extract-server-select-html-to-twig
Extract Server/Select HTML to Twig
Diffstat (limited to 'test/classes')
-rw-r--r-- | test/classes/Server/SelectTest.php | 112 |
1 files changed, 56 insertions, 56 deletions
diff --git a/test/classes/Server/SelectTest.php b/test/classes/Server/SelectTest.php index e2c001d8ca..646d40b269 100644 --- a/test/classes/Server/SelectTest.php +++ b/test/classes/Server/SelectTest.php @@ -38,17 +38,6 @@ class SelectTest extends AbstractTestCase $GLOBALS['table'] = 'table'; - //$_SESSION - } - - /** - * Test for Select::render - */ - public function testRender(): void - { - $not_only_options = false; - $omit_fieldset = false; - $GLOBALS['cfg']['DefaultTabServer'] = 'welcome'; $GLOBALS['cfg']['Servers'] = [ @@ -67,57 +56,50 @@ class SelectTest extends AbstractTestCase 'auth_type' => 'config', ], ]; + //$_SESSION + } - //$not_only_options=false & $omit_fieldset=false - $html = Select::render($not_only_options, $omit_fieldset); - $server = $GLOBALS['cfg']['Servers']['0']; - - //server items - $this->assertStringContainsString( - $server['host'], - $html - ); - $this->assertStringContainsString( - $server['port'], - $html - ); - $this->assertStringContainsString( - $server['only_db'], - $html - ); - $this->assertStringContainsString( - $server['user'], - $html - ); - - $not_only_options = true; - $omit_fieldset = true; - $GLOBALS['cfg']['DisplayServersList'] = null; + /** + * Test for Select::render + * + * @dataProvider renderDataProvider + */ + public function testRender(bool $not_only_options, bool $omit_fieldset): void + { + if ($not_only_options) { + $GLOBALS['cfg']['DisplayServersList'] = null; + } - //$not_only_options=true & $omit_fieldset=true $html = Select::render($not_only_options, $omit_fieldset); + $server = $GLOBALS['cfg']['Servers']['0']; - //$GLOBALS['cfg']['DefaultTabServer'] - $this->assertStringContainsString( - Util::getScriptNameForOption( - $GLOBALS['cfg']['DefaultTabServer'], - 'server' - ), - $html - ); - - //labels - $this->assertStringContainsString( - __('Current server:'), - $html - ); - $this->assertStringContainsString( - '(' . __('Servers') . ')', - $html - ); + if ($not_only_options) { + if (! $omit_fieldset) { + $this->assertStringContainsString( + '</fieldset>', + $html + ); + } + + $this->assertStringContainsString( + Util::getScriptNameForOption( + $GLOBALS['cfg']['DefaultTabServer'], + 'server' + ), + $html + ); + + $this->assertStringContainsString( + __('Current server:'), + $html + ); + $this->assertStringContainsString( + '(' . __('Servers') . ')', + $html + ); + } //server items - $server = $GLOBALS['cfg']['Servers']['0']; $this->assertStringContainsString( $server['host'], $html @@ -135,4 +117,22 @@ class SelectTest extends AbstractTestCase $html ); } + + public function renderDataProvider(): array + { + return [ + 'only options, don\'t omit fieldset' => [ + false, + false, + ], + 'not only options, omits fieldset' => [ + true, + true, + ], + 'not only options, don\'t omit fieldset' => [ + true, + false, + ], + ]; + } } |