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

MDL-42629 course: renamed re-sort to sort

Browse Source
This commit is contained in:
Sam Hemelryk
2013-11-05 09:49:13 +08:00
parent f8ddf782dd
commit 115e5f052f
4 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/tests/behat/category_resort.feature
+13 -13
View File
@@ -15,9 +15,9 @@ Feature: Test we can resort categories in the management interface.
And I log in as "admin"
And I go to the courses management page
And I should see the "Course categories" management page
And I should see "Re-sort categories" in the ".category-listing-actions" "css_element"
And I should see "Re-sort the top level categories by name" in the ".category-listing-actions" "css_element"
And I should see "Re-sort the top level categories by idnumber" in the ".category-listing-actions" "css_element"
And I should see "Sort categories" in the ".category-listing-actions" "css_element"
And I should see "Sort the top level categories by name" in the ".category-listing-actions" "css_element"
And I should see "Sort the top level categories by idnumber" in the ".category-listing-actions" "css_element"
And I click on <sortby> "link" in the ".category-listing-actions" "css_element"
# Redirect.
And I should see the "Course categories" management page
@@ -26,9 +26,9 @@ Feature: Test we can resort categories in the management interface.
Examples:
| sortby | cat1 | cat2 | cat3 |
| "Re-sort categories" | "Social studies" | "Applied sciences" | "Extended social studies" |
| "Re-sort the top level categories by name" | "Applied sciences" | "Extended social studies" | "Social studies" |
| "Re-sort the top level categories by idnumber" | "Extended social studies" | "Social studies" | "Applied sciences" |
| "Sort categories" | "Social studies" | "Applied sciences" | "Extended social studies" |
| "Sort the top level categories by name" | "Applied sciences" | "Extended social studies" | "Social studies" |
| "Sort the top level categories by idnumber" | "Extended social studies" | "Social studies" | "Applied sciences" |
@javascript
Scenario Outline: Test resorting categories with JS enabled.
@@ -41,12 +41,12 @@ Feature: Test we can resort categories in the management interface.
And I log in as "admin"
And I go to the courses management page
And I should see the "Course categories" management page
And I should see "Re-sort categories" in the ".category-listing-actions" "css_element"
And I should see "Sort categories" in the ".category-listing-actions" "css_element"
And I should not see "By name" in the ".category-listing-actions" "css_element"
And I should not see "By idnumber" in the ".category-listing-actions" "css_element"
And I click on "Re-sort categories" "link"
And I should see "Re-sort the top level categories by name" in the ".category-listing-actions" "css_element"
And I should see "Re-sort the top level categories by idnumber" in the ".category-listing-actions" "css_element"
And I click on "Sort categories" "link"
And I should see "Sort the top level categories by name" in the ".category-listing-actions" "css_element"
And I should see "Sort the top level categories by idnumber" in the ".category-listing-actions" "css_element"
And I click on <sortby> "link" in the ".category-listing-actions" "css_element"
# Redirect.
And I should see the "Course categories" management page
@@ -55,9 +55,9 @@ Feature: Test we can resort categories in the management interface.
Examples:
| sortby | cat1 | cat2 | cat3 |
| "Re-sort categories" | "Social studies" | "Applied sciences" | "Extended social studies" |
| "Re-sort the top level categories by name" | "Applied sciences" | "Extended social studies" | "Social studies" |
| "Re-sort the top level categories by idnumber" | "Extended social studies" | "Social studies" | "Applied sciences" |
| "Sort categories" | "Social studies" | "Applied sciences" | "Extended social studies" |
| "Sort the top level categories by name" | "Applied sciences" | "Extended social studies" | "Social studies" |
| "Sort the top level categories by idnumber" | "Extended social studies" | "Social studies" | "Applied sciences" |
Scenario Outline: Test resorting subcategories.
Given the following "categories" exists:
course/tests/behat/course_category_management_listing.feature
+10 -10
View File
@@ -245,9 +245,9 @@ Feature: Course category management interface performs as expected
And I log in as "admin"
And I go to the courses management page
And I should see the "Course categories" management page
And I click on "Re-sort categories" "link"
And I should see "Re-sort the top level categories by name" in the ".category-listing-actions" "css_element"
And I should see "Re-sort the top level categories by idnumber" in the ".category-listing-actions" "css_element"
And I click on "Sort categories" "link"
And I should see "Sort the top level categories by name" in the ".category-listing-actions" "css_element"
And I should see "Sort the top level categories by idnumber" in the ".category-listing-actions" "css_element"
And I click on <sortby> "link" in the ".category-listing-actions" "css_element"
# Redirect.
And I should see the "Course categories" management page
@@ -256,9 +256,9 @@ Feature: Course category management interface performs as expected
Examples:
| sortby | cat1 | cat2 | cat3 |
| "Re-sort categories" | "Social studies" | "Applied sciences" | "Extended social studies" |
| "Re-sort the top level categories by name" | "Applied sciences" | "Extended social studies" | "Social studies" |
| "Re-sort the top level categories by idnumber" | "Extended social studies" | "Social studies" | "Applied sciences" |
| "Sort categories" | "Social studies" | "Applied sciences" | "Extended social studies" |
| "Sort the top level categories by name" | "Applied sciences" | "Extended social studies" | "Social studies" |
| "Sort the top level categories by idnumber" | "Extended social studies" | "Social studies" | "Applied sciences" |
@javascript
Scenario Outline: Sub categories are displayed correctly when resorted
@@ -303,7 +303,7 @@ Feature: Course category management interface performs as expected
And I click on "Cat 1" "link"
# Redirect.
And I should see the "Course categories and courses" management page
And I click on "Re-sort courses" "link"
And I click on "Sort courses" "link"
And I should see "By fullname" in the ".course-listing-actions" "css_element"
And I should see "By shortname" in the ".course-listing-actions" "css_element"
And I should see "By idnumber" in the ".course-listing-actions" "css_element"
@@ -345,7 +345,7 @@ Feature: Course category management interface performs as expected
And I click on "Cat 1" "link"
# Redirect.
And I should see the "Course categories and courses" management page
And I click on "Re-sort courses" "link"
And I click on "Sort courses" "link"
And I click on "By idnumber" "link" in the ".course-listing-actions" "css_element"
# Redirect.
And I should see "Per page: 20" in the ".course-listing-actions" "css_element"
@@ -528,7 +528,7 @@ Feature: Course category management interface performs as expected
And I click on "Cat 1" "link"
# Redirect.
And I should see the "Course categories and courses" management page
And I click on "Re-sort courses" "link"
And I click on "Sort courses" "link"
And I click on "By idnumber" "link" in the ".course-listing-actions" "css_element"
# Redirect.
And I should see "Per page: 20" in the ".course-listing-actions" "css_element"
@@ -593,7 +593,7 @@ Feature: Course category management interface performs as expected
And I click on "Cat 1" "link"
# Redirect.
And I should see the "Course categories and courses" management page
And I click on "Re-sort courses" "link"
And I click on "Sort courses" "link"
And I click on "By idnumber" "link" in the ".course-listing-actions" "css_element"
# Redirect.
And I should see the "Course categories and courses" management page
course/tests/behat/course_resort.feature
+5 -5
View File
@@ -21,7 +21,7 @@ Feature: Test we can resort course in the management interface.
And I click on category "Cat 1" in the management interface
# Redirect.
And I should see the "Course categories and courses" management page
And I should see "Re-sort courses" in the ".course-listing-actions" "css_element"
And I should see "Sort courses" in the ".course-listing-actions" "css_element"
And I should see "By fullname" in the ".course-listing-actions" "css_element"
And I should see "By shortname" in the ".course-listing-actions" "css_element"
And I should see "By idnumber" in the ".course-listing-actions" "css_element"
@@ -54,11 +54,11 @@ Feature: Test we can resort course in the management interface.
And I click on category "Cat 1" in the management interface
# Redirect.
And I should see the "Course categories and courses" management page
And I should see "Re-sort courses" in the ".course-listing-actions" "css_element"
And I should see "Sort courses" in the ".course-listing-actions" "css_element"
And I should not see "By fullname" in the ".course-listing-actions" "css_element"
And I should not see "By shortname" in the ".course-listing-actions" "css_element"
And I should not see "By idnumber" in the ".course-listing-actions" "css_element"
And I click on "Re-sort courses" "link"
And I click on "Sort courses" "link"
And I should see "By fullname" in the ".course-listing-actions" "css_element"
And I should see "By shortname" in the ".course-listing-actions" "css_element"
And I should see "By idnumber" in the ".course-listing-actions" "css_element"
@@ -92,7 +92,7 @@ Feature: Test we can resort course in the management interface.
And I should see the "Course categories and courses" management page
And I should see "Course categories" in the "#category-listing h3" "css_element"
And I should see "Cat 1" in the "#category-listing" "css_element"
And I click on "Re-sort courses" "link"
And I click on "Sort courses" "link"
And I click on "By idnumber" "link" in the ".course-listing-actions" "css_element"
# Redirect.
And I should see the "Course categories and courses" management page
@@ -129,7 +129,7 @@ Feature: Test we can resort course in the management interface.
And I should see the "Course categories and courses" management page
And I should see "Course categories" in the "#category-listing h3" "css_element"
And I should see "Cat 1" in the "#category-listing" "css_element"
And I click on "Re-sort courses" "link"
And I click on "Sort courses" "link"
And I click on "By idnumber" "link" in the ".course-listing-actions" "css_element"
# Redirect.
And I should see the "Course categories and courses" management page
lang/en/moodle.php
+8 -8
View File
@@ -1471,18 +1471,18 @@ $string['resetstartdate'] = 'Reset start date';
$string['resetstatus'] = 'Status';
$string['resettask'] = 'Task';
$string['resettodefaults'] = 'Reset to defaults';
$string['resortcategories'] = 'Re-sort categories';
$string['resortcategoriesbyname'] = 'Re-sort the top level categories by name';
$string['resortcategoriesbyidnumber'] = 'Re-sort the top level categories by idnumber';
$string['resortsubcategoriesbyname'] = 'Re-sort subcategories by name';
$string['resortsubcategoriesbyidnumber'] = 'Re-sort subcategories by idnumber';
$string['resortcourses'] = 'Re-sort courses';
$string['resortcoursesbyname'] = 'Re-sort courses by name';
$string['resortcategories'] = 'Sort categories';
$string['resortcategoriesbyname'] = 'Sort the top level categories by name';
$string['resortcategoriesbyidnumber'] = 'Sort the top level categories by idnumber';
$string['resortsubcategoriesbyname'] = 'Sort subcategories by name';
$string['resortsubcategoriesbyidnumber'] = 'Sort subcategories by idnumber';
$string['resortcourses'] = 'Sort courses';
$string['resortcoursesbyname'] = 'Sort courses by name';
$string['resortbyname'] = 'By name';
$string['resortbyshortname'] = 'By shortname';
$string['resortbyfullname'] = 'By fullname';
$string['resortbyidnumber'] = 'By idnumber';
$string['resortselectedcategoriesby'] = 'Re-sort sub categories of selected categories';
$string['resortselectedcategoriesby'] = 'Sort sub categories of selected categories';
$string['resource'] = 'Resource';
$string['resourcedisplayauto'] = 'Automatic';
$string['resourcedisplaydownload'] = 'Force download';