Merge branch 'MDL-39232_master' of git://github.com/dmonllao/moodle

Chitrank-Dixit · Apr 30, 2013 · 6a222aa · 6a222aa
2 parents fdba83d + 550d842
commit 6a222aa
Show file tree

Hide file tree

Showing 84 changed files with 86 additions and 86 deletions.
diff --git a/admin/tests/behat/display_short_names.feature b/admin/tests/behat/display_short_names.feature
@@ -1,4 +1,4 @@
-@admin
+@core @core_admin
 Feature: Display extended course names
   In order to display more info about the courses
   As a moodle admin

diff --git a/admin/tests/behat/filter_users.feature b/admin/tests/behat/filter_users.feature
@@ -1,4 +1,4 @@
-@admin
+@core @core_admin
 Feature: An administrator can filter user accounts by role, cohort and other profile fields
   In order to find the user accounts I am looking for
   As a moodle admin

diff --git a/admin/tests/behat/upload_users.feature b/admin/tests/behat/upload_users.feature
@@ -1,4 +1,4 @@
-@admin @_only_local
+@core @core_admin @_only_local
 Feature: Upload users
   In order to add users to the system
   As a moodle admin

diff --git a/admin/tool/behat/tests/behat/basic_actions.feature b/admin/tool/behat/tests/behat/basic_actions.feature
@@ -1,4 +1,4 @@
-@tool_behat
+@tool @tool_behat
 Feature: Page contents assertions
   In order to write good tests
   As a tests writer

diff --git a/admin/tool/behat/tests/behat/data_generators.feature b/admin/tool/behat/tests/behat/data_generators.feature
@@ -1,4 +1,4 @@
-@tool_behat
+@tool @tool_behat
 Feature: Set up contextual data for tests
   In order to write tests quickly
   As a moodle developer

diff --git a/admin/tool/behat/tests/behat/edit_permissions.feature b/admin/tool/behat/tests/behat/edit_permissions.feature
@@ -1,4 +1,4 @@
-@tool_behat
+@tool @tool_behat
 Feature: Edit capabilities
   In order to extend and restrict moodle features
   As an admin or teacher

diff --git a/admin/tool/behat/tests/behat/list_steps.feature b/admin/tool/behat/tests/behat/list_steps.feature
@@ -1,4 +1,4 @@
-@tool_behat
+@tool @tool_behat
 Feature: List the system steps definitions
   In order to create new tests
   As a tests writer

diff --git a/admin/tool/behat/tests/behat/manipulate_forms.feature b/admin/tool/behat/tests/behat/manipulate_forms.feature
@@ -1,4 +1,4 @@
-@tool_behat @core_form
+@tool @tool_behat
 Feature: Forms manipulation
   In order to interact with Moodle
   As a user

diff --git a/admin/tool/behat/tests/behat/nasty_strings.feature b/admin/tool/behat/tests/behat/nasty_strings.feature
@@ -1,4 +1,4 @@
-@tool_behat
+@tool @tool_behat
 Feature: Transform steps arguments
   In order to write tests with complex nasty arguments
   As a tests writer

diff --git a/admin/tool/behat/tests/behat/test_environment.feature b/admin/tool/behat/tests/behat/test_environment.feature
@@ -1,4 +1,4 @@
-@tool_behat
+@tool @tool_behat
 Feature: Set up the testing environment
   In order to execute automated acceptance tests
   As a moodle developer

diff --git a/auth/tests/behat/login.feature b/auth/tests/behat/login.feature
@@ -1,4 +1,4 @@
-@auth
+@core @core_auth
 Feature: Authentication
   In order to validate my credentials in the system
   As a moodle user

diff --git a/backup/util/ui/tests/behat/backup_courses.feature b/backup/util/ui/tests/behat/backup_courses.feature
@@ -1,4 +1,4 @@
-@backup
+@core @core_backup
 Feature: Backup Moodle courses
   In order to save and store course contents
   As a moodle admin

diff --git a/backup/util/ui/tests/behat/duplicate_activities.feature b/backup/util/ui/tests/behat/duplicate_activities.feature
@@ -1,4 +1,4 @@
-@backup
+@core @core_backup
 Feature: Duplicate activities
   In order to set up my course contents quickly
   As a moodle teacher

