MDL-21724 course: change remaining tests to new "Save and display"

diff --git a/backup/util/ui/tests/behat/restore_moodle2_courses.feature b/backup/util/ui/tests/behat/restore_moodle2_courses.feature
index e5476ca..934e011 100644 (file)
--- a/backup/util/ui/tests/behat/restore_moodle2_courses.feature
+++ b/backup/util/ui/tests/behat/restore_moodle2_courses.feature
@@ -90,7 +90,7 @@ Feature: Restore Moodle 2 course backups
       | id_startdate_month | January |
       | id_startdate_year | 2020 |
       | id_format | Weekly format |
-    And I press "Save changes"
+    And I press "Save and display"
     And I should see "1 January - 7 January"
     And I should see "Test forum name"
     And I click on "Edit settings" "link" in the "Administration" "block"
@@ -98,7 +98,7 @@ Feature: Restore Moodle 2 course backups
     And the field "id_format" matches value "Weekly format"
     And I set the following fields to these values:
       | id_format | Social format |
-    And I press "Save changes"
+    And I press "Save and display"
     And I should see "An open forum for chatting about anything you want to"
     And I click on "Edit settings" "link" in the "Administration" "block"
     And I expand all fieldsets

diff --git a/badges/tests/behat/award_badge.feature b/badges/tests/behat/award_badge.feature
index 209e992..bf504b0 100644 (file)
--- a/badges/tests/behat/award_badge.feature
+++ b/badges/tests/behat/award_badge.feature
@@ -132,7 +132,7 @@ Feature: Award badges
     And I follow "Edit settings"
     And I set the following fields to these values:
       | Enable completion tracking | Yes |
-    And I press "Save changes"
+    And I press "Save and display"
     And I turn editing mode on
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assignment name |
@@ -185,7 +185,7 @@ Feature: Award badges
     And I follow "Edit settings"
     And I set the following fields to these values:
       | Enable completion tracking | Yes |
-    And I press "Save changes"
+    And I press "Save and display"
     And I turn editing mode on
     And I add a "Assignment" to section "1" and I fill the form with:
       | Assignment name | Test assignment name |

diff --git a/blocks/news_items/tests/behat/display_news.feature b/blocks/news_items/tests/behat/display_news.feature
index 1768980..1509125 100644 (file)
--- a/blocks/news_items/tests/behat/display_news.feature
+++ b/blocks/news_items/tests/behat/display_news.feature
@@ -34,12 +34,12 @@ Feature: Latest news block displays the course latest news
     And I follow "Edit settings"
     And I set the following fields to these values:
       | News items to show | 2 |
-    And I press "Save changes"
+    And I press "Save and display"
     And I should not see "Discussion One" in the "Latest news" "block"
     And I should see "Discussion Two" in the "Latest news" "block"
     And I should see "Discussion Three" in the "Latest news" "block"
     And I follow "Edit settings"
     And I set the following fields to these values:
       | News items to show | 0 |
-    And I press "Save changes"
+    And I press "Save and display"
     And "Latest news" "block" should not exist

diff --git a/completion/tests/behat/behat_completion.php b/completion/tests/behat/behat_completion.php
index 807c7fe..5125a88 100644 (file)
--- a/completion/tests/behat/behat_completion.php
+++ b/completion/tests/behat/behat_completion.php
@@ -118,7 +118,7 @@ class behat_completion extends behat_base {
         return array(
             new Given('I follow "'.get_string('editsettings').'"'),
             new Given('I set the field "'.get_string('enablecompletion', 'completion').'" to "'.$toggle.'"'),
-            new Given('I press "'.get_string('savechanges').'"')
+            new Given('I press "'.get_string('savechangesanddisplay').'"')
         );
     }
 }

diff --git a/completion/tests/behat/enable_manual_complete_mark.feature b/completion/tests/behat/enable_manual_complete_mark.feature
index 7c29e65..303d79f 100644 (file)
--- a/completion/tests/behat/enable_manual_complete_mark.feature
+++ b/completion/tests/behat/enable_manual_complete_mark.feature
@@ -28,7 +28,7 @@ Feature: Allow students to manually mark an activity as complete
     And I click on "Edit settings" "link" in the "Administration" "block"
     And I set the following fields to these values:
       | Enable completion tracking | Yes |
-    And I press "Save changes"
+    And I press "Save and display"
     When I add a "Forum" to section "1" and I fill the form with:
       | Forum name | Test forum name |
       | Description | Test forum description |

