Merge branch '2.1.x'

This commit is contained in:
Marc Alexander
2015-06-05 12:16:33 +02:00
11 changed files with 52 additions and 16 deletions

View File

@@ -93,16 +93,17 @@ class board3_includes_modules_helper_test extends \board3\portal\tests\testframe
'title' => 'three',
),
),
array('one', 'two')),
array('one', 'two'),
true),
);
}
/**
* @dataProvider data_generate_select_box
*/
public function test_generate_select_box($expected, $key, $select_ary, $selected_options)
public function test_generate_select_box($expected, $key, $select_ary, $selected_options, $multiple = false)
{
$this->assertEquals($expected, $this->modules_helper->generate_select_box($key, $select_ary, $selected_options));
$this->assertEquals($expected, $this->modules_helper->generate_select_box($key, $select_ary, $selected_options, $multiple));
}
public function test_generate_forum_select()