diff --git a/backup/util/ui/tests/behat/import_course.feature b/backup/util/ui/tests/behat/import_course.feature
@@ -1,4 +1,4 @@
-@backup
+@core @core_backup
 Feature: Import course's contents into another course
   In order to move and copy contents between courses
   As a moodle teacher

diff --git a/backup/util/ui/tests/behat/restore_moodle2_courses.feature b/backup/util/ui/tests/behat/restore_moodle2_courses.feature
@@ -1,4 +1,4 @@
-@backup
+@core @core_backup
 Feature: Restore Moodle 2 course backups
   In order to continue using my stored course contents
   As a moodle teacher and as a moodle admin

diff --git a/badges/tests/behat/add_badge.feature b/badges/tests/behat/add_badge.feature
@@ -1,4 +1,4 @@
-@badges
+@core @core_badges @_only_local
 Feature: Add badges to the system
   In order to give badges to users for their achievements
   As an admin

diff --git a/badges/tests/behat/award_badge.feature b/badges/tests/behat/award_badge.feature
@@ -1,4 +1,4 @@
-@award_badges
+@core @core_badges @_only_local
 Feature: Award badges
   In order to award badges to users for their achievements
   As an admin

diff --git a/blocks/comments/tests/behat/add_comment.feature b/blocks/comments/tests/behat/add_comment.feature
@@ -1,4 +1,4 @@
-@core_comment
+@block @block_comments
 Feature: Add a comment to the comments block
   In order to comment on a conversation or a topic
   As a moodle user

diff --git a/blocks/comments/tests/behat/delete_comment.feature b/blocks/comments/tests/behat/delete_comment.feature
@@ -1,4 +1,4 @@
-@core_comment
+@block @block_comments
 Feature: Delete comment block messages
   In order to refine comment block's contents
   As a moodle teacher

diff --git a/blocks/tests/behat/add_blocks.feature b/blocks/tests/behat/add_blocks.feature
@@ -1,4 +1,4 @@
-@blocks
+@core @core_block
 Feature: Add blocks
   In order to add more functionality to pages
   As a teacher

diff --git a/blocks/tests/behat/configure_block_throughout_site.feature b/blocks/tests/behat/configure_block_throughout_site.feature
@@ -1,4 +1,4 @@
-@blocks @admin
+@core @core_block
 Feature: Add and configure blocks throughout the site
   In order to maintain some patterns across all the site
   As a moodle manager

diff --git a/blocks/tests/behat/restrict_available_blocks.feature b/blocks/tests/behat/restrict_available_blocks.feature
@@ -1,4 +1,4 @@
-@blocks
+@core @core_block
 Feature: Allowed blocks controls
   In order to prevent the use of some blocks
   As an admin

diff --git a/blog/tests/behat/comment.feature b/blog/tests/behat/comment.feature
@@ -1,4 +1,4 @@
-@blog
+@core @core_blog
 Feature: Comment on a blog entry
   In order to respond to a blog post
   As a moodle user
@@ -75,4 +75,4 @@ Feature: Comment on a blog entry
     And I fill in "content" with "$My own >nasty< \"string\"!"
     And I follow "Save comment"
     And I wait "4" seconds
-    Then I should see "$My own >nasty< \"string\"!"
+    Then I should see "$My own >nasty< \"string\"!"
diff --git a/cohort/tests/behat/add_cohort.feature b/cohort/tests/behat/add_cohort.feature
@@ -1,4 +1,4 @@
-@admin @cohorts
+@core @core_cohort
 Feature: Add cohorts of users
   In order to create site-wide groups
   As a moodle admin
@@ -44,7 +44,7 @@ Feature: Add cohorts of users
     And the "Current users" select box should not contain "Forth User ([email protected])"
 
   @javascript
-  Scenario: Add users to a cohort uploading a users file
+  Scenario: Add users to a cohort using a bulk user action
     When I follow "Bulk user actions"
     And I select "Third User" from "Available"
     And I press "Add to selection"

