L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-46646_master' of https://github.com/Syxton/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2014-08-12 01:53:23 +02:00
parent 27e7715141 fc6a0fe294
commit f414c5aa9e
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/tests/behat/course_category_management_listing.feature
+3 -3
View File
@@ -295,9 +295,9 @@ Feature: Course category management interface performs as expected
| Cat 1 | 0 | CAT1 |
And the following "courses" exist:
| category | fullname | shortname | idnumber | sortorder | timecreated |
| CAT1 | Social studies | Senior school | Ext003 | 1 | 10000000001 |
| CAT1 | Applied sciences | Middle school | Sci001 | 2 | 10000000002 |
| CAT1 | Extended social studies | Junior school | Ext002 | 3 | 10000000003 |
| CAT1 | Social studies | Senior school | Ext003 | 1 | 1000000001 |
| CAT1 | Applied sciences | Middle school | Sci001 | 2 | 1000000002 |
| CAT1 | Extended social studies | Junior school | Ext002 | 3 | 1000000003 |
And I log in as "admin"
And I go to the courses management page
course/tests/behat/course_resort.feature
+6 -6
View File
@@ -11,9 +11,9 @@ Feature: Test we can resort course in the management interface.
| Cat 1 | 0 | CAT1 |
And the following "courses" exist:
| category | fullname | shortname | idnumber | sortorder | timecreated |
| CAT1 | Social studies | Senior school | Ext003 | 1 | 10000000001 |
| CAT1 | Applied sciences | Middle school | Sci001 | 2 | 10000000002 |
| CAT1 | Extended social studies | Junior school | Ext002 | 3 | 10000000003 |
| CAT1 | Social studies | Senior school | Ext003 | 1 | 1000000001 |
| CAT1 | Applied sciences | Middle school | Sci001 | 2 | 1000000002 |
| CAT1 | Extended social studies | Junior school | Ext002 | 3 | 1000000003 |
And I log in as "admin"
And I go to the courses management page
@@ -54,9 +54,9 @@ Feature: Test we can resort course in the management interface.
| Cat 1 | 0 | CAT1 |
And the following "courses" exist:
| category | fullname | shortname | idnumber | sortorder | timecreated |
| CAT1 | Social studies | Senior school | Ext003 | 1 | 10000000001 |
| CAT1 | Applied sciences | Middle school | Sci001 | 2 | 10000000002 |
| CAT1 | Extended social studies | Junior school | Ext002 | 3 | 10000000003 |
| CAT1 | Social studies | Senior school | Ext003 | 1 | 1000000001 |
| CAT1 | Applied sciences | Middle school | Sci001 | 2 | 1000000002 |
| CAT1 | Extended social studies | Junior school | Ext002 | 3 | 1000000003 |
And I log in as "admin"
And I go to the courses management page
lib/tests/coursecatlib_test.php
+4 -4
View File
@@ -396,28 +396,28 @@ class core_coursecatlib_testcase extends advanced_testcase {
'idnumber' => '006-01',
'shortname' => 'Biome Study',
'fullname' => '<span lang="ar" class="multilang">'.'دراسة منطقة إحيائية'.'</span><span lang="en" class="multilang">Biome Study</span>',
'timecreated' => '10000000001'
'timecreated' => '1000000001'
));
$course2 = $generator->create_course(array(
'category' => $category->id,
'idnumber' => '007-02',
'shortname' => 'Chemistry Revision',
'fullname' => 'Chemistry Revision',
'timecreated' => '10000000002'
'timecreated' => '1000000002'
));
$course3 = $generator->create_course(array(
'category' => $category->id,
'idnumber' => '007-03',
'shortname' => 'Swiss Rolls and Sunflowers',
'fullname' => 'Aarkvarks guide to Swiss Rolls and Sunflowers',
'timecreated' => '10000000003'
'timecreated' => '1000000003'
));
$course4 = $generator->create_course(array(
'category' => $category->id,
'idnumber' => '006-04',
'shortname' => 'Scratch',
'fullname' => '<a href="test.php">Basic Scratch</a>',
'timecreated' => '10000000004'
'timecreated' => '1000000004'
));
$c1 = (int)$course1->id;
$c2 = (int)$course2->id;