moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-64784' of https://github.com/paulholden/moodle

Browse source
This commit is contained in:
Adrian Greeve 2019-05-22 14:48:28 +08:00
commit bcc1ec54d2
2 changed files with 37 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/tests/tablelib_test.php
View file

@ -526,7 +526,6 @@ class core_tablelib_testcase extends basic_testcase {
}
public function test_can_be_reset() {
// Table in its default state (as if seen for the first time), nothing to reset.
$table = $this->prepare_table_for_reset_test(uniqid('tablelib_test_'));
$table->setup();
@ -538,21 +537,25 @@ class core_tablelib_testcase extends basic_testcase {
$table->setup();
$this->assertFalse($table->can_be_reset());
// Table explicitly sorted by the default column (reverses the order), can be reset.
// Table explicitly sorted by the default column & direction, nothing to reset.
$table = $this->prepare_table_for_reset_test(uniqid('tablelib_test_'));
$table->sortable(true, 'column1', SORT_DESC);
$_GET['tsort'] = 'column1';
$_GET['tdir'] = SORT_DESC;
$table->setup();
unset($_GET['tsort']);
$this->assertTrue($table->can_be_reset());
unset($_GET['tdir']);
$this->assertFalse($table->can_be_reset());
// Table explicitly sorted twice by the default column (puts back to default order), nothing to reset.
// Table explicitly sorted twice by the default column & direction, nothing to reset.
$table = $this->prepare_table_for_reset_test(uniqid('tablelib_test_'));
$table->sortable(true, 'column1', SORT_DESC);
$_GET['tsort'] = 'column1';
$_GET['tdir'] = SORT_DESC;
$table->setup();
$table->setup(); // Set up again to simulate the second page request.
unset($_GET['tsort']);
unset($_GET['tdir']);
$this->assertFalse($table->can_be_reset());
// Table sorted by other than default column, can be reset.
@ -563,6 +566,16 @@ class core_tablelib_testcase extends basic_testcase {
unset($_GET['tsort']);
$this->assertTrue($table->can_be_reset());
// Table sorted by other than default direction, can be reset.
$table = $this->prepare_table_for_reset_test(uniqid('tablelib_test_'));
$table->sortable(true, 'column1', SORT_DESC);
$_GET['tsort'] = 'column1';
$_GET['tdir'] = SORT_ASC;
$table->setup();
unset($_GET['tsort']);
unset($_GET['tdir']);
$this->assertTrue($table->can_be_reset());
// Table sorted by the default column after another sorting previously selected.
// This leads to different ORDER BY than just having a single sort defined, can be reset.
$table = $this->prepare_table_for_reset_test(uniqid('tablelib_test_'));