diff --git a/cohort/tests/behat/upload_cohort_users.feature b/cohort/tests/behat/upload_cohort_users.feature
@@ -1,4 +1,4 @@
-@admin @cohorts
+@core @core_cohort @_only_local
 Feature: Upload users to a cohort
   In order to quickly fill site-wide groups with users
   As a moodle admin

diff --git a/completion/tests/behat/enable_manual_complete_mark.feature b/completion/tests/behat/enable_manual_complete_mark.feature
@@ -1,4 +1,4 @@
-@core_completion
+@core @core_completion
 Feature: Allow students to manually mark an activity as complete
   In order to let students decide when an activity is completed
   As a moodle teacher

diff --git a/completion/tests/behat/restrict_section_availability.feature b/completion/tests/behat/restrict_section_availability.feature
@@ -1,4 +1,4 @@
-@core_completion
+@core @core_completion
 Feature: Restrict sections availability through completion conditions
   In order to control section's contents access through activities completion
   As a moodle teacher

diff --git a/course/tests/behat/activities_group_icons.feature b/course/tests/behat/activities_group_icons.feature
@@ -1,4 +1,4 @@
-@core_course @_cross_browser
+@core @core_course @_cross_browser
 Feature: Toggle activities groups mode from the course page
   In order to split activities in groups
   As a moodle teacher

diff --git a/course/tests/behat/activities_indentation.feature b/course/tests/behat/activities_indentation.feature
@@ -1,4 +1,4 @@
-@core_course @_cross_browser
+@core @core_course @_cross_browser
 Feature: Indent items on the course page
   In order to create a structured view of activities
   As a moodle teacher

diff --git a/course/tests/behat/activities_visibility_icons.feature b/course/tests/behat/activities_visibility_icons.feature
@@ -1,4 +1,4 @@
-@core_course @_cross_browser
+@core @core_course @_cross_browser
 Feature: Toggle activities visibility from the course page
   In order to delay activities availability
   As a moodle teacher

diff --git a/course/tests/behat/add_activities.feature b/course/tests/behat/add_activities.feature
@@ -1,4 +1,4 @@
-@core_course
+@core @core_course
 Feature: Add activities to courses
   In order to provide tools for students learning
   As a teacher

diff --git a/course/tests/behat/edit_settings.feature b/course/tests/behat/edit_settings.feature
@@ -1,4 +1,4 @@
-@core_course
+@core @core_course
 Feature: Edit course settings
   In order to set the course according to my teaching needs
   As a moodle teacher

diff --git a/course/tests/behat/force_group_mode.feature b/course/tests/behat/force_group_mode.feature
@@ -1,4 +1,4 @@
-@core_course @_cross_browser
+@core @core_course @_cross_browser
 Feature: Force group mode in a course
   In order to use the same group mode all over the course
   As a moodle teacher

diff --git a/course/tests/behat/max_number_sections.feature b/course/tests/behat/max_number_sections.feature
@@ -1,4 +1,4 @@
-@core_course @admin
+@core @core_course
 Feature: The maximum number of weeks/topics in a course can be configured
   In order to set boundaries to courses size
   As a moodle manager

diff --git a/course/tests/behat/paged_course_navigation.feature b/course/tests/behat/paged_course_navigation.feature
@@ -1,4 +1,4 @@
-@core_course
+@core @core_course
 Feature: Course paged mode
   In order to split the course in parts
   As a moodle teacher

diff --git a/course/tests/behat/rename_roles.feature b/course/tests/behat/rename_roles.feature
@@ -1,4 +1,4 @@
-@core_course
+@core @core_course
 Feature: Rename roles within a course
   In order to set course roles names according to their responsabilities
   As a moodle teacher

diff --git a/course/tests/behat/restrict_available_activities.feature b/course/tests/behat/restrict_available_activities.feature
@@ -1,4 +1,4 @@
-@core_course @admin
+@core @core_course
 Feature: Restrict activities availability
   In order to prevent the use of some activities
   As a moodle admin

diff --git a/course/tests/behat/section_highlighting.feature b/course/tests/behat/section_highlighting.feature
@@ -1,4 +1,4 @@
-@core_course @_cross_browser
+@core @core_course @_cross_browser
 Feature: Topic's course sections highlighting
   In order to highlight parts of the course to students
   As a teacher

