Merge branch 'MDL-43480_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

admin/tests/behat/upload_users.feature

@@ -1,4 +1,4 @@
-@core @core_admin @_only_local
+@core @core_admin @_only_local @_file_upload
 Feature: Upload users
   In order to add users to the system
   As an admin

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

badges/tests/behat/add_badge.feature

@@ -1,4 +1,4 @@
-@core @core_badges @_only_local
+@core @core_badges @_only_local @_file_upload
 Feature: Add badges to the system
   In order to give badges to users for their achievements
   As an admin

badges/tests/behat/award_badge.feature

@@ -1,4 +1,4 @@
-@core @core_badges @_only_local
+@core @core_badges @_only_local @_file_upload
 Feature: Award badges
   In order to award badges to users for their achievements
   As an admin

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
@@ -15,7 +15,7 @@ Feature: Block activity modules
 
   @javascript
   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     |
       | assignment | Frontpage assignment22 name | Frontpage assignment22 description | Acceptance test site | assignment0 |

cohort/tests/behat/upload_cohort_users.feature

@@ -1,4 +1,4 @@
-@core @core_cohort @_only_local
+@core @core_cohort @_only_local @_file_upload
 Feature: Upload users to a cohort
   In order to quickly fill site-wide groups with users
   As an admin

group/tests/behat/groups_import.feature

@@ -1,4 +1,4 @@
-@core @core_group @_only_local
+@core @core_group @_only_local @_file_upload
 Feature: Importing of groups and groupings
   In order to import groups and grouping
   As a teacher

mod/assign/tests/behat/file_submission.feature

@@ -1,4 +1,4 @@
-@mod @mod_assign @_only_local
+@mod @mod_assign @_only_local @_file_upload
 Feature: In an assignment, students can upload files for assessment
   In order to complete my assignments providing files
   As a student

mod/scorm/tests/behat/add_scorm.feature

@@ -1,4 +1,4 @@
-@mod @mod_scorm @_only_local
+@mod @mod_scorm @_only_local @_file_upload
 Feature: Add scorm activity
   In order to let students access a scorm package
   As a teacher

repository/recent/tests/behat/add_recent.feature

@@ -1,4 +1,4 @@
-@repository @repository_recent @_only_local
+@repository @repository_recent @_only_local @_file_upload
 Feature: Recent files repository lists the recently used files
   In order to save time when selecting files
   As a user

repository/tests/behat/cancel_add_file.feature

@@ -1,4 +1,4 @@
-@core @core_filepicker @_only_local
+@core @core_filepicker @_only_local @_file_upload
 Feature: A selected file can be cancelled
   In order to refine the file manager contents
   As a user

repository/tests/behat/delete_files.feature

@@ -1,4 +1,4 @@
-@core @core_filepicker @_only_local
+@core @core_filepicker @_only_local @_file_upload
 Feature: Delete files and folders from the file manager
   In order to clean the file manager contents
   As a user

repository/upload/tests/behat/upload_file.feature

@@ -1,4 +1,4 @@
-@repository @repository_upload @_only_local
+@repository @repository_upload @_only_local @_file_upload
 Feature: Upload files
   In order to add contents
   As a user