diff --git a/tests/unit/e_formTest.php b/tests/unit/e_formTest.php index 3e3b1a4d9..dad7684a6 100644 --- a/tests/unit/e_formTest.php +++ b/tests/unit/e_formTest.php @@ -18,6 +18,10 @@ // admin_ui $fields format.. + /** + * Any set to inline=false are not designed to have inline support at all. + * @var array + */ protected $_fields = array( 'text_001' => array('title'=> "Text 001", 'type' => 'text', 'writeParms'=>array('size'=>'xlarge')), @@ -25,10 +29,10 @@ // 'text_002' etc.. add other configurations with type='text' in here. 'number_001' => array('title'=> "Number 001", 'type' => 'number', 'writeParms'=>array('min'=>0)), - 'number_002' => array('title'=> "Number 002", 'type' => 'number', 'inline'=>true, 'writeParms'=>array('min'=>0)), + // 'number_002' => array('title'=> "Number 002", 'type' => 'number', 'inline'=>true, 'writeParms'=>array('min'=>0)), 'bool_001' => array('title'=> "Bool 001", 'type' => 'bool', 'writeParms'=>array('size'=>'xlarge')), - 'bool_002' => array('title'=> "Bool 002", 'type' => 'bool', 'inline'=>true, 'writeParms'=>array('size'=>'xlarge')), + // 'bool_002' => array('title'=> "Bool 002", 'type' => 'bool', 'inline'=>true, 'writeParms'=>array('size'=>'xlarge')), 'dropdown_001' => array('title'=>'Dropdown 001', 'type'=>'dropdown', 'tab'=>1, 'writeParms' => array('optArray'=>array('opt_value_1'=>'Label 1', 'opt_value_2'=>'Label 2')) ), 'dropdown_002' => array( @@ -36,7 +40,6 @@ 'type' => 'dropdown', 'width' => 'auto', 'readonly' => false, - 'inline' => true, 'filter' => true, 'thclass' => 'center', 'class' => 'center', @@ -58,37 +61,84 @@ 'tab' => 0, ), - 'textarea_001' => array('title'=> "Textarea 001", 'type' => 'textarea', 'writeParms'=>array('size'=>'xlarge','rows'=> 5)), + 'textarea_001' => array('title'=> "Textarea 001", 'type' => 'textarea', 'writeParms'=>array('size'=>'xlarge','rows'=> 5)), + + 'layout_001' => array ( 'title' => 'Layouts 001', 'type' => 'layouts', 'writeParms' => 'plugin=news&id=news_view&merge=1' ), // 'news', 'news_view', 'front' + 'layout_002' => array ( 'title' => 'Layouts 002', 'type' => 'layouts', 'writeParms'=>array('plugin'=>'news', 'id'=>'news_view', 'area'=> 'front', 'merge'=>false)), // 'news', 'news_view', 'front' + + 'image_001' => array('title'=>"Image 001", 'type' => 'image', 'inline'=>false, 'data' => 'str', 'width' => '100px', 'thclass' => 'center', 'class'=>'center', 'readParms'=>'thumb=60&thumb_urlraw=0&thumb_aw=60&legacyPath={e_FILE}downloadimages', 'readonly'=>TRUE, 'batch' => FALSE, 'filter'=>FALSE), + 'image_002' => array('title'=>"Image 002", 'type' => 'image', 'inline'=>false, 'data' => 'str', 'width' => '100px', 'thclass' => 'center', 'class'=>'center', 'readParms'=>'thumb=60&thumb_urlraw=0&thumb_aw=60&legacyPath={e_FILE}downloadimages', 'readonly'=>TRUE, 'batch' => FALSE, 'filter'=>FALSE), + + 'checkboxes_001' => array('title'=>'Checkboxes', 'type'=>'checkboxes', 'writeParms'=>array('optArray'=>array(1=>'Check Opt 1', 2=>'Check Opt 2', 3=>'Check Opt 3'))), + 'country_001' => array('title'=>'Country', 'type'=>'country'), + 'ip_001' => array('title'=>'IP', 'type'=>'ip', 'inline'=>false), + 'templates_001' => array('title'=>'Templates', 'type'=>'templates'), + 'radio_001' => array('title'=>'Radio', 'type'=>'radio', 'writeParms'=>array('optArray'=>array(1=>'Radio Opt 1', 2=>'Radio Opt 2', 3=>'Radio Opt 3'))), + 'tags_001' => array('title'=>'Tags', 'type'=>'tags'), + 'bbarea_001' => array('title'=>'BBarea', 'type'=>'bbarea', 'inline'=>false), + 'icon_001' => array('title'=>'Icon', 'type'=>'icon', 'inline'=>false), + // 'media_001' => array('title'=>'Media', 'type'=>'media', 'inline'=>false), + // 'file_001' => array('title'=>'File', 'type'=>'file', 'inline'=>false), //FIXME + // 'files_001' => array('title'=>'File', 'type'=>'files', 'inline'=>false), //FIXME + 'datestamp_001' => array('title'=>'Datestamp', 'type'=>'datestamp', 'inline'=>false), + 'date_001' => array('title'=>'Date', 'type'=>'date'), + 'userclass_001' => array('title'=>'Userclass', 'type'=>'userclass'), + 'userclasses_001' => array('title'=>'Userclasses', 'type'=>'userclasses'), + 'user_001' => array('title'=>'User', 'type'=>'user'), + 'url_001' => array('title'=>'URL', 'type'=>'url', 'inline'=>false), + 'email_001' => array('title'=>'Email', 'type'=>'email', 'inline'=>false), + 'hidden_001' => array('title'=>'Hidden', 'type'=>'hidden', 'inline'=>false), + // 'method_001' => array('title'=>'Method' , 'type'=>'method', 'inline'=>false), + 'language_001' => array('title'=>'Language' , 'type'=>'language'), + // 'lanlist_001' => array('title'=>'Lanlist' , 'type'=>'lanlist', 'inline'=>false), - 'layout_001' => array ( 'title' => 'Layouts 001', 'type' => 'layouts', 'inline' => false, 'writeParms' => 'plugin=news&id=news_view&merge=1' ), // 'news', 'news_view', 'front' - 'layout_002' => array ( 'title' => 'Layouts 002', 'type' => 'layouts', 'inline' => true, 'writeParms'=>array('plugin'=>'news', 'id'=>'news_view', 'area'=> 'front', 'merge'=>false)), // 'news', 'news_view', 'front' - // 'layout_003' => array ( 'title' => 'Layouts 003', 'type' => 'layouts', 'inline' => true, 'writeParms'=>array('plugin'=>'news', 'id'=>'news_view', 'area'=> 'front', 'merge'=>false)), // 'news', 'news_view', 'front' - 'image_001' => array('title'=>"Image 001", 'type' => 'image', 'data' => 'str', 'width' => '100px', 'thclass' => 'center', 'class'=>'center', 'readParms'=>'thumb=60&thumb_urlraw=0&thumb_aw=60&legacyPath={e_FILE}downloadimages', 'readonly'=>TRUE, 'batch' => FALSE, 'filter'=>FALSE), - 'image_002' => array('title'=>"Image 001", 'type' => 'image', 'data' => 'str', 'width' => '100px', 'thclass' => 'center', 'class'=>'center', 'readParms'=>'thumb=60&thumb_urlraw=0&thumb_aw=60&legacyPath={e_FILE}downloadimages', 'readonly'=>TRUE, 'batch' => FALSE, 'filter'=>FALSE), ); // simulated database/form values. protected $_values = array( - 'text_001' => 'some text', + 'text_001' => 'some text', - 'number_001' => 555, - 'number_002' => 444, + 'number_001' => 555, + 'number_002' => 444, - 'bool_001' => 1, - 'bool_002' => 1, + 'bool_001' => 1, + 'bool_002' => 1, - 'dropdown_001' => 'opt_value_2', + 'dropdown_001' => 'opt_value_2', + 'dropdown_002' => '1,2', - 'textarea_001' => "the quick brown fox jumps over the lazy dog", + 'textarea_001' => "the quick brown fox jumps over the lazy dog", - 'layout_001' => 'default', - 'layout_002' => 'default', + 'layout_001' => 'default', + 'layout_002' => 'default', - 'image_001' => '{e_THEME}bootstrap3/images/e107_adminlogo.png', - 'image_002' => 'butterfly.jpg', + 'image_001' => '{e_THEME}bootstrap3/images/e107_adminlogo.png', + 'image_002' => 'butterfly.jpg', + 'checkboxes_001' => '2,3', + 'country_001' => 'au', + 'ip_001' => '::1', + 'templates_001' => 'mytemplate', + 'radio_001' => 2, + 'tags_001' => 'keyword1,keyword2,keyword3', + 'bbarea_001' => '[html]bold[/html]', + 'icon_001' => '{e_IMAGE}e107_icon_32.png', + // 'media_001' => '', // TODO - saves as json format. + 'file_001' => '{e_MEDIA_FILE}test.zip', + // 'files_001' => '{e_MEDIA_FILE}test.zip', + 'datestamp_001' => 1454367600, + 'date_001' => '2018-08-23', + 'userclass_001' => 0, + 'userclasses_001' => '0,1', + 'user_001' => 1, + 'url_001' => 'https://e107.org', + 'email_001' => 'me@email.com', + 'hidden_001' => 'hidden-value', + 'method_001' => 'custom-value', + 'language_001' => 'fr', + // 'lanlist_001' => 'German', ); @@ -437,7 +487,7 @@ $select_options = array('multiple' => false); $opt_options = array(); $actual = $this->_frm->uc_select('uc', 254, $uc_options, $select_options, $opt_options); - $expected = ""; + $expected = ""; $this->assertEquals($expected, $actual); } @@ -448,7 +498,7 @@ $select_options = array('multiple' => false); $opt_options = array(); $actual = $this->_frm->uc_select('uc', 'Admin', $uc_options, $select_options, $opt_options); - $expected = ""; + $expected = ""; $this->assertEquals($expected, $actual); } @@ -459,7 +509,7 @@ $select_options = array('multiple' => true); $opt_options = array(); $actual = $this->_frm->uc_select('uc', '254,253', $uc_options, $select_options, $opt_options); - $expected = ""; + $expected = ""; $this->assertEquals($expected, $actual); } @@ -470,7 +520,7 @@ $select_options = array('multiple' => true); $opt_options = array(); $actual = $this->_frm->uc_select('uc', 'Admin,Members', $uc_options, $select_options, $opt_options); - $expected = ""; + $expected = ""; $this->assertEquals($expected, $actual); } @@ -481,7 +531,7 @@ $select_options = array('multiple' => true); $opt_options = array(); $actual = $this->_frm->uc_select('uc', 'Admin,253', $uc_options, $select_options, $opt_options); - $expected = ""; + $expected = ""; $this->assertEquals($expected, $actual); } @@ -667,36 +717,98 @@ 'bool_002' => "✓", 'dropdown_001' => 'Label 2', - 'dropdown_002' => "", + 'dropdown_002' => "", 'textarea_001' => "the quick brown fox jumps over the lazy dog", 'layout_001' => 'default', - 'layout_002' => "Default", - + 'layout_002' => 'default', 'image_001' => "\"e107_adminlogo.png\"", 'image_002' => "\"butterfly.jpg\"", + + + 'checkboxes_001' => 'Check Opt 2, Check Opt 3', + 'country_001' => 'Australia', + 'ip_001' => "::1", + 'templates_001' => 'mytemplate', + 'radio_001' => 'Radio Opt 2', + 'tags_001' => 'keyword1, keyword2, keyword3', + 'bbarea_001' => 'bold', + 'icon_001' => "e107_icon_32.png", + 'media_001' => '', + // 'file_001' => '{e_MEDIA_FILE}test.zip', + // 'files_001' => '{e_MEDIA_FILE}test.zip', + 'datestamp_001' => '01 Feb 2016 : 15:00', + 'date_001' => '2018-08-23', + 'userclass_001' => 'Everyone (public)', + 'userclasses_001' => 'Everyone (public)
PRIVATEMENU', + 'user_001' => 'e107', + 'url_001' => "https://e107.org", + 'email_001' => "me@email.com", + 'hidden_001' => '', + // 'method_001' => 'custom-value', + 'language_001' => 'French', + // 'lanlist_001' => 'German', // only works with multiple languages installed. + + ); - +//Check Opt 2, Check Opt 3 foreach($this->_fields as $field=>$att) { $value = $this->_values[$field]; $result = $frm->renderValue($field, $value, $att); + /* echo "-- ".$field."-- \n"; + print_r($result); + echo "\n\n";*/ + if(!isset($expected[$field])) { - $this->expectExceptionMessage('\$expected value for \$field not set in script'); + $this->expectExceptionMessage('\$expected value for '.$field.' not set in script'); $this->expectExceptionMessage($result); } - $this->assertEquals($expected[$field], $result); + $this->assertEquals($expected[$field], $result, 'Mismatch on '.$field); } } + public function testRenderValueInline() + { + foreach($this->_fields as $field=>$att) + { + if(isset($this->_fields[$field]['inline'])) + { + continue; + } + + $this->_fields[$field]['inline'] = true; + } + + foreach($this->_fields as $field=>$att) + { + if($att['inline'] !== true) + { + continue; + } + + $value = $this->_values[$field]; + $result = $this->_frm->renderValue($field, $value, $att, 23); + + if(!isset($this->_values[$field])) + { + $this->expectExceptionMessage('\$expected value for \$field not set in script'); + // $this->expectExceptionMessage($result); + } + + $this->assertContains('data-token',$result,$field." doesn't contain 'data-token'"); + } + + } + public function testRenderElement() { $frm = $this->_frm; @@ -712,19 +824,44 @@ 'bool_002' => " ", - 'dropdown_001' => "", - 'dropdown_002' => "", + 'dropdown_001' => "", + 'dropdown_002' => "", - 'textarea_001' => "", + 'textarea_001' => "", - 'layout_001' => "", - 'layout_002' => "", + 'layout_001' => "", + 'layout_002' => "", 'image_001' => "\"e107_adminlogo.png\"", 'image_002' => "\"butterfly.jpg\"", + 'checkboxes_001' => "
", + 'country_001' => "", + 'ip_001' => "", + 'templates_001' => "", + 'radio_001' => " ", + //todo check tags_001 is correct. + 'tags_001' => "", + + // 'bbarea_001' => 'bold', + // 'icon_001' => "e107_icon_32.png", + // 'media_001' => '', + // 'file_001' => '{e_MEDIA_FILE}test.zip', + // 'files_001' => '{e_MEDIA_FILE}test.zip', + 'datestamp_001' => "", + 'date_001' => "", + 'userclass_001' => "", + 'userclasses_001' => "", + //todo check user_001 is correct + 'user_001' => "", + 'url_001' => "", + 'email_001' => "", + 'hidden_001' => "", + // 'method_001' => 'custom-value', + 'language_001' => "", + // 'lanlist_001' => 'German', // only works with multiple languages installed. ); @@ -737,13 +874,18 @@ $result = str_replace("\n", "", $result); - // if(empty($expected[$field])) + if(empty($expected[$field])) { + continue; + // echo $result; + // echo "\n\n"; // $this->expectExceptionMessage('\$expected value for \$field not set in script'); // $this->expectExceptionMessage($result); } - $this->assertEquals($expected[$field], $result); + + + $this->assertEquals($expected[$field], $result); }