diff --git a/admin/tool/admin_presets/tests/behat/delete.feature b/admin/tool/admin_presets/tests/behat/delete.feature
index aa358509d21..c6d6b821d81 100644
--- a/admin/tool/admin_presets/tests/behat/delete.feature
+++ b/admin/tool/admin_presets/tests/behat/delete.feature
@@ -23,7 +23,7 @@ Feature: Admin preset deletion
Given I should see "Custom preset"
And I open the action menu in "Custom preset" "table_row"
When I choose "Delete" in the open action menu
- And I should see "Are you sure you want to delete \"Custom preset\" site admin preset?"
+ And I should see "Are you sure you want to delete the site admin preset Custom preset?"
And I should not see "This preset has been previously applied"
And I click on "Cancel" "button"
And I should see "Presets allow you to easily switch between different site admin configurations."
@@ -42,7 +42,7 @@ Feature: Admin preset deletion
And I navigate to "Site admin presets" in site administration
When I open the action menu in "Custom preset" "table_row"
And I choose "Delete" in the open action menu
- And I should see "Are you sure you want to delete \"Custom preset\" site admin preset?"
+ And I should see "Are you sure you want to delete the site admin preset Custom preset?"
Then I should see "This preset has been previously applied"
And I click on "Delete" "button"
And I should see "Presets allow you to easily switch between different site admin configurations"
diff --git a/admin/tool/usertours/tests/behat/create_tour.feature b/admin/tool/usertours/tests/behat/create_tour.feature
index 9a96340e426..cc15fb90436 100644
--- a/admin/tool/usertours/tests/behat/create_tour.feature
+++ b/admin/tool/usertours/tests/behat/create_tour.feature
@@ -17,14 +17,14 @@ Feature: Add a new user tour
| Tour is enabled | 1 |
And I add steps to the "First tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Enter manually |
+ | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Manual |
And I add steps to the "First tour" tour:
| targettype | targetvalue_block | Title | id_content | Content type |
- | Block | Timeline | Timeline | This is the Timeline. All of your upcoming activities can be found here | Enter manually |
- | Block | Calendar | Calendar | This is the Calendar. All of your assignments and due dates can be found here | Enter manually |
+ | Block | Timeline | Timeline | This is the Timeline. All of your upcoming activities can be found here | Manual |
+ | Block | Calendar | Calendar | This is the Calendar. All of your assignments and due dates can be found here | Manual |
And I add steps to the "First tour" tour:
| targettype | targetvalue_selector | Title | id_content | Content type |
- | Selector | .usermenu | User menu | This is your personal user menu. You'll find your personal preferences and your user profile here. | Enter manually |
+ | Selector | .usermenu | User menu | This is your personal user menu. You'll find your personal preferences and your user profile here. | Manual |
When I am on homepage
Then I should see "Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful"
And I click on "Next" "button" in the "[data-role='flexitour-step']" "css_element"
@@ -54,7 +54,7 @@ Feature: Add a new user tour
| Tour is enabled | 0 |
And I add steps to the "First tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Enter manually |
+ | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Manual |
When I am on homepage
Then I should not see "Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful"
@@ -71,7 +71,7 @@ Feature: Add a new user tour
| Tour is enabled | 0 |
And I add steps to the "First tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Enter manually |
+ | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Manual |
And I open the User tour settings page
When I click on "Enable" "link" in the "My first tour" "table_row"
And I am on homepage
@@ -92,11 +92,11 @@ Feature: Add a new user tour
| End tour button's label | Sample end label |
And I add steps to the "Steps tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | First step of the Tour | Enter manually |
+ | Display in middle of page | Welcome | First step of the Tour | Manual |
And I add steps to the "Steps tour" tour:
| targettype | targetvalue_block | Title | id_content | Content type |
- | Block | Timeline | Timeline | Second step of the Tour | Enter manually |
- | Block | Calendar | Calendar | Third step of the Tour | Enter manually |
+ | Block | Timeline | Timeline | Second step of the Tour | Manual |
+ | Block | Calendar | Calendar | Third step of the Tour | Manual |
When I am on homepage
Then I should see "First step of the Tour"
And I should see "Next (1/3)"
@@ -126,11 +126,11 @@ Feature: Add a new user tour
| Display step numbers | 0 |
And I add steps to the "Steps tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | First step of the Tour | Enter manually |
+ | Display in middle of page | Welcome | First step of the Tour | Manual |
And I add steps to the "Steps tour" tour:
| targettype | targetvalue_block | Title | id_content | Content type |
- | Block | Timeline | Timeline | Second step of the Tour | Enter manually |
- | Block | Calendar | Calendar | Third step of the Tour | Enter manually |
+ | Block | Timeline | Timeline | Second step of the Tour | Manual |
+ | Block | Calendar | Calendar | Third step of the Tour | Manual |
When I am on homepage
Then I should see "First step of the Tour"
And I should see "Next"
@@ -154,7 +154,7 @@ Feature: Add a new user tour
| Display step numbers | 1 |
And I add steps to the "Steps tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | This is a single step tour | Enter manually |
+ | Display in middle of page | Welcome | This is a single step tour | Manual |
When I am on homepage
Then I should see "This is a single step tour"
And I should not see "Next (1/1)"
diff --git a/admin/tool/usertours/tests/behat/duplicate_tour.feature b/admin/tool/usertours/tests/behat/duplicate_tour.feature
index 4b7e23eb3f4..44b84227b32 100644
--- a/admin/tool/usertours/tests/behat/duplicate_tour.feature
+++ b/admin/tool/usertours/tests/behat/duplicate_tour.feature
@@ -16,7 +16,7 @@ Feature: Duplicate a user tour
| Tour is enabled | 0 |
And I add steps to the "First tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Enter manually |
+ | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Manual |
And I open the User tour settings page
And I should see "1" occurrences of "First tour" in the "admintable" "table"
And I click on "Duplicate" "link" in the "My first tour" "table_row"
diff --git a/admin/tool/usertours/tests/behat/reset_tour.feature b/admin/tool/usertours/tests/behat/reset_tour.feature
index 9d5612d54b2..f6799be3c42 100644
--- a/admin/tool/usertours/tests/behat/reset_tour.feature
+++ b/admin/tool/usertours/tests/behat/reset_tour.feature
@@ -14,7 +14,7 @@ Feature: Reset a tour
| Show with backdrop | 1 |
And I add steps to the "First tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | Welcome tour. | Enter manually |
+ | Display in middle of page | Welcome | Welcome tour. | Manual |
@javascript
Scenario: Reset the tour with mobile view
diff --git a/admin/tool/usertours/tests/behat/tour_accessibility.feature b/admin/tool/usertours/tests/behat/tour_accessibility.feature
index 94c5fbc5b62..e69c90fb82d 100644
--- a/admin/tool/usertours/tests/behat/tour_accessibility.feature
+++ b/admin/tool/usertours/tests/behat/tour_accessibility.feature
@@ -10,14 +10,14 @@ Feature: Apply accessibility to a tour
| Show with backdrop | 1 |
And I add steps to the "First tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | Welcome tour. | Enter manually |
+ | Display in middle of page | Welcome | Welcome tour. | Manual |
And I add steps to the tour:
| targettype | targetvalue_selector | Title | id_content | Content type |
- | Selector | .usermenu | User menu | Next page | Enter manually |
- | Selector | .navbar-brand | Page 2 | Next page | Enter manually |
+ | Selector | .usermenu | User menu | Next page | Manual |
+ | Selector | .navbar-brand | Page 2 | Next page | Manual |
And I add steps to the tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Page 3 | Final page. | Enter manually |
+ | Display in middle of page | Page 3 | Final page. | Manual |
@javascript
Scenario: Check tabbing working correctly.
diff --git a/admin/tool/usertours/tests/behat/tour_content_type.feature b/admin/tool/usertours/tests/behat/tour_content_type.feature
index 46a3c381a79..a2e15329abb 100644
--- a/admin/tool/usertours/tests/behat/tour_content_type.feature
+++ b/admin/tool/usertours/tests/behat/tour_content_type.feature
@@ -23,14 +23,14 @@ Feature: Apply content type to a tour
And I click on "View" "link" in the "My first tour" "table_row"
When I click on "New step" "link"
Then "Content type" "select" should exist
- And the "Content type" select box should contain "Read from language pack"
- And the "Content type" select box should contain "Enter manually"
- And I select "Read from language pack" from the "Content type" singleselect
- And I should see " Moodle language identifier"
+ And the "Content type" select box should contain "Language string ID"
+ And the "Content type" select box should contain "Manual"
+ And I select "Language string ID" from the "Content type" singleselect
+ And I should see " Language string ID"
And "#fgroup_id_contenthtmlgrp" "css_element" should not be visible
- And I select "Enter manually" from the "Content type" singleselect
+ And I select "Manual" from the "Content type" singleselect
And "#fgroup_id_contenthtmlgrp" "css_element" should be visible
- And I should not see "Moodle language identifier"
+ And I should not see "Language string ID" in the "#fitem_id_contentlangstring" "css_element"
@javascript
Scenario: Create a new step with Moodle Language content type
@@ -38,18 +38,18 @@ Feature: Apply content type to a tour
And I click on "View" "link" in the "My first tour" "table_row"
And I click on "New step" "link"
And I set the field "Title" to "tour_activityinfo_course_teacher_title,tool_usertours"
- And I select "Read from language pack" from the "Content type" singleselect
- And I set the field "Moodle language identifier" to "tour_activityinfo_course_teacher_content_abc,tool_usertours"
+ And I select "Language string ID" from the "Content type" singleselect
+ And I set the field "Language string ID" to "tour_activityinfo_course_teacher_content_abc,tool_usertours"
When I press "Save changes"
- Then I should see "Invalid language identifier"
- And I set the field "Moodle language identifier" to "tour_activityinfo_course_teacher_content,tool_usertours"
+ Then I should see "Invalid language string ID"
+ And I set the field "Language string ID" to "tour_activityinfo_course_teacher_content,tool_usertours"
And I press "Save changes"
And I should see "New: Activity information"
And I should see "New course settings 'Show completion conditions' and 'Show activity dates' enable you to choose whether activity completion conditions (if set) and/or dates are displayed for students on the course page."
And I click on "Edit" "link" in the "New: Activity information" "table_row"
And I should see "Editing \"New: Activity information\""
And the field "Title" matches value "tour_activityinfo_course_teacher_title,tool_usertours"
- And the field "Moodle language identifier" matches value "tour_activityinfo_course_teacher_content,tool_usertours"
+ And the field "Language string ID" matches value "tour_activityinfo_course_teacher_content,tool_usertours"
@javascript
Scenario: Create a new step with manual content type
@@ -57,14 +57,14 @@ Feature: Apply content type to a tour
And I click on "View" "link" in the "My first tour" "table_row"
And I click on "New step" "link"
And I set the field "Title" to "tour_activityinfo_course_teacher_title,tool_usertours"
- And I select "Enter manually" from the "Content type" singleselect
+ And I select "Manual" from the "Content type" singleselect
And I set the field "id_content" to "Test content"
And I press "Save changes"
And I should see "New: Activity information"
And I should see "Test content"
And I click on "Edit" "link" in the "New: Activity information" "table_row"
And I should see "Editing \"New: Activity information\""
- And I should not see "Moodle language identifier"
+ And I should not see "Language string ID" in the "#fitem_id_contentlangstring" "css_element"
And the field "Title" matches value "tour_activityinfo_course_teacher_title,tool_usertours"
And the field "id_content" matches value "Test content"
diff --git a/admin/tool/usertours/tests/behat/tour_filter.feature b/admin/tool/usertours/tests/behat/tour_filter.feature
index 6f75015287e..cad3d64736f 100644
--- a/admin/tool/usertours/tests/behat/tour_filter.feature
+++ b/admin/tool/usertours/tests/behat/tour_filter.feature
@@ -28,7 +28,7 @@ Feature: Apply tour filters to a tour
| Role | Student,Non-editing teacher |
And I add steps to the "First tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | Welcome to your course tour. | Enter manually |
+ | Display in middle of page | Welcome | Welcome to your course tour. | Manual |
And I log out
And I log in as "editor1"
When I am on "Course 1" course homepage
@@ -69,7 +69,7 @@ Feature: Apply tour filters to a tour
| Category | MainCat |
And I add steps to the "First tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | Welcome to your course tour. | Enter manually |
+ | Display in middle of page | Welcome | Welcome to your course tour. | Manual |
And I log out
And I log in as "student1"
When I am on "Course 1" course homepage
@@ -101,7 +101,7 @@ Feature: Apply tour filters to a tour
| Course format | Weekly format |
And I add steps to the "First tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | Welcome to your course tour. | Enter manually |
+ | Display in middle of page | Welcome | Welcome to your course tour. | Manual |
And I log out
And I log in as "student1"
When I am on "Course 1" course homepage
@@ -133,7 +133,7 @@ Feature: Apply tour filters to a tour
| Courses | C1 |
And I add steps to the "First tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | Welcome to your course tour. | Enter manually |
+ | Display in middle of page | Welcome | Welcome to your course tour. | Manual |
And I log out
And I log in as "student1"
When I am on "Course 1" course homepage
@@ -172,7 +172,7 @@ Feature: Apply tour filters to a tour
| CSS selector | .modtype_wiki |
And I add steps to the "Wiki tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | Welcome to the Wiki tour | Enter manually |
+ | Display in middle of page | Welcome | Welcome to the Wiki tour | Manual |
And I add a new user tour with:
| Name | Forum tour |
| Description | A tour with both matches |
@@ -181,7 +181,7 @@ Feature: Apply tour filters to a tour
| CSS selector | .modtype_forum |
And I add steps to the "Forum tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | Welcome to the Forum tour | Enter manually |
+ | Display in middle of page | Welcome | Welcome to the Forum tour | Manual |
And I am on "Course 1" course homepage
Then I should see "Welcome to the Wiki tour"
And I am on "Course 2" course homepage
@@ -201,7 +201,7 @@ Feature: Apply tour filters to a tour
| CSS selector | #page-my-index |
And I add steps to the "First tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | Welcome to the First tour | Enter manually |
+ | Display in middle of page | Welcome | Welcome to the First tour | Manual |
And I add a new user tour with:
| Name | Second tour |
| Description | The second tour |
@@ -210,7 +210,7 @@ Feature: Apply tour filters to a tour
| CSS selector | #page-my-index |
And I add steps to the "Second tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | Welcome to the Second tour | Enter manually |
+ | Display in middle of page | Welcome | Welcome to the Second tour | Manual |
And I add a new user tour with:
| Name | Third tour |
| Description | The third tour |
@@ -219,7 +219,7 @@ Feature: Apply tour filters to a tour
| CSS selector | #page-my-index |
And I add steps to the "Third tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | Welcome to the Third tour | Enter manually |
+ | Display in middle of page | Welcome | Welcome to the Third tour | Manual |
And I am on homepage
Then I should see "Welcome to the First tour"
And I open the User tour settings page
diff --git a/admin/tool/usertours/tests/behat/tour_navigation.feature b/admin/tool/usertours/tests/behat/tour_navigation.feature
index 200651775e0..8be2070cd94 100644
--- a/admin/tool/usertours/tests/behat/tour_navigation.feature
+++ b/admin/tool/usertours/tests/behat/tour_navigation.feature
@@ -14,7 +14,7 @@ Feature: Steps can be navigated within a tour
| Tour is enabled | 1 |
And I add steps to the "Calendar tour" tour:
| targettype | Block | Title | id_content | Content type |
- | Block | Calendar | Calendar events | This is the calendar block | Enter manually |
+ | Block | Calendar | Calendar events | This is the calendar block | Manual |
And I change window size to "large"
And I follow "Dashboard"
And I wait until the page is ready
@@ -33,7 +33,7 @@ Feature: Steps can be navigated within a tour
| Tour is enabled | 1 |
And I add steps to the "Calendar tour" tour:
| targettype | Block | Title | id_content | Content type |
- | Block | Calendar | Calendar events | This is the calendar block | Enter manually |
+ | Block | Calendar | Calendar events | This is the calendar block | Manual |
And I change window size to "large"
And I follow "Dashboard"
And I wait until the page is ready
@@ -50,11 +50,11 @@ Feature: Steps can be navigated within a tour
| Tour is enabled | 1 |
And I add steps to the "First tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Enter manually |
+ | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Manual |
And I add steps to the "First tour" tour:
| targettype | targetvalue_block | Title | id_content | Content type |
- | Block | Timeline | Timeline | This is the Timeline. All of your upcoming activities can be found here | Enter manually |
- | Block | Calendar | Calendar | This is the Calendar. All of your assignments and due dates can be found here | Enter manually |
+ | Block | Timeline | Timeline | This is the Timeline. All of your upcoming activities can be found here | Manual |
+ | Block | Calendar | Calendar | This is the Calendar. All of your assignments and due dates can be found here | Manual |
When I am on homepage
Then I should see "Skip tour"
And I should see "Next (1/3)"
@@ -74,7 +74,7 @@ Feature: Steps can be navigated within a tour
| End tour button's label | CustomText |
And I add steps to the "Calendar tour" tour:
| targettype | Block | Title | id_content | Content type |
- | Block | Calendar | Calendar events | This is the calendar block | Enter manually |
+ | Block | Calendar | Calendar events | This is the calendar block | Manual |
And I change window size to "large"
And I follow "Dashboard"
And I wait until the page is ready
@@ -92,7 +92,7 @@ Feature: Steps can be navigated within a tour
| End tour button's label | exporttour,tool_usertours |
And I add steps to the "Calendar tour" tour:
| targettype | Block | Title | id_content | Content type |
- | Block | Calendar | Calendar events | This is the calendar block | Enter manually |
+ | Block | Calendar | Calendar events | This is the calendar block | Manual |
And I change window size to "large"
And I follow "Dashboard"
And I wait until the page is ready
diff --git a/admin/tool/xmldb/tests/behat/reconcile_xmldb_files.feature b/admin/tool/xmldb/tests/behat/reconcile_xmldb_files.feature
index 9d45a54b667..6ebe74e4d23 100644
--- a/admin/tool/xmldb/tests/behat/reconcile_xmldb_files.feature
+++ b/admin/tool/xmldb/tests/behat/reconcile_xmldb_files.feature
@@ -8,5 +8,5 @@ Feature: The Reconcile XMLDB files report works and all the files are ok
Given I log in as "admin"
And I navigate to "Development > XMLDB editor" in site administration
When I follow "[Reconcile XMLDB files]"
- Then I should see "Look for XMLDB files needing reconcile"
- And I should see "All files are ok, no reconcile action needed"
+ Then I should see "Look for XMLDB files needing reconciling"
+ And I should see "All files are OK. No reconciling is needed."
diff --git a/badges/tests/behat/add_badge.feature b/badges/tests/behat/add_badge.feature
index c4c3240918a..276ca6546e6 100644
--- a/badges/tests/behat/add_badge.feature
+++ b/badges/tests/behat/add_badge.feature
@@ -17,7 +17,7 @@ Feature: Add badges to the system
And I add the "Navigation" block if not present
And I click on "Site pages" "list_item" in the "Navigation" "block"
Given I click on "Site badges" "link" in the "Navigation" "block"
- Then I should see "There are no badges available."
+ Then I should see "There are currently no badges available for users to earn."
@javascript @_file_upload
Scenario: Add a badge
@@ -47,7 +47,7 @@ Feature: Add badges to the system
And I should see "Test Badge Site"
And I should see "testuser@example.com"
And I navigate to "Badges > Manage badges" in site administration
- And I should not see "There are no badges available."
+ And I should not see "There are currently no badges available for users to earn."
@javascript @_file_upload
Scenario: Add a badge related
@@ -159,7 +159,7 @@ Feature: Add badges to the system
And I should see "Alignments (0)"
And I should not see "Create badge"
And I navigate to "Badges > Manage badges" in site administration
- And I should not see "There are no badges available."
+ And I should not see "There are currently no badges available for users to earn."
# See buttons from the "Site badges" page.
And I am on homepage
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 8ca0a4bb0dd..96e51b0184d 100644
--- a/badges/tests/behat/award_badge.feature
+++ b/badges/tests/behat/award_badge.feature
@@ -104,7 +104,7 @@ Feature: Award badges
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 "Site badges" "link" in the "Navigation" "block"
- Then I should see "There are no badges available."
+ Then I should see "There are currently no badges available for users to earn."
And I should not see "Manage badges"
And I should not see "Add a new badge"
@@ -138,7 +138,7 @@ Feature: Award badges
And I press "Update profile"
And I follow "Profile" in the user menu
Then I should see "Profile Badge"
- And I should not see "There are no badges available."
+ And I should not see "There are currently no badges available for users to earn."
@javascript
Scenario: Award site badge
diff --git a/badges/tests/behat/nobadge_navigation.feature b/badges/tests/behat/nobadge_navigation.feature
index 9b3a76354ae..a295649cb6c 100644
--- a/badges/tests/behat/nobadge_navigation.feature
+++ b/badges/tests/behat/nobadge_navigation.feature
@@ -4,7 +4,7 @@ Feature: Manage badges is not shown when there are no existing badges.
Scenario: Check navigation at site level with no badges
Given I log in as "admin"
When I navigate to "Badges > Manage badges" in site administration
- And I should see "There are no badges available"
+ And I should see "There are currently no badges available for users to earn"
Then "Manage badges" "button" should not exist
Scenario: Check navigation at course level with no badges
@@ -99,4 +99,4 @@ Feature: Manage badges is not shown when there are no existing badges.
And I follow "Badges"
And "Manage badges" "button" should not exist
And "Add a new badge" "button" should not exist
- And I should not see "There are no badges available."
+ And I should not see "There are currently no badges available for users to earn."
diff --git a/mod/bigbluebuttonbn/tests/behat/add_instance.feature b/mod/bigbluebuttonbn/tests/behat/add_instance.feature
index a0dd51dfd5e..9aaf7767339 100644
--- a/mod/bigbluebuttonbn/tests/behat/add_instance.feature
+++ b/mod/bigbluebuttonbn/tests/behat/add_instance.feature
@@ -10,30 +10,30 @@ Feature: bigbluebuttonbn instance
| fullname | shortname | category |
| Test course | Test course | 0 |
- Scenario: Add a mod_bigbluebuttonbn instance with Room/Activity with recordings
+ Scenario: Add a mod_bigbluebuttonbn instance with Room with recordings
Given I am on the "Test course" "course" page logged in as "admin"
And I am on "Test course" course homepage with editing mode on
When I add a "BigBlueButton" to section "1" and I fill the form with:
| name | BBB Instance name |
- | Instance type | Room/Activity with recordings |
- | Virtual classroom name | BBB Instance name |
+ | Instance type | Room with recordings |
+ | Room name | BBB Instance name |
And I am on the "Test course" course page
Then I should see "BBB Instance name"
And I am on the "BBB Instance name" "bigbluebuttonbn activity" page
- And I should see "This conference room is ready. You can join the session now."
+ And I should see "This room is ready. You can join the session now."
And I should see "Join session"
And I should see "Recordings"
- Scenario: Add a mod_bigbluebuttonbn instance with Room/Activity only
+ Scenario: Add a mod_bigbluebuttonbn instance with Room only
Given I am on the "Test course" "course" page logged in as "admin"
And I am on "Test course" course homepage with editing mode on
When I add a "BigBlueButton" to section "1" and I fill the form with:
- | Instance type | Room/Activity only |
- | Virtual classroom name | BBB Instance name |
+ | Instance type | Room only |
+ | Room name | BBB Instance name |
And I am on the "Test course" course page
Then I should see "BBB Instance name"
And I am on the "BBB Instance name" "bigbluebuttonbn activity" page
- And I should see "This conference room is ready. You can join the session now."
+ And I should see "This room is ready. You can join the session now."
And I should see "Join session"
And I should not see "Recordings"
@@ -42,11 +42,11 @@ Feature: bigbluebuttonbn instance
And I am on "Test course" course homepage with editing mode on
When I add a "BigBlueButton" to section "1" and I fill the form with:
| Instance type | Recordings only |
- | Virtual classroom name | BBB Instance name |
+ | Room name | BBB Instance name |
And I am on the "Test course" course page
Then I should see "BBB Instance name"
And I am on the "BBB Instance name" "bigbluebuttonbn activity" page
- And I should not see "This conference room is ready. You can join the session now."
+ And I should not see "This room is ready. You can join the session now."
And I should not see "Join session"
And I should see "Recordings"
@@ -59,6 +59,6 @@ Feature: bigbluebuttonbn instance
Examples:
| type |
- | Room/Activity with recordings |
- | Room/Activity only |
+ | Room with recordings |
+ | Room only |
| Recordings only |
diff --git a/mod/bigbluebuttonbn/tests/behat/edit_instance.feature b/mod/bigbluebuttonbn/tests/behat/edit_instance.feature
index f2a577fcd2f..8777403a8bf 100644
--- a/mod/bigbluebuttonbn/tests/behat/edit_instance.feature
+++ b/mod/bigbluebuttonbn/tests/behat/edit_instance.feature
@@ -10,21 +10,21 @@ When a bibluebutton instance has been created I can edit it
| fullname | shortname | category |
| Test course | Test course | 0 |
- Scenario Outline: Add a mod_bigbluebuttonbn instance with Room/Activity with recordings
+ Scenario Outline: Add a mod_bigbluebuttonbn instance with Room with recordings
Then I log in as "admin"
And I am on "Test course" course homepage with editing mode on
When I add a "BigBlueButton" to section "1" and I fill the form with:
| name | |
| Instance type | |
- | Virtual classroom name | |
+ | Room name | |
Given I am on the "" "bigbluebuttonbn activity" page logged in as admin
And I click on "Settings" "link"
And the field "Instance type" matches value ""
And I "Role assigned during live session"
And I expand all fieldsets
- And I "Session can be recorded"
+ And I "The session may be recorded."
Examples:
| activityname | instancetype | shouldseerole | shouldseesession |
- | Activity with recording | Room/Activity with recordings | should see | should see |
- | Activity only | Room/Activity only | should see | should see |
+ | Activity with recording | Room with recordings | should see | should see |
+ | Activity only | Room only | should see | should see |
| Recordings only | Recordings only | should not see | should not see |
diff --git a/mod/bigbluebuttonbn/tests/behat/join_meeting.feature b/mod/bigbluebuttonbn/tests/behat/join_meeting.feature
index 96b5357cfc3..02aac8301e2 100644
--- a/mod/bigbluebuttonbn/tests/behat/join_meeting.feature
+++ b/mod/bigbluebuttonbn/tests/behat/join_meeting.feature
@@ -35,4 +35,4 @@ Feature: Test the ability to run the full meeting lifecycle (start to end)
And I switch to the main window
And I reload the page
Then I should see "Room recordings"
- And I should see "This conference room is ready. You can join the session now."
+ And I should see "This room is ready. You can join the session now."
diff --git a/mod/bigbluebuttonbn/tests/behat/recordings.feature b/mod/bigbluebuttonbn/tests/behat/recordings.feature
index b930270aadd..ec6ccde5fa4 100644
--- a/mod/bigbluebuttonbn/tests/behat/recordings.feature
+++ b/mod/bigbluebuttonbn/tests/behat/recordings.feature
@@ -53,7 +53,7 @@ Feature: The recording can be managed through the room page
Scenario: I can rename the recording
Given the BigBlueButtonBN server has sent recording ready notifications
And I am on the "RoomRecordings" "bigbluebuttonbn activity" page logged in as admin
- When I set the field "Edit Name" in the "Recording 1" "table_row" to "Recording with an updated name 1"
+ When I set the field "Edit name" in the "Recording 1" "table_row" to "Recording with an updated name 1"
Then I should see "Recording with an updated name 1"
And I should see "Recording 2"
And I reload the page
@@ -64,7 +64,7 @@ Feature: The recording can be managed through the room page
Scenario: I can set a new description for this recording
Given the BigBlueButtonBN server has sent recording ready notifications
And I am on the "RoomRecordings" "bigbluebuttonbn activity" page logged in as admin
- When I set the field "Edit Description" in the "Recording 1" "table_row" to "This is a new recording description 1"
+ When I set the field "Edit description" in the "Recording 1" "table_row" to "This is a new recording description 1"
Then I should see "This is a new recording description 1"
And I should see "Description 2" in the "Recording 2" "table_row"
And I reload the page
diff --git a/mod/bigbluebuttonbn/tests/external/get_join_url_test.php b/mod/bigbluebuttonbn/tests/external/get_join_url_test.php
index 93889a272f0..141c57c9950 100644
--- a/mod/bigbluebuttonbn/tests/external/get_join_url_test.php
+++ b/mod/bigbluebuttonbn/tests/external/get_join_url_test.php
@@ -64,7 +64,7 @@ class get_join_url_test extends \externallib_advanced_testcase {
* Test execute API CALL with no instance
*/
public function test_execute_no_instance() {
- $this->expectExceptionMessageMatches('/No such an instance.*/');
+ $this->expectExceptionMessageMatches('/No such instance.*/');
$joinurl = $this->get_join_url(1234, 5678);
$this->assertIsArray($joinurl);
diff --git a/mod/bigbluebuttonbn/tests/lib_test.php b/mod/bigbluebuttonbn/tests/lib_test.php
index 32c545ac744..53c1e4ca7f7 100644
--- a/mod/bigbluebuttonbn/tests/lib_test.php
+++ b/mod/bigbluebuttonbn/tests/lib_test.php
@@ -123,7 +123,7 @@ class lib_test extends \advanced_testcase {
logger::log_recording_played_event($instance, 1);
$result = bigbluebuttonbn_user_outline($this->get_course(), $user, $bbactivitycm, $bbactivity);
- $this->assertStringContainsString('Has joined the meeting or played a recording 2 time(s)', $result->info);
+ $this->assertStringContainsString(get_string('completionview_event_desc', 'mod_bigbluebuttonbn', 2), $result->info);
}
/**
@@ -149,7 +149,7 @@ class lib_test extends \advanced_testcase {
bigbluebuttonbn_user_complete($this->get_course(), $user, $bbactivitycm, $bbactivity);
$output = ob_get_contents();
ob_end_clean();
- $this->assertStringContainsString('Has joined the meeting or played a recording', $output);
+ $this->assertStringContainsString(get_string('completionview_event_desc', 'mod_bigbluebuttonbn', 2), $output);
}
/**
diff --git a/mod/bigbluebuttonbn/tests/meeting_test.php b/mod/bigbluebuttonbn/tests/meeting_test.php
index cc9cf30a4e0..81c3e1a1e1a 100644
--- a/mod/bigbluebuttonbn/tests/meeting_test.php
+++ b/mod/bigbluebuttonbn/tests/meeting_test.php
@@ -175,7 +175,7 @@ class meeting_test extends \advanced_testcase {
$this->assertEquals($canjoin['useringroup'], $meeting->can_join());
if ($meeting->can_join()) {
$meetinginfo = $meeting->get_meeting_info();
- $this->assertStringContainsString("This conference is in progress", $meetinginfo->statusmessage);
+ $this->assertStringContainsString("The session is in progress.", $meetinginfo->statusmessage);
}
if ($groupname) {
$this->setUser($usernotingroup);
diff --git a/theme/boost/tests/behat/primarynav.feature b/theme/boost/tests/behat/primarynav.feature
index ec0299271fa..ce2c9653e4e 100644
--- a/theme/boost/tests/behat/primarynav.feature
+++ b/theme/boost/tests/behat/primarynav.feature
@@ -28,11 +28,11 @@ Feature: Primary navigation
Scenario Outline: Admin sets defaulthomepage to user preference and verifies the landing page based on it
Given I log in as "admin"
And I navigate to "Appearance > Navigation" in site administration
- And I set the field "Home page for users" to "User preference"
+ And I set the field "Start page for users" to "User preference"
And I press "Save changes"
And I follow "Preferences" in the user menu
- And I follow "Home page"
- And I set the field "Home page" to ""
+ And I follow "Start page"
+ And I set the field "Start page" to ""
And I press "Save changes"
And the following config values are set as admin:
| defaulthomepage | 2 |
diff --git a/theme/boost/tests/behat/reset_tour.feature b/theme/boost/tests/behat/reset_tour.feature
index 4a1c0f2bc5c..dc080d79d86 100644
--- a/theme/boost/tests/behat/reset_tour.feature
+++ b/theme/boost/tests/behat/reset_tour.feature
@@ -14,7 +14,7 @@ Feature: Reset a tour for Boost
| Show with backdrop | 1 |
And I add steps to the "First tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | Welcome tour. | Enter manually |
+ | Display in middle of page | Welcome | Welcome tour. | Manual |
@javascript
Scenario: Reset the tour with desktop view
diff --git a/theme/boost/tests/behat/tour_filter.feature b/theme/boost/tests/behat/tour_filter.feature
index ad87463ec2f..dee42f4ccf6 100644
--- a/theme/boost/tests/behat/tour_filter.feature
+++ b/theme/boost/tests/behat/tour_filter.feature
@@ -15,7 +15,7 @@ Feature: Apply tour filters to a tour for Classic
| Theme | Classic |
And I add steps to the "First tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Enter manually |
+ | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Manual |
When I am on homepage
Then I should not see "Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful"
@@ -30,6 +30,6 @@ Feature: Apply tour filters to a tour for Classic
| Theme | Boost |
And I add steps to the "First tour" tour:
| targettype | Title | id_content | Content type |
- | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Enter manually |
+ | Display in middle of page | Welcome | Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful | Manual |
When I am on homepage
Then I should see "Welcome to your personal learning space. We'd like to give you a quick tour to show you some of the areas you may find helpful"
diff --git a/user/tests/behat/set_default_homepage.feature b/user/tests/behat/set_default_homepage.feature
index 1af719b2af7..eeb51b72c78 100644
--- a/user/tests/behat/set_default_homepage.feature
+++ b/user/tests/behat/set_default_homepage.feature
@@ -33,7 +33,7 @@ Feature: Set the site home page and dashboard as the default home page
| Page contexts | Display throughout the entire site |
And I press "Save changes"
And I navigate to "Appearance > Navigation" in site administration
- And I set the field "Home page for users" to "User preference"
+ And I set the field "Start page for users" to "User preference"
And I press "Save changes"
And I am on site homepage
And I follow "Make this my home page"
@@ -57,13 +57,13 @@ Feature: Set the site home page and dashboard as the default home page
Scenario Outline: User can configure their preferred default home page when allowed by admin
Given I log in as "admin"
And I navigate to "Appearance > Navigation" in site administration
- And I set the field "Home page for users" to "User preference"
+ And I set the field "Start page for users" to "User preference"
And I press "Save changes"
And I log out
When I log in as "user1"
And I follow "Preferences" in the user menu
- And I follow "Home page"
- And I set the field "Home page" to ""
+ And I follow "Start page"
+ And I set the field "Start page" to ""
And I press "Save changes"
And I log out
And I log in as "user1"