diff --git a/course/tests/behat/section_visibility.feature b/course/tests/behat/section_visibility.feature
@@ -1,4 +1,4 @@
-@core_course @_cross_browser
+@core @core_course @_cross_browser
 Feature: Show/hide course sections
   In order to delay sections availability
   As a moodle teacher

diff --git a/enrol/guest/tests/behat/guest_access.feature b/enrol/guest/tests/behat/guest_access.feature
@@ -1,4 +1,4 @@
-@enrol_guest
+@enrol @enrol_guest
 Feature: Guest users can auto-enrol themself in courses where guest access is allowed
   In order to access courses contents
   As a guest

diff --git a/enrol/self/tests/behat/self_enrolment.feature b/enrol/self/tests/behat/self_enrolment.feature
@@ -1,4 +1,4 @@
-@enrol_self
+@enrol @enrol_self
 Feature: Users can auto-enrol themself in courses where self enrolment is allowed
   In order to participate in courses
   As a moodle user

diff --git a/group/tests/behat/auto_creation.feature b/group/tests/behat/auto_creation.feature
@@ -1,4 +1,4 @@
-@core_group
+@core @core_group
 Feature: Automatic creation of groups
   In order to quickly create groups
   As a teacher

diff --git a/group/tests/behat/create_groups.feature b/group/tests/behat/create_groups.feature
@@ -1,4 +1,4 @@
-@core_group
+@core @core_group
 Feature: Organize students into groups
   In order to organize course activities in groups
   As a moodle teacher

diff --git a/group/tests/behat/id_uniqueness.feature b/group/tests/behat/id_uniqueness.feature
@@ -1,4 +1,4 @@
-@core_group
+@core @core_group
 Feature: Uniqueness of Group ID number
   In order to create unique groups and groupings
   As a moodle teacher

diff --git a/lib/editor/tinymce/tests/behat/edit_available_icons.feature b/lib/editor/tinymce/tests/behat/edit_available_icons.feature
@@ -1,4 +1,4 @@
-@editor_tinymce
+@editor @editor_tinymce
 Feature: Add or remove items from the TinyMCE editor toolbar
   In order to customize the TinyMCE editor appearance
   As a moodle admin

diff --git a/message/tests/behat/block_users.feature b/message/tests/behat/block_users.feature
@@ -1,4 +1,4 @@
-@core_message
+@core @core_message
 Feature: Block users from contacting me
   In order to block other users
   As a moodle user

diff --git a/message/tests/behat/manage_contacts.feature b/message/tests/behat/manage_contacts.feature
@@ -1,4 +1,4 @@
-@core_message
+@core @core_message
 Feature: Manage contacts
   In order to easily access the users I interact more with
   As a moodle user

diff --git a/message/tests/behat/search_history.feature b/message/tests/behat/search_history.feature
@@ -1,4 +1,4 @@
-@core_message
+@core @core_message
 Feature: Users can search their message history
   In order to read old messages
   As a moodle user

diff --git a/mod/assign/tests/behat/file_submission.feature b/mod/assign/tests/behat/file_submission.feature
@@ -1,4 +1,4 @@
-@mod_assign @_only_local
+@mod @mod_assign @_only_local
 Feature: In an assignment, students can upload files for assessment
   In order to complete my assignments providing files
   As a moodle student

diff --git a/mod/assign/tests/behat/group_submission.feature b/mod/assign/tests/behat/group_submission.feature
@@ -1,4 +1,4 @@
-@mod_assign
+@mod @mod_assign
 Feature: Group assignment submissions
   In order to allow students to work collaboratively on an assignment
   As a moodle teacher

diff --git a/mod/assign/tests/behat/online_submissions.feature b/mod/assign/tests/behat/online_submissions.feature
@@ -1,4 +1,4 @@
-@mod_assign
+@mod @mod_assign
 Feature: In an assignment, students can add and edit text online
   In order to complete my submissions online
   As a student

diff --git a/mod/assign/tests/behat/prevent_submission_changes.feature b/mod/assign/tests/behat/prevent_submission_changes.feature
@@ -1,4 +1,4 @@
-@mod_assign @mod
+@mod @mod_assign
 Feature: Prevent or allow assignment submission changes
   In order to control when a student can change his/her submission
   As a moodle teacher

