mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 14:46:56 +02:00
Code Issues Releases Wiki Activity

Issue #4344 Usersettings: Homepage and Textarea set to "No - Will not show on signup page" during testing. Test now checks that these fields are not displayed. toAvatar test refinement.

Browse Source
This commit is contained in:
Cameron
2021-01-13 16:50:09 -08:00
parent 992b7b4bfe
commit a32e646bf0
2 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
e107_tests/tests/unit/e107_user_extendedTest.php
View File

@@ -15,6 +15,7 @@
private $structTypes; private $structTypes;
private $structLabels; private $structLabels;
private $userValues; private $userValues;
private $structRequired;
/** @var e107_user_extended */ /** @var e107_user_extended */
protected $ue; protected $ue;
@@ -94,6 +95,24 @@
'country' => 17, 'country' => 17,
); );
$this->structRequired = array(
'text' => 1,
'homepage' => 0, // test constant use as well.
'radio' => 1,
'dropdown' => 1,
'dbfield' => 1,
'textarea' => 0,
'integer' => 1,
'date' => 1,
'language' => 1,
'list' => 1,
'checkbox' => 1,
'predefined' => 1,
'country' => 1,
'richtextarea' => 1,
'addon' => 1
);
// clear the table. // clear the table.
$sql = e107::getDb(); $sql = e107::getDb();
if($sql->select('user_extended_struct', 'user_extended_struct_id', "user_extended_struct_text = '_system_'")) if($sql->select('user_extended_struct', 'user_extended_struct_id', "user_extended_struct_text = '_system_'"))
@@ -115,7 +134,7 @@
'values' => (isset($this->structValues[$k])) ? $this->structValues[$k] : null, 'values' => (isset($this->structValues[$k])) ? $this->structValues[$k] : null,
'default' => (isset($this->structDefault[$k])) ? $this->structDefault[$k] : null, 'default' => (isset($this->structDefault[$k])) ? $this->structDefault[$k] : null,
'parent' => (isset($this->structParent[$k])) ? $this->structParent[$k] : 0, 'parent' => (isset($this->structParent[$k])) ? $this->structParent[$k] : 0,
'required' => 1, // show in signup shortcode. 'required' => (isset($this->structRequired[$k])) ? $this->structRequired[$k] : 0,
); );
$this->ue->user_extended_add($insert); $this->ue->user_extended_add($insert);
@@ -328,13 +347,22 @@
'extended-user-fields' => "<label>{EXTENDED_USER_FIELD_TEXT}{EXTENDED_USER_FIELD_REQUIRED}</label>" // {EXTENDED_USER_FIELD_EDIT} 'extended-user-fields' => "<label>{EXTENDED_USER_FIELD_TEXT}{EXTENDED_USER_FIELD_REQUIRED}</label>" // {EXTENDED_USER_FIELD_EDIT}
); );
$expected = "<label>Text<span class='required'><!-- empty --></span></label><label>Homepage<span class='required'><!-- empty --></span></label><label>Dropdown<span class='required'><!-- empty --></span></label><label>Dbfield<span class='required'><!-- empty --></span></label><label>Integer<span class='required'><!-- empty --></span></label><label>Date<span class='required'><!-- empty --></span></label><label>Language<span class='required'><!-- empty --></span></label><label>Checkbox<span class='required'><!-- empty --></span></label><label>Predefined<span class='required'><!-- empty --></span></label><label>Addon<span class='required'><!-- empty --></span></label><label>Richtextarea<span class='required'><!-- empty --></span></label>-- Category Name --<label>Radio<span class='required'><!-- empty --></span></label><label>Textarea<span class='required'><!-- empty --></span></label><label>List<span class='required'><!-- empty --></span></label>-- Category Name 2 --<label>Country<span class='required'><!-- empty --></span></label>"; $expected = "<label>Text<span class='required'><!-- empty --></span></label><label>Dropdown<span class='required'><!-- empty --></span></label><label>Dbfield<span class='required'><!-- empty --></span></label><label>Integer<span class='required'><!-- empty --></span></label><label>Date<span class='required'><!-- empty --></span></label><label>Language<span class='required'><!-- empty --></span></label><label>Checkbox<span class='required'><!-- empty --></span></label><label>Predefined<span class='required'><!-- empty --></span></label><label>Addon<span class='required'><!-- empty --></span></label><label>Richtextarea<span class='required'><!-- empty --></span></label>-- Category Name --<label>Radio<span class='required'><!-- empty --></span></label><label>List<span class='required'><!-- empty --></span></label>-- Category Name 2 --<label>Country<span class='required'><!-- empty --></span></label>";
$sc->template = $template; $sc->template = $template;
$result = e107::getParser()->parseTemplate('{SIGNUP_EXTENDED_USER_FIELDS}', false, $sc); $result = e107::getParser()->parseTemplate('{SIGNUP_EXTENDED_USER_FIELDS}', false, $sc);
$this->assertSame($expected, $result); $this->assertSame($expected, $result);
foreach($this->structRequired as $field=>$v)
{
if($v === 0)
{
$this->assertStringNotContainsString($this->structLabels[$field], $result);
}
}
} }
@@ -793,7 +821,7 @@
'user_extended_struct_default' => '', 'user_extended_struct_default' => '',
'user_extended_struct_read' => '0', 'user_extended_struct_read' => '0',
'user_extended_struct_write' => '0', 'user_extended_struct_write' => '0',
'user_extended_struct_required' => '1', 'user_extended_struct_required' => '0',
'user_extended_struct_signup' => '0', 'user_extended_struct_signup' => '0',
'user_extended_struct_applicable' => '0', 'user_extended_struct_applicable' => '0',
'user_extended_struct_order' => '5', 'user_extended_struct_order' => '5',
@@ -958,7 +986,7 @@
'user_extended_struct_default' => '', 'user_extended_struct_default' => '',
'user_extended_struct_read' => '0', 'user_extended_struct_read' => '0',
'user_extended_struct_write' => '0', 'user_extended_struct_write' => '0',
'user_extended_struct_required' => '1', 'user_extended_struct_required' => '0',
'user_extended_struct_signup' => '0', 'user_extended_struct_signup' => '0',
'user_extended_struct_applicable' => '0', 'user_extended_struct_applicable' => '0',
'user_extended_struct_order' => '5', 'user_extended_struct_order' => '5',