diff --git a/completion/tests/behat/restrict_section_availability.feature b/completion/tests/behat/restrict_section_availability.feature
index 584506a..69239a4 100644 (file)
--- a/completion/tests/behat/restrict_section_availability.feature
+++ b/completion/tests/behat/restrict_section_availability.feature
@@ -30,7 +30,7 @@ Feature: Restrict sections availability through completion or grade conditions
     And I click on "Edit settings" "link" in the "Administration" "block"
     And I set the following fields to these values:
       | Enable completion tracking | Yes |
-    And I press "Save changes"
+    And I press "Save and display"
     And I add a "Label" to section "1" and I fill the form with:
       | Label text | Test label |
       | Completion tracking | Students can manually mark the activity as completed |

diff --git a/enrol/guest/tests/behat/guest_access.feature b/enrol/guest/tests/behat/guest_access.feature
index 1b8488e..316477f 100644 (file)
--- a/enrol/guest/tests/behat/guest_access.feature
+++ b/enrol/guest/tests/behat/guest_access.feature
@@ -27,7 +27,7 @@ Feature: Guest users can auto-enrol themself in courses where guest access is al
   Scenario: Allow guest access without password
     Given I set the following fields to these values:
       | Allow guest access | Yes |
-    And I press "Save changes"
+    And I press "Save and display"
     And I log out
     And I log in as "student1"
     And I follow "Course 1"
@@ -39,7 +39,7 @@ Feature: Guest users can auto-enrol themself in courses where guest access is al
     Given I set the following fields to these values:
       | Allow guest access | Yes |
       | Password | moodle_rules |
-    And I press "Save changes"
+    And I press "Save and display"
     And I log out
     And I log in as "student1"
     When I follow "Course 1"

diff --git a/mod/assign/tests/behat/group_submission.feature b/mod/assign/tests/behat/group_submission.feature
index 37ac509..431a267 100644 (file)
--- a/mod/assign/tests/behat/group_submission.feature
+++ b/mod/assign/tests/behat/group_submission.feature
@@ -47,7 +47,7 @@ Feature: Group assignment submissions
     And I click on "Edit settings" "link" in the "Administration" "block"
     And I set the following fields to these values:
       | Group mode | Separate groups |
-    And I press "Save changes"
+    And I press "Save and display"
     And I expand "Users" node
     And I follow "Groups"
     And I add "Student 0 (student0@asd.com)" user to "Group 1" group members

diff --git a/mod/forum/tests/behat/completion_condition_number_discussions.feature b/mod/forum/tests/behat/completion_condition_number_discussions.feature
index 6d1bbec..68ea132 100644 (file)
--- a/mod/forum/tests/behat/completion_condition_number_discussions.feature
+++ b/mod/forum/tests/behat/completion_condition_number_discussions.feature
@@ -28,7 +28,7 @@ Feature: Set a certain number of discussions as a completion condition for a for
     And I click on "Edit settings" "link" in the "Administration" "block"
     And I set the following fields to these values:
       | Enable completion tracking | Yes |
-    And I press "Save changes"
+    And I press "Save and display"
     When I add a "Forum" to section "1" and I fill the form with:
       | Forum name | Test forum name |
       | Description | Test forum description |

diff --git a/mod/quiz/tests/behat/completion_condition_attempts_used.feature b/mod/quiz/tests/behat/completion_condition_attempts_used.feature
index ba1a451..cf229a1 100644 (file)
--- a/mod/quiz/tests/behat/completion_condition_attempts_used.feature
+++ b/mod/quiz/tests/behat/completion_condition_attempts_used.feature
@@ -32,7 +32,7 @@ Feature: Set a quiz to be marked complete when the student uses all attempts all
     And I click on "Edit settings" "link" in the "Administration" "block"
     And I set the following fields to these values:
       | Enable completion tracking | Yes |
-    And I press "Save changes"
+    And I press "Save and display"
     And I add a "Quiz" to section "1" and I fill the form with:
       | Name        | Test quiz name        |
       | Description | Test quiz description |

diff --git a/mod/quiz/tests/behat/completion_condition_passing_grade.feature b/mod/quiz/tests/behat/completion_condition_passing_grade.feature
index e733d46..afa40b7 100644 (file)
--- a/mod/quiz/tests/behat/completion_condition_passing_grade.feature
+++ b/mod/quiz/tests/behat/completion_condition_passing_grade.feature
@@ -32,7 +32,7 @@ Feature: Set a quiz to be marked complete when the student passes
     And I click on "Edit settings" "link" in the "Administration" "block"
     And I set the following fields to these values:
       | Enable completion tracking | Yes |
-    And I press "Save changes"
+    And I press "Save and display"
     And I add a "Quiz" to section "1" and I fill the form with:
       | Name        | Test quiz name        |
       | Description | Test quiz description |