mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 21:57:51 +02:00
Code Issues Releases Wiki Activity

Fixes #5214 form help icon fix. DST test fixes.

Browse Source
This commit is contained in:
camer0n
2024-04-05 17:29:17 -07:00
parent e4fa9eb83e
commit 145d1dea80
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_handlers/form_handler.php
View File

@@ -3235,7 +3235,10 @@ class e_form
} }
$ret = ''; $ret = '';
$ret .= '<i class="admin-ui-help-tip far fa-question-circle"><!-- --></i>'; // $ret .= '<i class="admin-ui-help-tip far fa-question-circle"><!-- --></i>';
$ret .= $this->tp->toGlyph('far-question-circle', ['class'=>'admin-ui-help-tip', 'placeholder'=>'<!-- -->']);
$ret .= '<div class="field-help" data-placement="left" style="display:none">'.defset($text,$text).'</div>'; // display:none to prevent visibility during page load. $ret .= '<div class="field-help" data-placement="left" style="display:none">'.defset($text,$text).'</div>'; // display:none to prevent visibility during page load.
return $ret; return $ret;

2
e107_tests/tests/unit/e107Test.php
View File

@@ -1562,7 +1562,7 @@ class e107Test extends \Codeception\Test\Unit
echo $result . "\n"; echo $result . "\n";
continue; continue;
} }
$this->assertEquals($var['_expected_'], $result); self::assertEquals($var['_expected_'], $result, 'Failed on test #'.$index);
// $this->assertEquals("https://localhost/e107/news", $result); // $this->assertEquals("https://localhost/e107/news", $result);
} }

10
e107_tests/tests/unit/e_formTest.php
View File

@@ -288,7 +288,7 @@ class e_formTest extends \Codeception\Test\Unit
public function testHelp() public function testHelp()
{ {
$result = $this->_frm->help('my tip'); $result = $this->_frm->help('my tip');
$this->assertSame('<i class="admin-ui-help-tip far fa-question-circle"><!-- --></i><div class="field-help" data-placement="left" style="display:none">my tip</div>', $result); self::assertSame("<i class='admin-ui-help-tip far fa-question-circle' ><!-- --></i><div class=\"field-help\" data-placement=\"left\" style=\"display:none\">my tip</div>", $result);
} }
/* /*
public function testGetRequiredString() public function testGetRequiredString()
@@ -435,9 +435,9 @@ class e_formTest extends \Codeception\Test\Unit
$this->assertEquals($expected, $actual); $this->assertEquals($expected, $actual);
// test timezone change... // test timezone change...
date_default_timezone_set('America/Los_Angeles'); date_default_timezone_set('America/Phoenix');
$actual = $this->_frm->datepicker('date_field',$time,'type=datetime&format=MM, dd, yyyy hh:ii'); $actual = $this->_frm->datepicker('date_field',$time,'type=datetime&format=MM, dd, yyyy hh:ii');
$expected = "<input class='tbox e-datetime input-xlarge form-control' type='text' size='40' id='e-datepicker-date-field' value='December, 31, 2022 17:00' data-date-unix ='true' data-date-format='MM, dd, yyyy hh:ii' data-date-ampm='false' data-date-language='en' data-date-firstday='0' /><input type='hidden' name='date_field' id='date-field' value='1672534800' />"; $expected = "<input class='tbox e-datetime input-xlarge form-control' type='text' size='40' id='e-datepicker-date-field' value='December, 31, 2022 18:00' data-date-unix ='true' data-date-format='MM, dd, yyyy hh:ii' data-date-ampm='false' data-date-language='en' data-date-firstday='0' /><input type='hidden' name='date_field' id='date-field' value='1672534800' />";
$this->assertEquals($expected, $actual); $this->assertEquals($expected, $actual);
date_default_timezone_set($prevTimeZone); date_default_timezone_set($prevTimeZone);
@@ -1108,7 +1108,7 @@ class e_formTest extends \Codeception\Test\Unit
*/ */
public function testRenderValue() public function testRenderValue()
{ {
date_default_timezone_set('America/Los_Angeles'); date_default_timezone_set('America/Phoenix');
$frm = $this->_frm; $frm = $this->_frm;
@@ -1144,7 +1144,7 @@ class e_formTest extends \Codeception\Test\Unit
'file_001' => '<a href="'.SITEURL.'e107_media/000000test/files/test.zip" title="Direct link to {e_MEDIA_FILE}test.zip" rel="external">{e_MEDIA_FILE}test.zip</a>', 'file_001' => '<a href="'.SITEURL.'e107_media/000000test/files/test.zip" title="Direct link to {e_MEDIA_FILE}test.zip" rel="external">{e_MEDIA_FILE}test.zip</a>',
'files_001' => '<ol><li>{e_MEDIA_FILE}test.zip</li></ol>', 'files_001' => '<ol><li>{e_MEDIA_FILE}test.zip</li></ol>',
'datestamp_001' => '03 Nov 2023 : 13:47', 'datestamp_001' => '03 Nov 2023 : 14:47',
'date_001' => '2018-08-23', 'date_001' => '2018-08-23',
'userclass_001' => 'Everyone (public)', 'userclass_001' => 'Everyone (public)',
'userclasses_001' => 'Everyone (public)<br />PRIVATEMENU', 'userclasses_001' => 'Everyone (public)<br />PRIVATEMENU',