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

reskit · Jan 21, 2014 · b7623bc · b7623bc
2 parents ad1ad9f + 561e9bb
commit b7623bc
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 20 deletions.
diff --git a/admin/tests/behat/upload_users.feature b/admin/tests/behat/upload_users.feature
@@ -1,4 +1,4 @@
-@core @core_admin @_only_local
+@core @core_admin @_file_upload
 Feature: Upload users
   In order to add users to the system
   As an admin

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 @tool_behat @_only_local
+@tool @tool_behat
 Feature: Set up contextual data for tests
   In order to write tests quickly
   As a developer

diff --git a/admin/tool/behat/upgrade.txt b/admin/tool/behat/upgrade.txt
@@ -0,0 +1,6 @@
+This files describes API changes in the assign code.
+
+=== 2.7 ===
+
+* @_only_local tag used in .feature files replaced by @_file_upload tag
+* @_alerts tag used in .feature files replaced by @_alert tag
diff --git a/admin/tool/uploadcourse/tests/behat/create.feature b/admin/tool/uploadcourse/tests/behat/create.feature
@@ -1,4 +1,4 @@
-@tool @tool_uploadcourse @_only_local
+@tool @tool_uploadcourse @_file_upload
 Feature: An admin can create courses using a CSV file
   In order to create courses using a CSV file
   As an admin

diff --git a/admin/tool/uploadcourse/tests/behat/update.feature b/admin/tool/uploadcourse/tests/behat/update.feature
@@ -1,4 +1,4 @@
-@tool @tool_uploadcourse @_only_local
+@tool @tool_uploadcourse @_file_upload
 Feature: An admin can update courses using a CSV file
   In order to update courses using a CSV file
   As an admin

diff --git a/badges/tests/behat/add_badge.feature b/badges/tests/behat/add_badge.feature
@@ -1,4 +1,4 @@
-@core @core_badges @_only_local
+@core @core_badges @_file_upload
 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 @@
-@core @core_badges @_only_local
+@core @core_badges @_file_upload
 Feature: Award badges
   In order to award badges to users for their achievements
   As an admin

diff --git a/blocks/activity_modules/tests/behat/block_activity_modules.feature b/blocks/activity_modules/tests/behat/block_activity_modules.feature
@@ -1,4 +1,4 @@
-@block @block_activity_modules @_only_local
+@block @block_activity_modules
 Feature: Block activity modules
   In order to overview activity modules in a course
   As a manager
@@ -13,7 +13,7 @@ Feature: Block activity modules
     And I click on "//a[@title=\"Show\"]" "xpath_element" in the "Feedback" "table_row"
 
   Scenario: Add activities block on the frontpage
-    And the following "activities" exists:
+    Given the following "activities" exists:
       | activity   | name                        | intro                              | course               | idnumber    |
       | assign     | Frontpage assignment name   | Frontpage assignment description   | Acceptance test site | assign0     |
       | book       | Frontpage book name         | Frontpage book description         | Acceptance test site | book0       |

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

diff --git a/course/tests/behat/course_controls.feature b/course/tests/behat/course_controls.feature
@@ -1,4 +1,4 @@
-@core @core_course @_alerts
+@core @core_course @_alert
 Feature: Course activity controls works as expected
   In order to manage my course's activities
   As a teacher

diff --git a/files/tests/behat/course_files.feature b/files/tests/behat/course_files.feature
@@ -1,4 +1,4 @@
-@core @core_files @_only_local
+@core @core_files
 Feature: Course files
   In order to add legacy files
   As a user

diff --git a/group/tests/behat/groups_import.feature b/group/tests/behat/groups_import.feature
@@ -1,4 +1,4 @@
-@core @core_group @_only_local
+@core @core_group @_file_upload
 Feature: Importing of groups and groupings
   In order to import groups and grouping
   As a teacher

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

diff --git a/mod/scorm/tests/behat/add_scorm.feature b/mod/scorm/tests/behat/add_scorm.feature
@@ -1,4 +1,4 @@
-@mod @mod_scorm @_only_local @_switch_frame
+@mod @mod_scorm @_file_upload @_switch_frame
 Feature: Add scorm activity
   In order to let students access a scorm package
   As a teacher

diff --git a/repository/recent/tests/behat/add_recent.feature b/repository/recent/tests/behat/add_recent.feature
@@ -1,4 +1,4 @@
-@repository @repository_recent @_only_local
+@repository @repository_recent @_file_upload
 Feature: Recent files repository lists the recently used files
   In order to save time when selecting files
   As a user

diff --git a/repository/tests/behat/cancel_add_file.feature b/repository/tests/behat/cancel_add_file.feature
@@ -1,4 +1,4 @@
-@core @core_filepicker @_only_local
+@core @core_filepicker @_file_upload
 Feature: A selected file can be cancelled
   In order to refine the file manager contents
   As a user

diff --git a/repository/tests/behat/create_shortcut.feature b/repository/tests/behat/create_shortcut.feature
@@ -1,4 +1,4 @@
-@core @core_filepicker @repository @repository_user @_only_local
+@core @core_filepicker @repository @repository_user @_file_upload
 Feature: Create shortcuts
   In order to automatically synchronize copies of the file with the source
   As a teacher

diff --git a/repository/tests/behat/delete_files.feature b/repository/tests/behat/delete_files.feature
@@ -1,4 +1,4 @@
-@core @core_filepicker @_only_local
+@core @core_filepicker @_file_upload
 Feature: Delete files and folders from the file manager
   In order to clean the file manager contents
   As a user

diff --git a/repository/tests/behat/overwrite_file.feature b/repository/tests/behat/overwrite_file.feature
@@ -1,4 +1,4 @@
-@core @core_filepicker @_only_local
+@core @core_filepicker @_file_upload
 Feature: Overwrite file feature
   In order to update an existing file
   As a user

diff --git a/repository/upload/tests/behat/upload_file.feature b/repository/upload/tests/behat/upload_file.feature
@@ -1,4 +1,4 @@
-@repository @repository_upload @_only_local
+@repository @repository_upload @_file_upload
 Feature: Upload files
   In order to add contents
   As a user