5
e107_tests/tests/unit/e_parseTest.php
View File

@@ -1206,7 +1206,7 @@ while(&#036;row = &#036;sql-&gt;fetch())
"thumb.php?src=%7Be_IMAGE%7Dgeneric%2Fblank_avatar.jpg&amp;w=50&amp;h=50", "thumb.php?src=%7Be_IMAGE%7Dgeneric%2Fblank_avatar.jpg&amp;w=50&amp;h=50",
"class='img-rounded rounded user-avatar'", "class='img-rounded rounded user-avatar'",
"<a class='e-tip' title=", "<a class='e-tip' title=",
"usersettings.php" e107::getUrl()->create('user/myprofile/edit')
) )
), ),
5 => array( 5 => array(
@@ -1227,7 +1227,8 @@ while(&#036;row = &#036;sql-&gt;fetch())
) )
), ),
/** @fixme - doesn't pass under CLI */ /** @fixme - doesn't pass under CLI */
/* 6 => array( /*
7 => array(
'input' => array('user_image'=>'avatartest.png'), 'input' => array('user_image'=>'avatartest.png'),
'parms' => array('w'=>50, 'h'=>50, 'crop'=>true, 'base64'=>true, 'shape'=>'circle'), 'parms' => array('w'=>50, 'h'=>50, 'crop'=>true, 'base64'=>true, 'shape'=>'circle'),
'expected' => array( 'expected' => array(