diff --git a/mod/choice/tests/behat/add_choice.feature b/mod/choice/tests/behat/add_choice.feature
@@ -1,4 +1,4 @@
-@mod_choice
+@mod @mod_choice
 Feature: Add choice activity
   In order to ask questions as a choice of multiple responses
   As a moodle teacher

diff --git a/mod/choice/tests/behat/publish_results.feature b/mod/choice/tests/behat/publish_results.feature
@@ -1,4 +1,4 @@
-@mod_choice
+@mod @mod_choice
 Feature: A teacher can choose one of 4 options for publishing choice results
   In order to display choice activities outcomes
   As a moodle teacher

diff --git a/mod/choice/tests/behat/publish_results_anonymously.feature b/mod/choice/tests/behat/publish_results_anonymously.feature
@@ -1,4 +1,4 @@
-@mod_choice
+@mod @mod_choice
 Feature: A teacher can choose whether to publish choice activity results anonymously or showing names
   In order to keep students privacy or to give more info to students
   As a moodle teacher

diff --git a/mod/forum/tests/behat/add_forum.feature b/mod/forum/tests/behat/add_forum.feature
@@ -1,4 +1,4 @@
-@mod_forum
+@mod @mod_forum
 Feature: Add forum activities and discussions
   In order to discuss topics with other users
   As a moodle teacher

diff --git a/mod/forum/tests/behat/completion_condition_number_discussions.feature b/mod/forum/tests/behat/completion_condition_number_discussions.feature
@@ -1,4 +1,4 @@
-@mod_forum
+@mod @mod_forum
 Feature: Set a certain number of discussions as a completion condition for a forum
   In order to ensure students are participating on forums
   As a moodle teacher

diff --git a/mod/forum/tests/behat/discussion_display.feature b/mod/forum/tests/behat/discussion_display.feature
@@ -1,4 +1,4 @@
-@mod_forum
+@mod @mod_forum
 Feature: Students can choose from 4 discussion display options and their choice is remembered
   In order to read forum posts in a suitable view
   As a moodle user

diff --git a/mod/forum/tests/behat/edit_post_student.feature b/mod/forum/tests/behat/edit_post_student.feature
@@ -1,4 +1,4 @@
-@mod_forum
+@mod @mod_forum
 Feature: Students can edit or delete their forum posts within a set time limit
   In order to refine forum posts
   As a moodle user

diff --git a/mod/forum/tests/behat/edit_post_teacher.feature b/mod/forum/tests/behat/edit_post_teacher.feature
@@ -1,4 +1,4 @@
-@mod_forum
+@mod @mod_forum
 Feature: Teachers can edit or delete any forum post
   In order to refine the forum contents
   As a moodle teacher

diff --git a/mod/forum/tests/behat/single_forum_discussion.feature b/mod/forum/tests/behat/single_forum_discussion.feature
@@ -1,4 +1,4 @@
-@mod_forum
+@mod @mod_forum
 Feature: Single simple forum discussion type
   In order to restrict the discussion topic to one
   As a moodle teacher

diff --git a/mod/forum/tests/behat/track_read_posts.feature b/mod/forum/tests/behat/track_read_posts.feature
@@ -1,4 +1,4 @@
-@mod_forum
+@mod @mod_forum
 Feature: A teacher can set one of 3 possible options for tracking read forum posts
   In order to ease the forum posts follow up
   As a moodle user

diff --git a/mod/glossary/tests/behat/entries_always_editable.feature b/mod/glossary/tests/behat/entries_always_editable.feature
@@ -1,4 +1,4 @@
-@mod_glossary @mod
+@mod @mod_glossary
 Feature: A teacher can set whether glossary entries are always editable or not
   In order to ensure students think before adding new entries
   As a moodle teacher

diff --git a/mod/glossary/tests/behat/prevent_duplicate_entries.feature b/mod/glossary/tests/behat/prevent_duplicate_entries.feature
@@ -1,4 +1,4 @@
-@mod_glossary
+@mod @mod_glossary
 Feature: A teacher can choose whether to allow duplicate entries in a glossary
   In order to avoid confusion
   As a moodle teacher