Merge branch 'MDL-75922-39' of https://github.com/andrewnicols/moodle …

…into MOODLE_39_STABLE

customfield/field/textarea/tests/behat/default_value.feature

@@ -1,4 +1,5 @@
-@customfield @customfield_textarea @javascript @_file_upload
+# This feature has Atto-specific steps. See MDL-75913 for further details.
+@customfield @customfield_textarea @javascript @_file_upload @editor_atto
 Feature: Default value for the textarea custom field can contain images
   In order to see images on custom fields
   As a manager

filter/displayh5p/tests/behat/h5p_filter.feature

@@ -49,7 +49,8 @@ Feature: Render H5P content using filters
     And I wait until the page is ready
     Then ".h5p-iframe" "css_element" should not exist
 
-  @javascript
+  # This scenario has Atto-specific steps. See MDL-75913 for further details.
+  @javascript @editor_atto
   Scenario: Render a local H5P file as admin
     Given I log in as "admin"
     And I am on "Course 1" course homepage with editing mode on
@@ -83,7 +84,8 @@ Feature: Render H5P content using filters
     And I should not see "you don't have access"
     And I should see "Lorum ipsum"
 
-  @javascript
+  # This scenario has Atto-specific steps. See MDL-75913 for further details.
+  @javascript @editor_atto
   Scenario: Render a local H5P file as teacher
     Given I log in as "teacher1"
     And I am on "Course 1" course homepage with editing mode on
@@ -107,7 +109,8 @@ Feature: Render H5P content using filters
     Then I should see "Note that the libraries may exist in the file you uploaded, but you're not allowed to upload new libraries."
     And I should see "missing-required-library"
 
-  @javascript
+  # This scenario has Atto-specific steps. See MDL-75913 for further details.
+  @javascript @editor_atto
   Scenario: Render a local H5P file with existing libraries
     Given I log in as "teacher1"
     And I am on "Course 1" course homepage with editing mode on

mod/assign/tests/behat/edit_previous_feedback.feature

@@ -4,7 +4,8 @@ Feature: In an assignment, teachers can edit feedback for a students previous su
   As a teacher
   I need to be able to edit the feedback for a students previous submission attempt.
 
-  @javascript
+  # This scenario has Atto-specific steps. See MDL-75913 for further details.
+  @javascript @editor_atto
   Scenario: Edit feedback for a students previous attempt.
     Given the following "courses" exist:
       | fullname | shortname | category | groupmode |

mod/lesson/tests/behat/duplicate_lesson_page.feature

@@ -1,4 +1,5 @@
-@mod @mod_lesson
+# This feature has Atto-specific steps. See MDL-75913 for further details.
+@mod @mod_lesson @editor_atto
 Feature: In a lesson activity, a teacher can duplicate a lesson page
   In order to duplicate a lesson page
   As a teacher

mod/lesson/tests/behat/questions_images.feature

@@ -3,7 +3,8 @@ Feature: In a lesson activity, teacher can add embedded images in questions answ
   As a teacher
   I need to add questions with images in answers and responses
 
-  @javascript @_file_upload
+  # This scenario has Atto-specific steps. See MDL-75913 for further details.
+  @javascript @_file_upload @editor_atto
   Scenario: questions with images in answers and responses
     Given the following "users" exist:
       | username | firstname | lastname | email |

mod/quiz/tests/behat/manually_mark_question.feature

@@ -55,7 +55,8 @@ Feature: Teachers can override the grade for any question
     # This time is same as time the window is open. So wait for it to close before proceeding.
     And I wait "2" seconds
 
-  @javascript @_switch_window @_file_upload @_bug_phantomjs
+  # This scenario has Atto-specific steps. See MDL-75913 for further details.
+  @javascript @_switch_window @_file_upload @_bug_phantomjs @editor_atto
   Scenario: Comment on a response to an essay question attempt.
     When I log in as "teacher1"
     And I follow "Manage private files"

mod/workshop/tests/behat/embedded_images.feature

@@ -4,6 +4,8 @@ Feature: Teachers can embed images into instructions and conclusion fields
   As a teacher
   I need to be able to embed images into the fields and they should display correctly
 
+  # This scenario has Atto-specific steps. See MDL-75913 for further details.
+  @editor_atto
   Scenario: Embedding the image into the instructions and conclusions fields
     Given the following "users" exist:
       | username | firstname | lastname | email                |

repository/contentbank/tests/behat/file_update.feature

@@ -18,6 +18,8 @@ Feature: Updating a file in the content bank after using in a course
       | activity | name       | intro      | introformat | course | content  | contentformat | idnumber |
       | page     | PageName1  | PageDesc1  | 1           | C1     | H5Ptest  | 1             | 1        |
 
+  # This scenario has Atto-specific steps. See MDL-75913 for further details.
+  @editor_atto
   Scenario: Referenced files is the default option and updates alias as well
     Given I am on the PageName1 "Page activity editing" page logged in as admin
     And I click on "Insert H5P" "button" in the "#fitem_id_page" "css_element"
@@ -56,6 +58,8 @@ Feature: Updating a file in the content bank after using in a course
     Then I should see "This is a new text"
     And I switch to the main frame
 
+  # This scenario has Atto-specific steps. See MDL-75913 for further details.
+  @editor_atto
   Scenario: Copied files should not be updated if the original is edited
     Given I am on the PageName1 "Page activity editing" page logged in as admin
     And I click on "Insert H5P" "button" in the "#fitem_id_page" "css_element"

repository/contentbank/tests/behat/select_content.feature

@@ -128,6 +128,8 @@ Feature: Select content bank files using the content bank files repository
     Then I should see "1" elements in "Files" filemanager
     And I should see "filltheblanks.h5p" in the ".fp-content .fp-file" "css_element"
 
+  # This scenario has Atto-specific steps. See MDL-75913 for further details.
+  @editor_atto
   Scenario: Non-editing teacher can not see the content bank repository
     Given I am on the Forum "Forum activity" page logged in as teacher2
     And I click on "Add a new discussion topic" "link"