Merge branch 'wip-mdl-57245' of https://github.com/rajeshtaneja/moodle

blocks/private_files/tests/behat/block_private_files_activity.feature

@@ -1,4 +1,4 @@
-@block @block_private_files @file_upload @javascript
+@block @block_private_files @_file_upload @javascript
 Feature: The private files block allows users to store files privately in moodle
   In order to store a private file in moodle
   As a teacher

blocks/private_files/tests/behat/block_private_files_course.feature

@@ -1,4 +1,4 @@
-@block @block_private_files @file_upload @javascript
+@block @block_private_files @_file_upload @javascript
 Feature: The private files block allows users to store files privately in moodle
   In order to store a private file in moodle
   As a teacher

mod/lesson/tests/behat/duplicate_lesson_page.feature

@@ -27,7 +27,7 @@ Feature: In a lesson activity, a teacher can duplicate a lesson page
       | Name | Test lesson name |
       | Description | Test lesson description |
 
-  @javascript
+  @javascript @_file_upload
   Scenario: Duplicate content page with an image.
     Given I follow "Test lesson name"
     And I follow "Add a content page"
@@ -57,7 +57,7 @@ Feature: In a lesson activity, a teacher can duplicate a lesson page
     And I should see "First page name"
     Then "//*[contains(@id, 'id_contents_editor')]//img[contains(@src, 'moodle_logo.jpg')]" "xpath_element" should exist
 
-  @javascript
+  @javascript @_file_upload
   Scenario: Duplicate question page with image in answer.
     Given I follow "Test lesson name"
     And I follow "Add a question page"
@@ -94,7 +94,7 @@ Feature: In a lesson activity, a teacher can duplicate a lesson page
     And I should see "Select the picture"
     Then "//*[contains(@id, 'id_answer_editor_0')]//img[contains(@src, 'moodle_logo.jpg')]" "xpath_element" should exist
 
-@javascript
+@javascript @_file_upload
   Scenario: Duplicate question page with image in feedback.
     Given I follow "Test lesson name"
     And I follow "Add a question page"