From 16c726cde7f095ab15fe82c5c06bcd0947437b74 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Tue, 6 Jul 2021 12:02:19 +0200 Subject: [PATCH] MDL-71610 core_behat: use new edit mode step in feature files --- .../tests/behat/manage_conditions.feature | 2 +- .../behat/tests/behat/data_generators.feature | 8 ++-- badges/tests/behat/add_badge.feature | 4 +- badges/tests/behat/award_badge.feature | 2 +- .../behat/block_activity_modules.feature | 2 +- .../tests/behat/addblockinactivity.feature | 1 - .../behat/highscoreswithoutgroups.feature | 1 - .../highscoreswithscalesandgroups.feature | 1 - .../highscoreswithseperategroups.feature | 1 - .../behat/lowscoreswithoutgroups.feature | 1 - .../tests/behat/lowscoreswithscales.feature | 1 - .../lowscoreswithscalesandgroups.feature | 2 +- .../behat/lowscoreswithseperategroups.feature | 1 - .../behat/lowscoreswithvisiblegroups.feature | 1 - .../behat/block_badges_frontpage.feature | 2 +- .../behat/block_blog_menu_frontpage.feature | 2 +- .../behat/block_blog_recent_frontpage.feature | 4 +- .../block_calendar_upcoming_frontpage.feature | 2 +- .../behat/block_comment_dashboard.feature | 4 +- .../behat/block_comment_frontpage.feature | 2 +- .../behat/block_course_list_dashboard.feature | 6 +-- .../behat/block_course_list_frontpage.feature | 8 ++-- blocks/login/tests/behat/login_block.feature | 2 +- .../tests/behat/block_myprofile.feature | 22 +++++----- .../behat/block_myprofile_dashboard.feature | 2 +- .../behat/block_myprofile_frontpage.feature | 2 +- .../block_online_users_frontpage.feature | 12 ++--- .../block_private_files_frontpage.feature | 2 +- ...ck_recentlyaccesseditems_dashboard.feature | 2 +- .../block_search_forums_frontpage.feature | 2 +- .../tests/behat/add_url.feature | 2 +- .../tests/behat/edit_activities.feature | 6 +-- .../configuring_tag_flickr_block.feature | 2 +- .../behat/configure_tag_youtube_block.feature | 4 +- blocks/tags/tests/behat/tagcloud.feature | 2 +- .../configure_block_throughout_site.feature | 6 +-- blocks/tests/behat/hide_blocks.feature | 2 +- blocks/tests/behat/manage_blocks.feature | 4 +- calendar/tests/behat/category_events.feature | 6 +-- .../activity_completion_criteria.feature | 2 +- .../tests/behat/admin_replace_content.feature | 2 +- .../tests/behat/admin_upload_content.feature | 2 +- .../behat/teacher_upload_content.feature | 2 +- .../behat/activities_visibility_icons.feature | 25 ++++++----- course/tests/behat/coursetags.feature | 4 +- .../behat/frontpage_topic_section.feature | 8 ++-- .../grader/tests/behat/switch_views.feature | 2 +- .../grade_calculated_grade_items.feature | 4 +- .../tests/behat/grade_letter_boundary.feature | 4 +- .../grade_letter_boundary_20160518.feature | 4 +- grade/tests/behat/grade_to_pass.feature | 7 --- lib/tests/behat/locking.feature | 44 +++++++++---------- .../videojs/tests/behat/modules.feature | 2 +- mod/book/tests/behat/create_chapters.feature | 2 +- mod/book/tests/behat/edit_tags.feature | 4 +- mod/data/tests/behat/create_activity.feature | 2 +- .../tests/behat/coursemapping.feature | 2 +- mod/forum/tests/behat/grade_forum.feature | 1 - .../behat/entries_require_approval.feature | 2 +- my/tests/behat/add_blocks.feature | 4 +- my/tests/behat/reset_all_pages.feature | 14 +++--- my/tests/behat/reset_page.feature | 2 +- .../behat/restrict_available_blocks.feature | 4 +- .../upload/tests/behat/upload_file.feature | 2 +- tag/tests/behat/collections.feature | 2 +- tag/tests/behat/edit_tag.feature | 6 +-- tag/tests/behat/flag_tags.feature | 4 +- tag/tests/behat/tagindex.feature | 4 +- user/tests/behat/add_blocks.feature | 2 +- .../tests/behat/custom_profile_fields.feature | 2 +- user/tests/behat/reset_page.feature | 2 +- .../tests/behat/view_preferences_page.feature | 2 +- 72 files changed, 151 insertions(+), 162 deletions(-) diff --git a/admin/tool/availabilityconditions/tests/behat/manage_conditions.feature b/admin/tool/availabilityconditions/tests/behat/manage_conditions.feature index 8fef761c01797..4185bb1e3418f 100644 --- a/admin/tool/availabilityconditions/tests/behat/manage_conditions.feature +++ b/admin/tool/availabilityconditions/tests/behat/manage_conditions.feature @@ -8,7 +8,7 @@ Feature: Manage availability conditions Scenario: Display list of availability conditions # Check the report doesn't show when not enabled. Given I log in as "admin" - And I press "Customise this page" + And I turn editing mode on And I add the "Administration" block if not present And the following config values are set as admin: | enableavailability | 0 | diff --git a/admin/tool/behat/tests/behat/data_generators.feature b/admin/tool/behat/tests/behat/data_generators.feature index 69e536051dc72..06f9c0baec142 100644 --- a/admin/tool/behat/tests/behat/data_generators.feature +++ b/admin/tool/behat/tests/behat/data_generators.feature @@ -139,19 +139,19 @@ Feature: Set up contextual data for tests | user5 | custom2 | System | | When I log in as "user1" And I am on site homepage - Then "Edit settings" "link" should exist in current page administration + Then I should see "Edit mode" And I log out And I log in as "user2" And I am on "Course 1" course homepage - And "Turn editing on" "button" should exist + Then I should see "Edit mode" And I log out And I log in as "user3" And I am on "Course 1" course homepage - And "Turn editing on" "button" should exist + Then I should see "Edit mode" And I log out And I log in as "user4" And I am on "Course 1" course homepage - And "Turn editing on" "button" should exist + Then I should see "Edit mode" And I log out And I log in as "user5" And I should see "You are logged in as" diff --git a/badges/tests/behat/add_badge.feature b/badges/tests/behat/add_badge.feature index 82d5c3b1ff97c..4c36aff639f5b 100644 --- a/badges/tests/behat/add_badge.feature +++ b/badges/tests/behat/add_badge.feature @@ -10,7 +10,7 @@ Feature: Add badges to the system @javascript Scenario: Accessing the badges - And I press "Customise this page" + And I turn editing mode on # TODO MDL-57120 site "Badges" link not accessible without navigation block. And I add the "Navigation" block if not present And I click on "Site pages" "list_item" in the "Navigation" "block" @@ -133,7 +133,7 @@ Feature: Add badges to the system @javascript @_file_upload Scenario: Add a badge from Site badges section - Given I press "Customise this page" + Given I turn editing mode on # TODO MDL-57120 site "Badges" link not accessible without navigation block. And I add the "Navigation" block if not present When I click on "Site pages" "list_item" in the "Navigation" "block" diff --git a/badges/tests/behat/award_badge.feature b/badges/tests/behat/award_badge.feature index 9d5c590f7132f..60158d60192af 100644 --- a/badges/tests/behat/award_badge.feature +++ b/badges/tests/behat/award_badge.feature @@ -83,7 +83,7 @@ Feature: Award badges And I should see "Add a new badge" # Teacher 1 should NOT have access to manage/create site badges in the Site badges section. When I am on homepage - And I press "Customise this page" + And I turn editing mode on # TODO MDL-57120 site "Badges" link not accessible without navigation block. And I add the "Navigation" block if not present And I click on "Site pages" "list_item" in the "Navigation" "block" diff --git a/blocks/activity_modules/tests/behat/block_activity_modules.feature b/blocks/activity_modules/tests/behat/block_activity_modules.feature index 63e6dba5d7632..9a606bd8a500f 100644 --- a/blocks/activity_modules/tests/behat/block_activity_modules.feature +++ b/blocks/activity_modules/tests/behat/block_activity_modules.feature @@ -31,7 +31,7 @@ Feature: Block activity modules When I log in as "admin" And I am on site homepage - And I follow "Turn editing on" + And I turn editing mode on And I add the "Activities" block And I click on "Assignments" "link" in the "Activities" "block" Then I should see "Frontpage assignment name" diff --git a/blocks/activity_results/tests/behat/addblockinactivity.feature b/blocks/activity_results/tests/behat/addblockinactivity.feature index 3a4b42d432d53..47a9d1207e92d 100644 --- a/blocks/activity_results/tests/behat/addblockinactivity.feature +++ b/blocks/activity_results/tests/behat/addblockinactivity.feature @@ -36,7 +36,6 @@ Feature: The activity results block displays student scores And I am on "Course 1" course homepage with editing mode on And I should see "Test page name" And I navigate to "View > Grader report" in the course gradebook - And I turn editing mode on And I give the grade "90.00" to the user "Student 1" for the grade item "Test assignment 1" And I give the grade "80.00" to the user "Student 2" for the grade item "Test assignment 1" And I give the grade "70.00" to the user "Student 3" for the grade item "Test assignment 1" diff --git a/blocks/activity_results/tests/behat/highscoreswithoutgroups.feature b/blocks/activity_results/tests/behat/highscoreswithoutgroups.feature index 6af65257a1a23..b19dbeecc39c4 100644 --- a/blocks/activity_results/tests/behat/highscoreswithoutgroups.feature +++ b/blocks/activity_results/tests/behat/highscoreswithoutgroups.feature @@ -30,7 +30,6 @@ Feature: The activity results block displays student high scores And I log in as "teacher1" And I am on "Course 1" course homepage with editing mode on And I navigate to "View > Grader report" in the course gradebook - And I turn editing mode on And I give the grade "90.00" to the user "Student 1" for the grade item "Test assignment" And I give the grade "80.00" to the user "Student 2" for the grade item "Test assignment" And I give the grade "70.00" to the user "Student 3" for the grade item "Test assignment" diff --git a/blocks/activity_results/tests/behat/highscoreswithscalesandgroups.feature b/blocks/activity_results/tests/behat/highscoreswithscalesandgroups.feature index 3f221f1089f13..88acb700f7553 100644 --- a/blocks/activity_results/tests/behat/highscoreswithscalesandgroups.feature +++ b/blocks/activity_results/tests/behat/highscoreswithscalesandgroups.feature @@ -63,7 +63,6 @@ Feature: The activity results block displays student in group high scores as sca And I press "Save and return to course" And I am on "Course 1" course homepage And I navigate to "View > Grader report" in the course gradebook - And I turn editing mode on And I give the grade "Excellent!" to the user "Student 1" for the grade item "Test assignment" And I give the grade "Very good" to the user "Student 2" for the grade item "Test assignment" And I give the grade "Very good" to the user "Student 3" for the grade item "Test assignment" diff --git a/blocks/activity_results/tests/behat/highscoreswithseperategroups.feature b/blocks/activity_results/tests/behat/highscoreswithseperategroups.feature index 1b8953be518c2..251576d5462b4 100644 --- a/blocks/activity_results/tests/behat/highscoreswithseperategroups.feature +++ b/blocks/activity_results/tests/behat/highscoreswithseperategroups.feature @@ -53,7 +53,6 @@ Feature: The activity results block displays student in separate groups scores And I log in as "teacher1" And I am on "Course 1" course homepage with editing mode on And I navigate to "View > Grader report" in the course gradebook - And I turn editing mode on And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment" And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment" And I give the grade "90.00" to the user "Student 3" for the grade item "Test assignment" diff --git a/blocks/activity_results/tests/behat/lowscoreswithoutgroups.feature b/blocks/activity_results/tests/behat/lowscoreswithoutgroups.feature index 1c0577d61e90e..6188e511b8b46 100644 --- a/blocks/activity_results/tests/behat/lowscoreswithoutgroups.feature +++ b/blocks/activity_results/tests/behat/lowscoreswithoutgroups.feature @@ -35,7 +35,6 @@ Feature: The activity results block displays student low scores And I log in as "teacher1" And I am on "Course 1" course homepage with editing mode on And I navigate to "View > Grader report" in the course gradebook - And I turn editing mode on And I give the grade "90.00" to the user "Student 1" for the grade item "Test assignment" And I give the grade "80.00" to the user "Student 2" for the grade item "Test assignment" And I give the grade "70.00" to the user "Student 3" for the grade item "Test assignment" diff --git a/blocks/activity_results/tests/behat/lowscoreswithscales.feature b/blocks/activity_results/tests/behat/lowscoreswithscales.feature index 59b3623cc7914..62e6238046e51 100644 --- a/blocks/activity_results/tests/behat/lowscoreswithscales.feature +++ b/blocks/activity_results/tests/behat/lowscoreswithscales.feature @@ -49,7 +49,6 @@ Feature: The activity results block displays student low scores as scales And I press "Save and return to course" And I am on "Course 1" course homepage And I navigate to "View > Grader report" in the course gradebook - And I turn editing mode on And I give the grade "Excellent!" to the user "Student 1" for the grade item "Test assignment" And I give the grade "Very good" to the user "Student 2" for the grade item "Test assignment" And I give the grade "Good" to the user "Student 3" for the grade item "Test assignment" diff --git a/blocks/activity_results/tests/behat/lowscoreswithscalesandgroups.feature b/blocks/activity_results/tests/behat/lowscoreswithscalesandgroups.feature index ee08e7827675e..345164b64892f 100644 --- a/blocks/activity_results/tests/behat/lowscoreswithscalesandgroups.feature +++ b/blocks/activity_results/tests/behat/lowscoreswithscalesandgroups.feature @@ -74,7 +74,7 @@ Feature: The activity results block displays students in groups low scores as sc And I give the grade "Good" to the user "Student 5" for the grade item "Test assignment" And I give the grade "Average" to the user "Student 6" for the grade item "Test assignment" And I press "Save changes" - And I am on "Course 1" course homepage with editing mode on + And I am on "Course 1" course homepage Scenario: Try to configure the block on the course page to show 1 low score Given I add the "Activity results" block diff --git a/blocks/activity_results/tests/behat/lowscoreswithseperategroups.feature b/blocks/activity_results/tests/behat/lowscoreswithseperategroups.feature index eadf2e9b0d9b8..523681e74b9ad 100644 --- a/blocks/activity_results/tests/behat/lowscoreswithseperategroups.feature +++ b/blocks/activity_results/tests/behat/lowscoreswithseperategroups.feature @@ -47,7 +47,6 @@ Feature: The activity results block displays students in separate groups scores And I log in as "teacher1" And I am on "Course 1" course homepage with editing mode on And I navigate to "View > Grader report" in the course gradebook - And I turn editing mode on And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment" And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment" And I give the grade "90.00" to the user "Student 3" for the grade item "Test assignment" diff --git a/blocks/activity_results/tests/behat/lowscoreswithvisiblegroups.feature b/blocks/activity_results/tests/behat/lowscoreswithvisiblegroups.feature index 13ed3f897fbff..29d7a29e9bb76 100644 --- a/blocks/activity_results/tests/behat/lowscoreswithvisiblegroups.feature +++ b/blocks/activity_results/tests/behat/lowscoreswithvisiblegroups.feature @@ -53,7 +53,6 @@ Feature: The activity results block displays student in visible groups low score And I log in as "teacher1" And I am on "Course 1" course homepage with editing mode on And I navigate to "View > Grader report" in the course gradebook - And I turn editing mode on And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment" And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment" And I give the grade "90.00" to the user "Student 3" for the grade item "Test assignment" diff --git a/blocks/badges/tests/behat/block_badges_frontpage.feature b/blocks/badges/tests/behat/block_badges_frontpage.feature index 388f4a30eb951..3a030b79bd476 100644 --- a/blocks/badges/tests/behat/block_badges_frontpage.feature +++ b/blocks/badges/tests/behat/block_badges_frontpage.feature @@ -16,7 +16,7 @@ Feature: Enable Block Badges on the frontpage and view awarded badges | teacher1 | C1 | editingteacher | And I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I add the "Latest badges" block And I log out And I log in as "teacher1" diff --git a/blocks/blog_menu/tests/behat/block_blog_menu_frontpage.feature b/blocks/blog_menu/tests/behat/block_blog_menu_frontpage.feature index 8e1df8263f3de..f20b2e5c17fc0 100644 --- a/blocks/blog_menu/tests/behat/block_blog_menu_frontpage.feature +++ b/blocks/blog_menu/tests/behat/block_blog_menu_frontpage.feature @@ -10,7 +10,7 @@ Feature: Enable Block blog menu on the frontpage | student1 | Student | 1 | student1@example.com | S1 | And I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I add the "Blog menu" block And I log out diff --git a/blocks/blog_recent/tests/behat/block_blog_recent_frontpage.feature b/blocks/blog_recent/tests/behat/block_blog_recent_frontpage.feature index 38640424a0b34..e7403cd513b6a 100644 --- a/blocks/blog_recent/tests/behat/block_blog_recent_frontpage.feature +++ b/blocks/blog_recent/tests/behat/block_blog_recent_frontpage.feature @@ -10,7 +10,7 @@ Feature: Feature: Students can use the recent blog entries block to view recent | student1 | Student | 1 | student1@example.com | S1 | And I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I add the "Recent blog entries" block # TODO MDL-57120 site "Blogs" link not accessible without navigation block. And I add the "Navigation" block if not present @@ -89,7 +89,7 @@ Feature: Feature: Students can use the recent blog entries block to view recent Then I log out And I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I configure the "Recent blog entries" block And I set the following fields to these values: | id_config_numberofrecentblogentries | 2 | diff --git a/blocks/calendar_upcoming/tests/behat/block_calendar_upcoming_frontpage.feature b/blocks/calendar_upcoming/tests/behat/block_calendar_upcoming_frontpage.feature index 8336f521fbae6..b2d956011d111 100644 --- a/blocks/calendar_upcoming/tests/behat/block_calendar_upcoming_frontpage.feature +++ b/blocks/calendar_upcoming/tests/behat/block_calendar_upcoming_frontpage.feature @@ -16,7 +16,7 @@ Feature: View a site event on the frontpage | id_eventtype | Site | | id_name | My Site Event | And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I add the "Upcoming events" block And I log out When I log in as "teacher1" diff --git a/blocks/comments/tests/behat/block_comment_dashboard.feature b/blocks/comments/tests/behat/block_comment_dashboard.feature index 66e49c6e9db53..fcb19e7c8270d 100644 --- a/blocks/comments/tests/behat/block_comment_dashboard.feature +++ b/blocks/comments/tests/behat/block_comment_dashboard.feature @@ -14,7 +14,7 @@ Feature: Enable Block comments on the dashboard and view comments Scenario: Add the comments block on the dashboard and add comments with Javascript disabled When I log in as "teacher1" - And I press "Customise this page" + And I turn editing mode on And I add the "Comments" block And I follow "Show comments" And I add "I'm a comment from the teacher" comment to comments block @@ -23,7 +23,7 @@ Feature: Enable Block comments on the dashboard and view comments @javascript Scenario: Add the comments block on the dashboard and add comments with Javascript enabled When I log in as "teacher1" - And I press "Customise this page" + And I turn editing mode on And I add the "Comments" block And I add "I'm a comment from the teacher" comment to comments block Then I should see "I'm a comment from the teacher" diff --git a/blocks/comments/tests/behat/block_comment_frontpage.feature b/blocks/comments/tests/behat/block_comment_frontpage.feature index 6b883f2cad49d..cb8d76dd036b5 100644 --- a/blocks/comments/tests/behat/block_comment_frontpage.feature +++ b/blocks/comments/tests/behat/block_comment_frontpage.feature @@ -10,7 +10,7 @@ Feature: Enable Block comments on the frontpage and view comments | teacher1 | Teacher | 1 | teacher1@example.com | T1 | And I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I add the "Comments" block And I follow "Show comments" And I add "I'm a comment from admin" comment to comments block diff --git a/blocks/course_list/tests/behat/block_course_list_dashboard.feature b/blocks/course_list/tests/behat/block_course_list_dashboard.feature index 873208b477dd4..2b5df28cbeb0f 100644 --- a/blocks/course_list/tests/behat/block_course_list_dashboard.feature +++ b/blocks/course_list/tests/behat/block_course_list_dashboard.feature @@ -27,7 +27,7 @@ Feature: Enable the course_list block on the dashboard and view it's contents Scenario: Add the course list block on the dashboard and navigate to the course listing Given I log in as "teacher1" - And I press "Customise this page" + And I turn editing mode on When I add the "Courses" block Then I should see "Course 1" in the "My courses" "block" And I should see "Course 2" in the "My courses" "block" @@ -38,7 +38,7 @@ Feature: Enable the course_list block on the dashboard and view it's contents Scenario: Add the course list block on the dashboard and navigate to another course Given I log in as "teacher1" - And I press "Customise this page" + And I turn editing mode on When I add the "Courses" block Then I should see "Course 1" in the "My courses" "block" And I should see "Course 2" in the "My courses" "block" @@ -49,7 +49,7 @@ Feature: Enable the course_list block on the dashboard and view it's contents Scenario: Add the course list block on the dashboard and view as an admin Given I log in as "admin" - And I press "Customise this page" + And I turn editing mode on When I add the "Courses" block Then I should see "Category 1" in the "Course categories" "block" And I should see "Category A" in the "Course categories" "block" diff --git a/blocks/course_list/tests/behat/block_course_list_frontpage.feature b/blocks/course_list/tests/behat/block_course_list_frontpage.feature index 0a897ba84b94d..0f8b0c5845c20 100644 --- a/blocks/course_list/tests/behat/block_course_list_frontpage.feature +++ b/blocks/course_list/tests/behat/block_course_list_frontpage.feature @@ -28,7 +28,7 @@ Feature: Enable the course_list block on the frontpage and view it's contents Scenario: Add the course list block on the frontpage and navigate to the course listing Given I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I add the "Courses" block And I log out When I log in as "teacher1" @@ -43,7 +43,7 @@ Feature: Enable the course_list block on the frontpage and view it's contents Scenario: Add the course list block on the frontpage page and navigate to another course Given I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I add the "Courses" block And I log out When I log in as "teacher1" @@ -58,7 +58,7 @@ Feature: Enable the course_list block on the frontpage and view it's contents Scenario: Add the course list block on the frontpage page and view as an admin Given I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on When I add the "Courses" block Then I should see "Category 1" in the "Course categories" "block" And I should see "Category A" in the "Course categories" "block" @@ -72,7 +72,7 @@ Feature: Enable the course_list block on the frontpage and view it's contents Scenario: Add the course list block on the frontpage page and view as a guest Given I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I add the "Courses" block And I log out When I log in as "guest" diff --git a/blocks/login/tests/behat/login_block.feature b/blocks/login/tests/behat/login_block.feature index 2f86023f056fd..b06547a5ccfc7 100644 --- a/blocks/login/tests/behat/login_block.feature +++ b/blocks/login/tests/behat/login_block.feature @@ -10,7 +10,7 @@ Feature: Login from a block | testuser | testpass | Test | User | student1@example.com | And I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I add the "Login" block Scenario: Login block visible to non-logged in users diff --git a/blocks/myprofile/tests/behat/block_myprofile.feature b/blocks/myprofile/tests/behat/block_myprofile.feature index 8801de340d95c..d95de68c082f1 100644 --- a/blocks/myprofile/tests/behat/block_myprofile.feature +++ b/blocks/myprofile/tests/behat/block_myprofile.feature @@ -9,7 +9,7 @@ Feature: The logged in user block allows users to view their profile information | username | firstname | lastname | email | country | | teacher1 | Teacher | One | teacher1@example.com | AU | And I log in as "teacher1" - And I press "Customise this page" + And I turn editing mode on When I add the "Logged in user" block And I configure the "Logged in user" block And I set the following fields to these values: @@ -28,7 +28,7 @@ Feature: The logged in user block allows users to view their profile information | username | firstname | lastname | email | city | | teacher1 | Teacher | One | teacher1@example.com | Perth | And I log in as "teacher1" - And I press "Customise this page" + And I turn editing mode on When I add the "Logged in user" block And I configure the "Logged in user" block And I set the following fields to these values: @@ -47,7 +47,7 @@ Feature: The logged in user block allows users to view their profile information | username | firstname | lastname | email | | teacher1 | Teacher | One | teacher1@example.com | And I log in as "teacher1" - And I press "Customise this page" + And I turn editing mode on When I add the "Logged in user" block And I configure the "Logged in user" block And I set the following fields to these values: @@ -66,7 +66,7 @@ Feature: The logged in user block allows users to view their profile information | username | firstname | lastname | email | phone1 | | teacher1 | Teacher | One | teacher1@example.com | 555-5555 | And I log in as "teacher1" - And I press "Customise this page" + And I turn editing mode on When I add the "Logged in user" block And I configure the "Logged in user" block And I set the following fields to these values: @@ -85,7 +85,7 @@ Feature: The logged in user block allows users to view their profile information | username | firstname | lastname | email | phone2 | | teacher1 | Teacher | One | teacher1@example.com | 555-5555 | And I log in as "teacher1" - And I press "Customise this page" + And I turn editing mode on When I add the "Logged in user" block And I configure the "Logged in user" block And I set the following fields to these values: @@ -104,7 +104,7 @@ Feature: The logged in user block allows users to view their profile information | username | firstname | lastname | email | institution | | teacher1 | Teacher | One | teacher1@example.com | myinstitution | And I log in as "teacher1" - And I press "Customise this page" + And I turn editing mode on When I add the "Logged in user" block And I configure the "Logged in user" block And I set the following fields to these values: @@ -123,7 +123,7 @@ Feature: The logged in user block allows users to view their profile information | username | firstname | lastname | email | address | | teacher1 | Teacher | One | teacher1@example.com | myaddress | And I log in as "teacher1" - And I press "Customise this page" + And I turn editing mode on When I add the "Logged in user" block And I configure the "Logged in user" block And I set the following fields to these values: @@ -142,7 +142,7 @@ Feature: The logged in user block allows users to view their profile information | username | firstname | lastname | email | | teacher1 | Teacher | One | teacher1@example.com | And I log in as "teacher1" - And I press "Customise this page" + And I turn editing mode on When I add the "Logged in user" block And I configure the "Logged in user" block And I set the following fields to these values: @@ -161,7 +161,7 @@ Feature: The logged in user block allows users to view their profile information | username | firstname | lastname | email | | teacher1 | Teacher | One | teacher1@example.com | And I log in as "teacher1" - And I press "Customise this page" + And I turn editing mode on When I add the "Logged in user" block And I configure the "Logged in user" block And I set the following fields to these values: @@ -180,7 +180,7 @@ Feature: The logged in user block allows users to view their profile information | username | firstname | lastname | email | | teacher1 | Teacher | One | teacher1@example.com | And I log in as "teacher1" - And I press "Customise this page" + And I turn editing mode on When I add the "Logged in user" block And I configure the "Logged in user" block And I set the following fields to these values: @@ -199,7 +199,7 @@ Feature: The logged in user block allows users to view their profile information | username | firstname | lastname | email | | teacher1 | Teacher | One | teacher1@example.com | And I log in as "teacher1" - And I press "Customise this page" + And I turn editing mode on When I add the "Logged in user" block And I configure the "Logged in user" block And I set the following fields to these values: diff --git a/blocks/myprofile/tests/behat/block_myprofile_dashboard.feature b/blocks/myprofile/tests/behat/block_myprofile_dashboard.feature index e1305226ce171..da323581aa2e3 100644 --- a/blocks/myprofile/tests/behat/block_myprofile_dashboard.feature +++ b/blocks/myprofile/tests/behat/block_myprofile_dashboard.feature @@ -9,6 +9,6 @@ Feature: The logged in user block allows users to view their profile information | username | firstname | lastname | email | | teacher1 | Teacher | One | teacher1@example.com | And I log in as "teacher1" - And I press "Customise this page" + And I turn editing mode on When I add the "Logged in user" block Then I should see "Teacher One" in the "Logged in user" "block" diff --git a/blocks/myprofile/tests/behat/block_myprofile_frontpage.feature b/blocks/myprofile/tests/behat/block_myprofile_frontpage.feature index 1e6707848d615..c7d5e37a071a5 100644 --- a/blocks/myprofile/tests/behat/block_myprofile_frontpage.feature +++ b/blocks/myprofile/tests/behat/block_myprofile_frontpage.feature @@ -10,7 +10,7 @@ Feature: The logged in user block allows users to view their profile information | teacher1 | Teacher | One | teacher1@example.com | T1 | And I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I add the "Logged in user" block And I log out diff --git a/blocks/online_users/tests/behat/block_online_users_frontpage.feature b/blocks/online_users/tests/behat/block_online_users_frontpage.feature index e8f9591f6d76d..5da03deadab88 100644 --- a/blocks/online_users/tests/behat/block_online_users_frontpage.feature +++ b/blocks/online_users/tests/behat/block_online_users_frontpage.feature @@ -21,7 +21,7 @@ Feature: The online users block allow you to see who is currently online on fron Scenario: View the online users block on the front page and see myself Given I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on When I add the "Online users" block Then I should see "Admin User" in the "Online users" "block" And I should see "1 online user" in the "Online users" "block" @@ -29,7 +29,7 @@ Feature: The online users block allow you to see who is currently online on fron Scenario: View the online users block on the front page as a logged in user Given I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I add the "Online users" block And I log out And I log in as "student2" @@ -45,7 +45,7 @@ Feature: The online users block allow you to see who is currently online on fron Scenario: View the online users block on the front page as a guest Given I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I add the "Online users" block And I log out And I log in as "student2" @@ -65,7 +65,7 @@ Feature: The online users block allow you to see who is currently online on fron | block_online_users_onlinestatushiding | 1 | And I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I add the "Online users" block And I log out When I log in as "student1" @@ -104,7 +104,7 @@ Feature: The online users block allow you to see who is currently online on fron | block_online_users_onlinestatushiding | 1 | And I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I add the "Online users" block And I log out And I log in as "student1" @@ -125,7 +125,7 @@ Feature: The online users block allow you to see who is currently online on fron | block_online_users_onlinestatushiding | 1 | And I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I add the "Online users" block And I log out And I log in as "student1" diff --git a/blocks/private_files/tests/behat/block_private_files_frontpage.feature b/blocks/private_files/tests/behat/block_private_files_frontpage.feature index 0e79d0a911aa4..cd3ef3b16658f 100644 --- a/blocks/private_files/tests/behat/block_private_files_frontpage.feature +++ b/blocks/private_files/tests/behat/block_private_files_frontpage.feature @@ -13,7 +13,7 @@ Feature: The private files block allows users to store files privately in moodle | teacher1 | Teacher | 1 | teacher1@example.com | And I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I add the "Private files" block And I log out diff --git a/blocks/recentlyaccesseditems/tests/behat/block_recentlyaccesseditems_dashboard.feature b/blocks/recentlyaccesseditems/tests/behat/block_recentlyaccesseditems_dashboard.feature index f635459c7ae6e..5d1f562177ee4 100644 --- a/blocks/recentlyaccesseditems/tests/behat/block_recentlyaccesseditems_dashboard.feature +++ b/blocks/recentlyaccesseditems/tests/behat/block_recentlyaccesseditems_dashboard.feature @@ -22,7 +22,7 @@ Feature: The recently accessed items block allows users to easily access their m | idnumber | Test forum name | | name | Test forum name | And I log in as "student1" - And I press "Customise this page" + And I turn editing mode on And I add the "Recently accessed items" block Scenario: User has not accessed any item diff --git a/blocks/search_forums/tests/behat/block_search_forums_frontpage.feature b/blocks/search_forums/tests/behat/block_search_forums_frontpage.feature index 31d868376cd48..53d09348b572e 100644 --- a/blocks/search_forums/tests/behat/block_search_forums_frontpage.feature +++ b/blocks/search_forums/tests/behat/block_search_forums_frontpage.feature @@ -10,7 +10,7 @@ Feature: The search forums block allows users to search for forum posts on front | student1 | Student | 1 | student1@example.com | S1 | And I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I add the "Search forums" block And I log out diff --git a/blocks/site_main_menu/tests/behat/add_url.feature b/blocks/site_main_menu/tests/behat/add_url.feature index 1b2a7df768273..f5ce28b647135 100644 --- a/blocks/site_main_menu/tests/behat/add_url.feature +++ b/blocks/site_main_menu/tests/behat/add_url.feature @@ -8,7 +8,7 @@ Feature: Add URL to main menu block Scenario: Add a URL in menu block and ensure it appears Given I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I add the "Main menu" block When I add a "URL" to section "0" and I fill the form with: | Name | google | diff --git a/blocks/site_main_menu/tests/behat/edit_activities.feature b/blocks/site_main_menu/tests/behat/edit_activities.feature index e8aa3315c9a7f..78701455da50d 100644 --- a/blocks/site_main_menu/tests/behat/edit_activities.feature +++ b/blocks/site_main_menu/tests/behat/edit_activities.feature @@ -13,7 +13,7 @@ Feature: Edit activities in main menu block | idnumber | forum | And I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I add the "Main menu" block When I set the field "Edit title" in the "My forum name" "block_site_main_menu > Activity" to "New forum name" Then I should not see "My forum name" @@ -28,7 +28,7 @@ Feature: Edit activities in main menu block | allowstealth | 1 | And I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I add the "Main menu" block When I add a "Forum" to section "0" and I fill the form with: | Forum name | Visible forum | @@ -61,7 +61,7 @@ Feature: Edit activities in main menu block And the field "Availability" matches value "Make available but not shown on course page" And I press "Save and return to course" And "My forum name" activity in site main menu block should be available but hidden from course page - And I navigate to "Turn editing off" in current page administration + And I turn editing mode off And "My forum name" activity in site main menu block should be available but hidden from course page And I log out And I should not see "My forum name" in the "Main menu" "block" diff --git a/blocks/tag_flickr/tests/behat/configuring_tag_flickr_block.feature b/blocks/tag_flickr/tests/behat/configuring_tag_flickr_block.feature index c9278270013d6..c6670012b9be0 100644 --- a/blocks/tag_flickr/tests/behat/configuring_tag_flickr_block.feature +++ b/blocks/tag_flickr/tests/behat/configuring_tag_flickr_block.feature @@ -7,7 +7,7 @@ Feature: Adding and configuring Flickr block @javascript Scenario: Adding Flickr block to the tags site page Given I log in as "admin" - And I press "Customise this page" + And I turn editing mode on # TODO MDL-57120 site "Tags" link not accessible without navigation block. And I add the "Navigation" block if not present And I click on "Site pages" "list_item" in the "Navigation" "block" diff --git a/blocks/tag_youtube/tests/behat/configure_tag_youtube_block.feature b/blocks/tag_youtube/tests/behat/configure_tag_youtube_block.feature index 6952b95b160cc..4da87fe05f22c 100644 --- a/blocks/tag_youtube/tests/behat/configure_tag_youtube_block.feature +++ b/blocks/tag_youtube/tests/behat/configure_tag_youtube_block.feature @@ -14,7 +14,7 @@ Feature: Adding and configuring YouTube block Given the following config values are set as admin: | apikey | | block_tag_youtube | And I follow "Dashboard" in the user menu - And I press "Customise this page" + And I turn editing mode on # TODO MDL-57120 site "Tags" link not accessible without navigation block. And I add the "Navigation" block if not present And I click on "Site pages" "list_item" in the "Navigation" "block" @@ -34,7 +34,7 @@ Feature: Adding and configuring YouTube block Given the following config values are set as admin: | apikey | invalidapikeyvalue | block_tag_youtube | And I follow "Dashboard" in the user menu - And I press "Customise this page" + And I turn editing mode on And I add the "Navigation" block if not present And I click on "Site pages" "list_item" in the "Navigation" "block" And I click on "Tags" "link" in the "Navigation" "block" diff --git a/blocks/tags/tests/behat/tagcloud.feature b/blocks/tags/tests/behat/tagcloud.feature index 6a8bd4148958f..dbe47565bedeb 100644 --- a/blocks/tags/tests/behat/tagcloud.feature +++ b/blocks/tags/tests/behat/tagcloud.feature @@ -23,7 +23,7 @@ Feature: Block tags displaying tag cloud Scenario: Add Tags block on a front page When I log in as "admin" And I am on site homepage - And I follow "Turn editing on" + And I turn editing mode on And I add the "Tags" block And I log out And I am on site homepage diff --git a/blocks/tests/behat/configure_block_throughout_site.feature b/blocks/tests/behat/configure_block_throughout_site.feature index a312ce6d05870..f633c84d57018 100644 --- a/blocks/tests/behat/configure_block_throughout_site.feature +++ b/blocks/tests/behat/configure_block_throughout_site.feature @@ -30,7 +30,7 @@ Feature: Add and configure blocks throughout the site Scenario: Add and configure a block throughtout the site Given I log in as "manager1" And I am on site homepage - And I follow "Turn editing on" + And I turn editing mode on And I add the "Comments" block And I configure the "Comments" block And I set the following fields to these values: @@ -50,7 +50,7 @@ Feature: Add and configure blocks throughout the site Scenario: Blocks on the dashboard page can have roles assigned to them Given I log in as "manager1" - When I press "Customise this page" + When I turn editing mode on Then I should see "Assign roles in Private files block" Scenario: Blocks on courses can have roles assigned to them @@ -63,7 +63,7 @@ Feature: Add and configure blocks throughout the site Scenario: Blocks can safely be customised Given I log in as "admin" And I am on homepage - And I press "Customise this page" + And I turn editing mode on And I add the "Text" block And I configure the "(new text block)" block And I set the following fields to these values: diff --git a/blocks/tests/behat/hide_blocks.feature b/blocks/tests/behat/hide_blocks.feature index db11e3f529da2..0a4f9fae911f1 100644 --- a/blocks/tests/behat/hide_blocks.feature +++ b/blocks/tests/behat/hide_blocks.feature @@ -23,5 +23,5 @@ Feature: Block visibility And I turn editing mode on And I open the "Search forums" blocks action menu And I click on "Hide Search forums block" "link" in the "Search forums" "block" - And I follow "Turn editing off" + And I turn editing mode off And ".empty-region-side-post" "css_element" should exist in the "body" "css_element" diff --git a/blocks/tests/behat/manage_blocks.feature b/blocks/tests/behat/manage_blocks.feature index 7af0a432a138a..2f5b1fcefe11f 100644 --- a/blocks/tests/behat/manage_blocks.feature +++ b/blocks/tests/behat/manage_blocks.feature @@ -48,7 +48,7 @@ Feature: Block appearances And I set the following fields to these values: | Display on page types | Any course page | And I press "Save changes" - And I press "Turn editing off" + And I turn editing mode off And I follow "Test survey name" And I should not see "Comments" @@ -58,5 +58,5 @@ Feature: Block appearances And I set the following fields to these values: | Visible | No | And I press "Save changes" - And I press "Turn editing off" + And I turn editing mode off Then I should not see "Comments" diff --git a/calendar/tests/behat/category_events.feature b/calendar/tests/behat/category_events.feature index 021126ad4fe4f..734c7acddc67d 100644 --- a/calendar/tests/behat/category_events.feature +++ b/calendar/tests/behat/category_events.feature @@ -67,7 +67,7 @@ Feature: Course Category Events @javascript Scenario: Manager of a Category can see all child and parent events in their category Given I log in as "managera" - And I press "Customise this page" + And I turn editing mode on # TODO MDL-57120 site "Tags" link not accessible without navigation block. When I add the "Navigation" block if not present And I click on "Site pages" "list_item" in the "Navigation" "block" @@ -80,7 +80,7 @@ Feature: Course Category Events And I should not see "DB2 event" And I log out Given I log in as "managerb" - And I press "Customise this page" + And I turn editing mode on # TODO MDL-57120 site "Tags" link not accessible without navigation block. When I add the "Navigation" block if not present And I click on "Site pages" "list_item" in the "Navigation" "block" @@ -95,7 +95,7 @@ Feature: Course Category Events @javascript Scenario: Users enrolled in a course can see all child and parent events in their category Given I log in as "student1" - And I press "Customise this page" + And I turn editing mode on # TODO MDL-57120 site "Tags" link not accessible without navigation block. When I add the "Navigation" block if not present And I click on "Site pages" "list_item" in the "Navigation" "block" diff --git a/completion/tests/behat/activity_completion_criteria.feature b/completion/tests/behat/activity_completion_criteria.feature index 09f59fe42b2f7..fbab217b8d3d5 100644 --- a/completion/tests/behat/activity_completion_criteria.feature +++ b/completion/tests/behat/activity_completion_criteria.feature @@ -116,7 +116,7 @@ Feature: Allow to mark course as completed without cron for activity completion Given I log in as "teacher1" And I am on "Completion course" course homepage And I navigate to "View > Grader report" in the course gradebook - And I press "Turn editing on" + And I turn editing mode on And I give the grade "57" to the user "Student First" for the grade item "Test assignment name" And I press "Save changes" And I log out diff --git a/contentbank/contenttype/h5p/tests/behat/admin_replace_content.feature b/contentbank/contenttype/h5p/tests/behat/admin_replace_content.feature index c91828e0a4f1e..c34e19f012881 100644 --- a/contentbank/contenttype/h5p/tests/behat/admin_replace_content.feature +++ b/contentbank/contenttype/h5p/tests/behat/admin_replace_content.feature @@ -9,7 +9,7 @@ Feature: Replace H5P file from an existing content | contextlevel | reference | contenttype | user | contentname | filepath | | System | | contenttype_h5p | admin | filltheblanks.h5p | /h5p/tests/fixtures/filltheblanks.h5p | And I log in as "admin" - And I press "Customise this page" + And I turn editing mode on And I add the "Navigation" block if not present And I expand "Site pages" node And I click on "Content bank" "link" diff --git a/contentbank/contenttype/h5p/tests/behat/admin_upload_content.feature b/contentbank/contenttype/h5p/tests/behat/admin_upload_content.feature index 29959c58fe35c..dbc596a9a15d1 100644 --- a/contentbank/contenttype/h5p/tests/behat/admin_upload_content.feature +++ b/contentbank/contenttype/h5p/tests/behat/admin_upload_content.feature @@ -9,7 +9,7 @@ Feature: H5P file upload to content bank for admins And I follow "Manage private files..." And I upload "h5p/tests/fixtures/filltheblanks.h5p" file to "Files" filemanager And I click on "Save changes" "button" - And I press "Customise this page" + And I turn editing mode on And I add the "Navigation" block if not present And I expand "Site pages" node And I click on "Content bank" "link" diff --git a/contentbank/contenttype/h5p/tests/behat/teacher_upload_content.feature b/contentbank/contenttype/h5p/tests/behat/teacher_upload_content.feature index 488fde877d580..1146a082656c3 100644 --- a/contentbank/contenttype/h5p/tests/behat/teacher_upload_content.feature +++ b/contentbank/contenttype/h5p/tests/behat/teacher_upload_content.feature @@ -25,7 +25,7 @@ Feature: H5P file upload to content bank for non admins And I click on "Save changes" "button" Scenario: Teachers can not access system level content bank - Given I press "Customise this page" + Given I turn editing mode on And I add the "Navigation" block if not present When I expand "Site pages" node Then I should not see "Content bank" diff --git a/course/tests/behat/activities_visibility_icons.feature b/course/tests/behat/activities_visibility_icons.feature index d26ae6716b84f..f6269f67aa1b8 100644 --- a/course/tests/behat/activities_visibility_icons.feature +++ b/course/tests/behat/activities_visibility_icons.feature @@ -17,12 +17,15 @@ Feature: Toggle activities visibility from the course page | user | course | role | | teacher1 | C1 | editingteacher | | student1 | C1 | student | + And the following "activity" exists: + | activity | forum | + | course | C1 | + | idnumber | C1F1 | + | name | Test forum name | + | intro | Test forum description | + | visible | 1 | And I log in as "teacher1" And I am on "Course 1" course homepage with editing mode on - And I add a "Forum" to section "1" and I fill the form with: - | Forum name | Test forum name | - | Description | Test forum description | - | Availability | Show on course page | When I open "Test forum name" actions menu Then "Test forum name" actions menu should not have "Show" item And "Test forum name" actions menu should not have "Make available" item @@ -60,7 +63,6 @@ Feature: Toggle activities visibility from the course page And I log in as "student1" And I am on "Course 1" course homepage And I should not see "Test forum name" - And I log out @javascript Scenario: Activities can be made available and unavailable inside a hidden section @@ -75,13 +77,17 @@ Feature: Toggle activities visibility from the course page | user | course | role | | teacher1 | C1 | editingteacher | | student1 | C1 | student | + And the following "activity" exists: + | activity | forum | + | course | C1 | + | idnumber | C1F1 | + | section | 2 | + | name | Test forum name | + | intro | Test forum description | + | visible | 1 | And I log in as "teacher1" And I am on "Course 1" course homepage with editing mode on And I add the "Recent activity" block - And I add a "Forum" to section "2" and I fill the form with: - | Forum name | Test forum name | - | Description | Test forum description | - | Availability | Show on course page | When I hide section "2" Then "Test forum name" activity should be hidden And I open "Test forum name" actions menu @@ -116,7 +122,6 @@ Feature: Toggle activities visibility from the course page And I click on "Test forum name" "link" in the "Recent activity" "block" And I should see "Test forum name" And I should see "(There are no discussion topics yet in this forum)" - And I log out @javascript Scenario: Activities can be made available but not visible on a course page diff --git a/course/tests/behat/coursetags.feature b/course/tests/behat/coursetags.feature index 73d3ec5786085..a9e9c6b228546 100644 --- a/course/tests/behat/coursetags.feature +++ b/course/tests/behat/coursetags.feature @@ -47,7 +47,7 @@ Feature: Tagging courses And I press "Save and display" And I log out And I log in as "user1" - And I press "Customise this page" + And I turn editing mode on # TODO MDL-57120 "Tags" link not accessible without navigation block. And I add the "Navigation" block if not present And I click on "Site pages" "list_item" in the "Navigation" "block" @@ -84,7 +84,7 @@ Feature: Tagging courses And I press "Save changes" And I log out And I log in as "user1" - And I press "Customise this page" + And I turn editing mode on # TODO MDL-57120 "Tags" link not accessible without navigation block. And I add the "Navigation" block if not present And I click on "Site pages" "list_item" in the "Navigation" "block" diff --git a/course/tests/behat/frontpage_topic_section.feature b/course/tests/behat/frontpage_topic_section.feature index f2cf92cb4cdc9..5c9bbfb93856a 100644 --- a/course/tests/behat/frontpage_topic_section.feature +++ b/course/tests/behat/frontpage_topic_section.feature @@ -23,23 +23,23 @@ Feature: Front page topic section | assign | Acceptance test site | 1 | Frontpage assignment | Assignment description | assign0 | And I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I click on "Edit summary" "link" in the "region-main" "region" And I click on "Custom" "checkbox" And I set the field "New value for Section name" to "New section name" When I press "Save changes" And I should see "New section name" in the "region-main" "region" - Then I navigate to "Turn editing off" in current page administration + Then I turn editing mode off And I should see "New section name" in the "region-main" "region" @javascript Scenario: Topic description appears in the frontpage Given I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I click on "Edit summary" "link" in the "region-main" "region" And I set the field "Summary" to "New section description" When I press "Save changes" And I should see "New section description" in the "region-main" "region" - Then I navigate to "Turn editing off" in current page administration + Then I turn editing mode off And I should see "New section description" in the "region-main" "region" diff --git a/grade/report/grader/tests/behat/switch_views.feature b/grade/report/grader/tests/behat/switch_views.feature index 14eb04ccf8ca6..d4dd29a09b77c 100644 --- a/grade/report/grader/tests/behat/switch_views.feature +++ b/grade/report/grader/tests/behat/switch_views.feature @@ -55,7 +55,7 @@ Feature: We can change what we are viewing on the grader report When I am on "Course 1" course homepage with editing mode on And I open "Test assignment name 2" actions menu And I click on "Hide" "link" in the "Test assignment name 2" activity - And I am on "Course 1" course homepage + And I am on "Course 1" course homepage with editing mode off And I navigate to "View > Grader report" in the course gradebook And I should see "Test assignment name 1" And I should see "Test assignment name 2" diff --git a/grade/tests/behat/grade_calculated_grade_items.feature b/grade/tests/behat/grade_calculated_grade_items.feature index e3cca8d185fb3..91f4870d922cf 100644 --- a/grade/tests/behat/grade_calculated_grade_items.feature +++ b/grade/tests/behat/grade_calculated_grade_items.feature @@ -65,7 +65,7 @@ Feature: Calculated grade items can be used in the gradebook And I set the following settings for grade item "Calc cat": | Maximum grade | 50 | And I navigate to "View > Grader report" in the course gradebook - And I press "Turn editing on" + And I turn editing mode on And I give the grade "75.00" to the user "Student 1" for the grade item "grade item 1" And I press "Save changes" And I navigate to "View > User report" in the course gradebook @@ -131,7 +131,7 @@ Feature: Calculated grade items can be used in the gradebook | Min and max grades used in calculation | Initial min and max grades | And I press "Save changes" And I navigate to "View > Grader report" in the course gradebook - And I press "Turn editing on" + And I turn editing mode on And I give the grade "75.00" to the user "Student 1" for the grade item "grade item 1" And I press "Save changes" And I navigate to "View > User report" in the course gradebook diff --git a/grade/tests/behat/grade_letter_boundary.feature b/grade/tests/behat/grade_letter_boundary.feature index d9d951c3ff866..2b0fa5bb65288 100644 --- a/grade/tests/behat/grade_letter_boundary.feature +++ b/grade/tests/behat/grade_letter_boundary.feature @@ -33,10 +33,10 @@ Feature: We can customise the letter boundary of a course. | id_gradeboundary10 | 57 | And I press "Save changes" And I navigate to "View > Grader report" in the course gradebook - And I press "Turn editing on" + And I turn editing mode on And I give the grade "57" to the user "Student 1" for the grade item "Test assignment one" And I press "Save changes" - And I press "Turn editing off" + And I turn editing mode off Then the following should exist in the "user-grades" table: | -1- | -4- | -5- | | Student 1 | D | D | diff --git a/grade/tests/behat/grade_letter_boundary_20160518.feature b/grade/tests/behat/grade_letter_boundary_20160518.feature index 0f5dbc18dcdf7..b46c43c5ef4cb 100644 --- a/grade/tests/behat/grade_letter_boundary_20160518.feature +++ b/grade/tests/behat/grade_letter_boundary_20160518.feature @@ -34,10 +34,10 @@ Feature: We can customise the letter boundary of a course in gradebook version 2 | id_gradeboundary10 | 57 | And I press "Save changes" And I navigate to "View > Grader report" in the course gradebook - And I press "Turn editing on" + And I turn editing mode on And I give the grade "57" to the user "Student 1" for the grade item "Test assignment one" And I press "Save changes" - And I press "Turn editing off" + And I turn editing mode off Then the following should exist in the "user-grades" table: | -1- | -4- | -5- | | Student 1 | F | F | diff --git a/grade/tests/behat/grade_to_pass.feature b/grade/tests/behat/grade_to_pass.feature index a2062f26c7cb2..fc119fd20a21d 100644 --- a/grade/tests/behat/grade_to_pass.feature +++ b/grade/tests/behat/grade_to_pass.feature @@ -85,7 +85,6 @@ Feature: We can set the grade to pass value | Grade to pass | 3 | And I press "Save and return to course" And I navigate to "View > Grader report" in the course gradebook - And I turn editing mode on And I click on "Edit assign Test Assignment 1" "link" And I expand all fieldsets Then the field "Grade to pass" matches value "3" @@ -124,7 +123,6 @@ Feature: We can set the grade to pass value | Assessment grade to pass | 10 | And I press "Save and return to course" And I navigate to "View > Grader report" in the course gradebook - And I turn editing mode on And I click on "Edit workshop Test Workshop 1 (submission)" "link" And I expand all fieldsets Then the field "Grade to pass" matches value "40" @@ -168,7 +166,6 @@ Feature: We can set the grade to pass value | Grade to pass | 9.5 | And I press "Save and return to course" And I navigate to "View > Grader report" in the course gradebook - And I turn editing mode on And I click on "Edit quiz Test Quiz 1" "link" And I expand all fieldsets Then the field "Grade to pass" matches value "9.5" @@ -190,7 +187,6 @@ Feature: We can set the grade to pass value | Grade to pass | 90 | And I press "Save and return to course" And I navigate to "View > Grader report" in the course gradebook - And I turn editing mode on And I click on "Edit lesson Test Lesson 1" "link" And I expand all fieldsets Then the field "Grade to pass" matches value "90" @@ -215,7 +211,6 @@ Feature: We can set the grade to pass value | Ratings > Grade to pass | 90 | And I press "Save and return to course" And I navigate to "View > Grader report" in the course gradebook - And I turn editing mode on And I click on "Edit data Test Database 1" "link" And I expand all fieldsets Then the field "Grade to pass" matches value "90" @@ -256,7 +251,6 @@ Feature: We can set the grade to pass value | Ratings > Grade to pass | 90 | And I press "Save and return to course" And I navigate to "View > Grader report" in the course gradebook - And I turn editing mode on And I click on "Edit forum Test Forum 1 rating" "link" And I expand all fieldsets Then the field "Grade to pass" matches value "90" @@ -280,7 +274,6 @@ Feature: We can set the grade to pass value | Ratings > Grade to pass | 90 | And I press "Save and return to course" And I navigate to "View > Grader report" in the course gradebook - And I turn editing mode on And I click on "Edit glossary Test Glossary 1" "link" And I expand all fieldsets Then the field "Grade to pass" matches value "90" diff --git a/lib/tests/behat/locking.feature b/lib/tests/behat/locking.feature index ad2c1bf9f4916..c296c8ed5b88b 100644 --- a/lib/tests/behat/locking.feature +++ b/lib/tests/behat/locking.feature @@ -44,15 +44,15 @@ Feature: Context freezing apply to child contexts And I click on "Continue" "button" Then "Add a new discussion topic" "link" should not exist When I am on "courseaa1" course homepage - Then I should see "Turn editing on" + Then "Set mode" "button" should exist When I follow "faa1b" Then "Add a new discussion topic" "link" should exist When I am on "courseaa2" course homepage - Then I should see "Turn editing on" + Then "Set mode" "button" should exist When I follow "faa2" Then "Add a new discussion topic" "link" should exist When I am on "courseb" course homepage - Then I should see "Turn editing on" + Then "Set mode" "button" should exist When I follow "fb" Then "Add a new discussion topic" "link" should exist @@ -61,15 +61,15 @@ Feature: Context freezing apply to child contexts And I follow "faa1" Then "Add a new discussion topic" "link" should not exist When I am on "courseaa1" course homepage - Then I should see "Turn editing on" + Then "Set mode" "button" should exist When I follow "faa1b" Then "Add a new discussion topic" "link" should exist When I am on "courseaa2" course homepage - Then I should see "Turn editing on" + Then "Set mode" "button" should exist When I follow "faa2" Then "Add a new discussion topic" "link" should exist When I am on "courseb" course homepage - Then I should see "Turn editing on" + Then "Set mode" "button" should exist When I follow "fb" And "Add a new discussion topic" "link" should exist @@ -89,23 +89,23 @@ Feature: Context freezing apply to child contexts Scenario: Freeze course should freeze all children Given I am on the "courseaa1" "Course" page logged in as "admin" - And I should see "Turn editing on" + And "Set mode" "button" should exist When I follow "Freeze this context" And I click on "Continue" "button" - Then I should not see "Turn editing on" + Then "Set mode" "button" should not exist Then "Add a new discussion topic" "link" should not exist When I am on "courseaa1" course homepage - Then I should not see "Turn editing on" + Then "Set mode" "button" should not exist And "Unfreeze this context" "link" should exist in current page administration When I follow "faa1b" Then "Add a new discussion topic" "link" should not exist And "Unfreeze this context" "link" should not exist in current page administration When I am on "courseaa2" course homepage - Then I should see "Turn editing on" + Then "Set mode" "button" should exist When I follow "faa2" Then "Add a new discussion topic" "link" should exist When I am on "courseb" course homepage - Then I should see "Turn editing on" + Then "Set mode" "button" should exist When I follow "fb" Then "Add a new discussion topic" "link" should exist @@ -114,15 +114,15 @@ Feature: Context freezing apply to child contexts And I follow "faa1" Then "Add a new discussion topic" "link" should not exist When I am on "courseaa1" course homepage - Then I should not see "Turn editing on" + Then "Set mode" "button" should not exist When I follow "faa1b" Then "Add a new discussion topic" "link" should not exist When I am on "courseaa2" course homepage - Then I should see "Turn editing on" + Then "Set mode" "button" should exist When I follow "faa2" Then "Add a new discussion topic" "link" should exist When I am on "courseb" course homepage - Then I should see "Turn editing on" + Then "Set mode" "button" should exist When I follow "fb" Then "Add a new discussion topic" "link" should exist @@ -146,39 +146,39 @@ Feature: Context freezing apply to child contexts And I click on "managecontextlock" action for "cata" in management category listing And I click on "Continue" "button" And I am on "courseaa1" course homepage - And I should not see "Turn editing on" + And "Set mode" "button" should not exist Then "Add a new discussion topic" "link" should not exist When I am on "courseaa1" course homepage - Then I should not see "Turn editing on" + Then "Set mode" "button" should not exist And "Unfreeze this context" "link" should not exist in current page administration When I follow "faa1b" Then "Add a new discussion topic" "link" should not exist And "Unfreeze this context" "link" should not exist in current page administration When I am on "courseaa2" course homepage - Then I should not see "Turn editing on" + Then "Set mode" "button" should not exist When I follow "faa2" Then "Add a new discussion topic" "link" should not exist And "Unfreeze this context" "link" should not exist in current page administration When I am on "courseb" course homepage - Then I should see "Turn editing on" + Then "Set mode" "button" should exist When I follow "fb" Then "Add a new discussion topic" "link" should exist And I log out When I am on the "courseaa1" "Course" page logged in as "teacher" - Then I should not see "Turn editing on" + Then "Set mode" "button" should not exist And I follow "faa1" Then "Add a new discussion topic" "link" should not exist When I am on "courseaa1" course homepage - Then I should not see "Turn editing on" + Then "Set mode" "button" should not exist When I follow "faa1b" Then "Add a new discussion topic" "link" should not exist When I am on "courseaa2" course homepage - Then I should not see "Turn editing on" + Then "Set mode" "button" should not exist When I follow "faa2" Then "Add a new discussion topic" "link" should not exist When I am on "courseb" course homepage - Then I should see "Turn editing on" + Then "Set mode" "button" should exist When I follow "fb" Then "Add a new discussion topic" "link" should exist diff --git a/media/player/videojs/tests/behat/modules.feature b/media/player/videojs/tests/behat/modules.feature index a0175ddce9de9..1cc11953d5d9c 100644 --- a/media/player/videojs/tests/behat/modules.feature +++ b/media/player/videojs/tests/behat/modules.feature @@ -7,7 +7,7 @@ Feature: Embed videos without the media filter Background: Given I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on @javascript Scenario: Add a video in a URL resource. Make sure media filters work diff --git a/mod/book/tests/behat/create_chapters.feature b/mod/book/tests/behat/create_chapters.feature index 8c0061dcc1b48..e942ed7de68a2 100644 --- a/mod/book/tests/behat/create_chapters.feature +++ b/mod/book/tests/behat/create_chapters.feature @@ -73,7 +73,7 @@ Feature: In a book, create chapters and sub chapters And "Delete chapter \"1. Dummy first chapter\"" "link" should exist in the "Table of contents" "block" And "Hide chapter \"1. Dummy first chapter\"" "link" should exist in the "Table of contents" "block" And "Add new chapter" "link" should exist in the "Table of contents" "block" - When I press "Turn editing off" + When I turn editing mode off Then "Edit chapter \"1. Dummy first chapter\"" "link" should not exist in the "Table of contents" "block" And "Delete chapter \"1. Dummy first chapter\"" "link" should not exist in the "Table of contents" "block" And "Hide chapter \"1. Dummy first chapter\"" "link" should not exist in the "Table of contents" "block" diff --git a/mod/book/tests/behat/edit_tags.feature b/mod/book/tests/behat/edit_tags.feature index d1b3cc2fa571e..f1a9ba3054b4a 100644 --- a/mod/book/tests/behat/edit_tags.feature +++ b/mod/book/tests/behat/edit_tags.feature @@ -33,7 +33,7 @@ Feature: Edited book chapters handle tags correctly Then I should see "Example" in the ".book-tags" "css_element" And I should see "Chapter" in the ".book-tags" "css_element" And I should see "Cool" in the ".book-tags" "css_element" - And I press "Turn editing on" + And I turn editing mode on And I follow "Edit chapter \"1. Dummy first chapter\"" Then I should see "Example" in the ".form-autocomplete-selection" "css_element" Then I should see "Chapter" in the ".form-autocomplete-selection" "css_element" @@ -61,7 +61,7 @@ Feature: Edited book chapters handle tags correctly Then I should see "OT1" in the ".book-tags" "css_element" And I should see "OT3" in the ".book-tags" "css_element" And I should not see "OT2" in the ".book-tags" "css_element" - And I press "Turn editing on" + And I turn editing mode on And I follow "Edit chapter \"1. Dummy first chapter\"" And I should see "OT1" in the ".form-autocomplete-selection" "css_element" And I should see "OT3" in the ".form-autocomplete-selection" "css_element" diff --git a/mod/data/tests/behat/create_activity.feature b/mod/data/tests/behat/create_activity.feature index a1d46c78043e6..d8463cde0751e 100644 --- a/mod/data/tests/behat/create_activity.feature +++ b/mod/data/tests/behat/create_activity.feature @@ -17,7 +17,7 @@ Feature: Teachers can enable comments only if comments are enabled at site level | teacher1 | C1 | editingteacher | When I log in as "teacher1" And I am on "Course 1" course homepage - And I press "Turn editing on" + And I turn editing mode on And I press "Add an activity or resource" And I click on "Add a new Database" "link" in the "Add an activity or resource" "dialogue" And I expand all fieldsets diff --git a/mod/feedback/tests/behat/coursemapping.feature b/mod/feedback/tests/behat/coursemapping.feature index cb66f9485ddfc..72a215081e639 100644 --- a/mod/feedback/tests/behat/coursemapping.feature +++ b/mod/feedback/tests/behat/coursemapping.feature @@ -232,7 +232,7 @@ Feature: Mapping courses in a feedback And I add the "Main menu" block And I click on "Delete" "link" in the "Course feedback" activity And I press "Yes" - And I follow "Turn editing off" + And I turn editing mode off And I am on site homepage Then "Feedback" "block" should not exist And I am on "Course 1" course homepage diff --git a/mod/forum/tests/behat/grade_forum.feature b/mod/forum/tests/behat/grade_forum.feature index 0e7ffb9ac1613..da1f30b1a834b 100644 --- a/mod/forum/tests/behat/grade_forum.feature +++ b/mod/forum/tests/behat/grade_forum.feature @@ -117,7 +117,6 @@ Feature: I can grade a students interaction across a forum And I set the field "Ratings > Grade to pass" to "4" When I press "Save and return to course" And I navigate to "View > Grader report" in the course gradebook - And I turn editing mode on # There shouldn't be any Whole forum grade gradeitem. Then I should see "Test Forum 1 rating" diff --git a/mod/glossary/tests/behat/entries_require_approval.feature b/mod/glossary/tests/behat/entries_require_approval.feature index f45b3a7e45a81..29ebe48e220ec 100644 --- a/mod/glossary/tests/behat/entries_require_approval.feature +++ b/mod/glossary/tests/behat/entries_require_approval.feature @@ -68,7 +68,7 @@ Feature: A teacher can choose whether glossary entries require approval | Tags | Test | And I log out And I log in as "teacher1" - And I press "Customise this page" + And I turn editing mode on And I add the "Navigation" block if not present And I expand "Site pages" node And I click on "Tags" "link" in the "Navigation" "block" diff --git a/my/tests/behat/add_blocks.feature b/my/tests/behat/add_blocks.feature index 3728f18e6543a..8cc75d38382f3 100644 --- a/my/tests/behat/add_blocks.feature +++ b/my/tests/behat/add_blocks.feature @@ -19,9 +19,9 @@ Feature: Add blocks to dashboard page And I log in as "student1" Scenario: Add blocks to page - When I press "Customise this page" + When I turn editing mode on And I add the "Latest announcements" block - And I press "Stop customising this page" + And I turn editing mode off Then I should see "Latest announcements" in the "Latest announcements" "block" And I should see "Latest badges" in the "Latest badges" "block" And I should see "Calendar" in the "Calendar" "block" diff --git a/my/tests/behat/reset_all_pages.feature b/my/tests/behat/reset_all_pages.feature index 9f24eb800959d..ca89da8252b5d 100644 --- a/my/tests/behat/reset_all_pages.feature +++ b/my/tests/behat/reset_all_pages.feature @@ -18,18 +18,18 @@ Feature: Reset all personalised pages to default And I log in as "student1" And I follow "Dashboard" in the user menu - And I press "Customise this page" + And I turn editing mode on And I add the "Comments" block - And I press "Stop customising this page" + And I turn editing mode off And I should see "Comments" And I log out And I log in as "student2" And I follow "Profile" in the user menu And I should not see "Logged in user" - And I press "Customise this page" + And I turn editing mode on And I add the "Logged in user" block - And I press "Stop customising this page" + And I turn editing mode off And I should see "Logged in user" And I log out @@ -43,12 +43,12 @@ Feature: Reset all personalised pages to default Scenario: Reset Dashboard for all users Given I log in as "admin" And I navigate to "Appearance > Default Dashboard page" in site administration - And I press "Blocks editing on" + And I turn editing mode on And I add the "Latest announcements" block And I open the "Latest badges" blocks action menu And I follow "Delete Latest badges block" And I press "Yes" - And I press "Blocks editing off" + And I turn editing mode off And I log out And I log in as "student1" @@ -91,7 +91,7 @@ Feature: Reset all personalised pages to default Scenario: Reset profile for all users Given I log in as "admin" And I navigate to "Appearance > Default profile page" in site administration - And I press "Blocks editing on" + And I turn editing mode on And I add the "Latest announcements" block And I log out diff --git a/my/tests/behat/reset_page.feature b/my/tests/behat/reset_page.feature index c7fd951b05268..0fe871b91ea40 100644 --- a/my/tests/behat/reset_page.feature +++ b/my/tests/behat/reset_page.feature @@ -19,7 +19,7 @@ Feature: Reset dashboard page to default And I log in as "student1" Scenario: Add blocks to page and reset - When I press "Customise this page" + When I turn editing mode on And I add the "Latest announcements" block And I add the "Comments" block And I press "Reset page to default" diff --git a/my/tests/behat/restrict_available_blocks.feature b/my/tests/behat/restrict_available_blocks.feature index 14d06b739b373..bc699f2fc3850 100644 --- a/my/tests/behat/restrict_available_blocks.feature +++ b/my/tests/behat/restrict_available_blocks.feature @@ -18,7 +18,7 @@ Feature: Restrict which blocks can be added to Dashboard Scenario: The comments block can be added to Dashboard by default And I log in as "student1" - And I press "Customise this page" + And I turn editing mode on Then the add block selector should contain "Comments" block And the add block selector should contain "Courses" block And the add block selector should contain "Text" block @@ -32,7 +32,7 @@ Feature: Restrict which blocks can be added to Dashboard | block/html:myaddinstance | Prohibit | And I log out And I log in as "student1" - And I press "Customise this page" + And I turn editing mode on Then the add block selector should not contain "Comments" block And the add block selector should not contain "Courses" block And the add block selector should not contain "Text" block diff --git a/repository/upload/tests/behat/upload_file.feature b/repository/upload/tests/behat/upload_file.feature index 6a4ff57b64e53..c03fe802396c5 100644 --- a/repository/upload/tests/behat/upload_file.feature +++ b/repository/upload/tests/behat/upload_file.feature @@ -10,7 +10,7 @@ Feature: Upload files | fullname | shortname | category | | Course 1 | C1 | 0 | And I log in as "admin" - And I press "Customise this page" + And I turn editing mode on And I add the "Private files" block if not present When I follow "Manage private files..." And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager diff --git a/tag/tests/behat/collections.feature b/tag/tests/behat/collections.feature index a1deb030b3e40..c652b70857e59 100644 --- a/tag/tests/behat/collections.feature +++ b/tag/tests/behat/collections.feature @@ -103,7 +103,7 @@ Feature: Managers can create and manage tag collections | Searchable | 0 | And I press "Create" And "Yes" "text" should not exist in the "//table[contains(@class,'tag-collections-table')]//tr[contains(.,'Hiddencoll')]" "xpath_element" - And I press "Blocks editing on" + And I turn editing mode on # TODO MDL-57120 "Tags" link not accessible without navigation block. And I add the "Navigation" block if not present And I click on "Site pages" "list_item" in the "Navigation" "block" diff --git a/tag/tests/behat/edit_tag.feature b/tag/tests/behat/edit_tag.feature index 21fd143a93e69..888771129a4c4 100644 --- a/tag/tests/behat/edit_tag.feature +++ b/tag/tests/behat/edit_tag.feature @@ -31,7 +31,7 @@ Feature: Users can edit tags to add description or rename | moodle/user:viewdetails | Allow | And I log out When I log in as "editor1" - And I press "Customise this page" + And I turn editing mode on # TODO MDL-57120 site "Tags" link not accessible without navigation block. And I add the "Navigation" block if not present And I click on "Site pages" "list_item" in the "Navigation" "block" @@ -56,7 +56,7 @@ Feature: Users can edit tags to add description or rename @javascript Scenario: Manager can change tag description, related tags and rename the tag from tag view page When I log in as "manager1" - And I press "Customise this page" + And I turn editing mode on # TODO MDL-57120 site "Tags" link not accessible without navigation block. And I add the "Navigation" block if not present And I click on "Site pages" "list_item" in the "Navigation" "block" @@ -89,7 +89,7 @@ Feature: Users can edit tags to add description or rename Scenario: Renaming the tag from tag view page When I log in as "manager1" - And I press "Customise this page" + And I turn editing mode on # TODO MDL-57120 site "Tags" link not accessible without navigation block. And I add the "Navigation" block if not present And I click on "Tags" "link" in the "Navigation" "block" diff --git a/tag/tests/behat/flag_tags.feature b/tag/tests/behat/flag_tags.feature index b9fade17cf94d..57166f5cd4fe5 100644 --- a/tag/tests/behat/flag_tags.feature +++ b/tag/tests/behat/flag_tags.feature @@ -24,7 +24,7 @@ Feature: Users can flag tags and manager can reset flags | moodle/user:viewdetails | Allow | And I log out And I log in as "user2" - And I press "Customise this page" + And I turn editing mode on # TODO MDL-57120 site "Tags" link not accessible without navigation block. And I add the "Navigation" block if not present And I click on "Site pages" "list_item" in the "Navigation" "block" @@ -46,7 +46,7 @@ Feature: Users can flag tags and manager can reset flags And I should see "The person responsible will be notified" And I log out And I log in as "user3" - And I press "Customise this page" + And I turn editing mode on # TODO MDL-57120 site "Tags" link not accessible without navigation block. And I add the "Navigation" block if not present And I click on "Site pages" "list_item" in the "Navigation" "block" diff --git a/tag/tests/behat/tagindex.feature b/tag/tests/behat/tagindex.feature index 04f45bad95216..7b7ad3afefda8 100644 --- a/tag/tests/behat/tagindex.feature +++ b/tag/tests/behat/tagindex.feature @@ -22,7 +22,7 @@ Feature: Browsing tagged items Scenario: Browse tag index with javascript disabled When I log in as "user1" - And I press "Customise this page" + And I turn editing mode on # TODO MDL-57120 "Tags" link not accessible without navigation block. And I add the "Navigation" block if not present And I click on "Tags" "link" in the "Navigation" "block" @@ -69,7 +69,7 @@ Feature: Browsing tagged items @javascript Scenario: Browse tag index with javascript enabled When I log in as "user1" - And I press "Customise this page" + And I turn editing mode on # TODO MDL-57120 "Tags" link not accessible without navigation block. And I add the "Navigation" block if not present And I click on "Site pages" "list_item" in the "Navigation" "block" diff --git a/user/tests/behat/add_blocks.feature b/user/tests/behat/add_blocks.feature index a7c5439b59ded..18145a843d787 100644 --- a/user/tests/behat/add_blocks.feature +++ b/user/tests/behat/add_blocks.feature @@ -20,6 +20,6 @@ Feature: Add blocks to my profile page And I follow "View profile" Scenario: Add blocks to page - When I press "Customise this page" + When I turn editing mode on And I add the "Latest announcements" block Then I should see "Latest announcements" diff --git a/user/tests/behat/custom_profile_fields.feature b/user/tests/behat/custom_profile_fields.feature index 17c3e35cc5ad5..de738a2d54025 100644 --- a/user/tests/behat/custom_profile_fields.feature +++ b/user/tests/behat/custom_profile_fields.feature @@ -260,7 +260,7 @@ Feature: Custom profile fields should be visible and editable by those with the | moodle/user:editprofile | Allow | parent | User | userwithinformation | Given I log in as "admin" And I am on site homepage - And I navigate to "Turn editing on" in current page administration + And I turn editing mode on And I add the "Mentees" block And I log out And I log in as "parent" diff --git a/user/tests/behat/reset_page.feature b/user/tests/behat/reset_page.feature index c58d1a809ee7f..d83105ae57fdf 100644 --- a/user/tests/behat/reset_page.feature +++ b/user/tests/behat/reset_page.feature @@ -20,7 +20,7 @@ Feature: Reset my profile page to default And I follow "View profile" Scenario: Add blocks to page and reset - When I press "Customise this page" + When I turn editing mode on And I add the "Latest announcements" block And I press "Reset page to default" Then I should not see "Latest announcements" diff --git a/user/tests/behat/view_preferences_page.feature b/user/tests/behat/view_preferences_page.feature index 8075576adf8c8..74e9e10e08d23 100644 --- a/user/tests/behat/view_preferences_page.feature +++ b/user/tests/behat/view_preferences_page.feature @@ -54,7 +54,7 @@ Feature: Access to preferences page Scenario: A user with the appropriate permissions can view another user's permissions page. Given I log in as "admin" And I am on site homepage - And I follow "Turn editing on" + And I turn editing mode on And I add the "Mentees" block And I navigate to "Users > Permissions > Define roles" in site administration And I click on "Add a new role" "button"