MDL-65397 lang: Use the new strings in Behat scenarios

diff --git a/admin/tool/analytics/tests/behat/restoredefault.feature b/admin/tool/analytics/tests/behat/restoredefault.feature
index 74ff239..f819e5f 100644 (file)
--- a/admin/tool/analytics/tests/behat/restoredefault.feature
+++ b/admin/tool/analytics/tests/behat/restoredefault.feature
@@ -65,7 +65,7 @@ Feature: Restoring default models
     And I should see "Analytics models"
     And I should see "No teaching"
     When I click on "Restore default models" "link"
-    Then I should see "All default models provided by the Moodle core and installed plugins have been already created. No new models were found, there is nothing to restore."
+    Then I should see "All default models provided by core and installed plugins have been created. No new models were found; there is nothing to restore."
     And I click on "Back" "link"
     And I should see "Analytics models"
 

diff --git a/course/tests/behat/customfields_locked.feature b/course/tests/behat/customfields_locked.feature
index a3c73b6..45d55dd 100644 (file)
--- a/course/tests/behat/customfields_locked.feature
+++ b/course/tests/behat/customfields_locked.feature
@@ -23,7 +23,7 @@ Feature: Fields locked control where they are displayed
     When I log in as "admin"
     And I navigate to "Courses > Course custom fields" in site administration
     And I click on "Add a new custom field" "link"
-    And I click on "Text field" "link"
+    And I click on "Short text" "link"
     And I set the following fields to these values:
       | Name       | Test field |
       | Short name | testfield  |

diff --git a/course/tests/behat/customfields_visibility.feature b/course/tests/behat/customfields_visibility.feature
index e8650a3..802f6fa 100644 (file)
--- a/course/tests/behat/customfields_visibility.feature
+++ b/course/tests/behat/customfields_visibility.feature
@@ -23,7 +23,7 @@ Feature: The visibility of fields control where they are displayed
     When I log in as "admin"
     And I navigate to "Courses > Course custom fields" in site administration
     And I click on "Add a new custom field" "link"
-    And I click on "Text field" "link"
+    And I click on "Short text" "link"
     And I set the following fields to these values:
       | Name       | Test field |
       | Short name | testfield  |
@@ -43,7 +43,7 @@ Feature: The visibility of fields control where they are displayed
     When I log in as "admin"
     And I navigate to "Courses > Course custom fields" in site administration
     And I click on "Add a new custom field" "link"
-    And I click on "Text field" "link"
+    And I click on "Short text" "link"
     And I set the following fields to these values:
       | Name       | Test field  |
       | Short name | testfield   |
@@ -63,7 +63,7 @@ Feature: The visibility of fields control where they are displayed
     When I log in as "admin"
     And I navigate to "Courses > Course custom fields" in site administration
     And I click on "Add a new custom field" "link"
-    And I click on "Text field" "link"
+    And I click on "Short text" "link"
     And I set the following fields to these values:
       | Name       | Test field     |
       | Short name | testfield      |

diff --git a/customfield/field/text/tests/behat/field.feature b/customfield/field/text/tests/behat/field.feature
index e1bed82..da4ad41 100644 (file)
--- a/customfield/field/text/tests/behat/field.feature
+++ b/customfield/field/text/tests/behat/field.feature
@@ -13,7 +13,7 @@ Feature: Managers can manage course custom fields text
 
   Scenario: Create a custom course text field
     When I click on "Add a new custom field" "link"
-    And I click on "Text field" "link"
+    And I click on "Short text" "link"
     And I set the following fields to these values:
       | Name       | Test field |
       | Short name | testfield  |
@@ -23,7 +23,7 @@ Feature: Managers can manage course custom fields text
 
   Scenario: Edit a custom course text field
     When I click on "Add a new custom field" "link"
-    And I click on "Text field" "link"
+    And I click on "Short text" "link"
     And I set the following fields to these values:
       | Name       | Test field |
       | Short name | testfield  |
@@ -40,7 +40,7 @@ Feature: Managers can manage course custom fields text
   @javascript
   Scenario: Delete a custom course text field
     When I click on "Add a new custom field" "link"
-    And I click on "Text field" "link"
+    And I click on "Short text" "link"
     And I set the following fields to these values:
       | Name       | Test field |
       | Short name | testfield  |
@@ -64,7 +64,7 @@ Feature: Managers can manage course custom fields text
       | teacher1 | C1     | editingteacher |
     And I navigate to "Courses > Course custom fields" in site administration
     And I click on "Add a new custom field" "link"
-    And I click on "Text field" "link"
+    And I click on "Short text" "link"
     And I set the following fields to these values:
       | Name       | See more on website       |
       | Short name | testfield                 |
@@ -94,11 +94,11 @@ Feature: Managers can manage course custom fields text
       | teacher1 | C1     | editingteacher |
     And I navigate to "Courses > Course custom fields" in site administration
     And I click on "Add a new custom field" "link"
-    And I click on "Text field" "link"
+    And I click on "Short text" "link"
     And I set the following fields to these values:
       | Name       | Test field |
       | Short name | testfield  |
-      | Maximum length | 3          |
+      | Maximum number of characters | 3          |
     And I press "Save changes"
     And I log out
     Then I log in as "teacher1"
@@ -107,7 +107,7 @@ Feature: Managers can manage course custom fields text
     And I set the following fields to these values:
       | Test field | 1234 |
     And I press "Save and display"
-    Then I should see "This field maximum length is 3"
+    Then I should see "The maximum number of characters allowed in this field is 3."
 
   Scenario: A text field with a default value must be shown on listing but allow empty values that will not be shown
     Given the following "users" exist:
@@ -121,7 +121,7 @@ Feature: Managers can manage course custom fields text
       | teacher1 | C1     | editingteacher |
     And I navigate to "Courses > Course custom fields" in site administration
     And I click on "Add a new custom field" "link"
-    And I click on "Text field" "link"
+    And I click on "Short text" "link"
     And I set the following fields to these values:
       | Name          | Test field  |
       | Short name    | testfield   |

diff --git a/customfield/tests/behat/edit_fields_settings.feature b/customfield/tests/behat/edit_fields_settings.feature
index 247f5ce..90bfacd 100644 (file)
--- a/customfield/tests/behat/edit_fields_settings.feature
+++ b/customfield/tests/behat/edit_fields_settings.feature
@@ -101,7 +101,7 @@ Feature: Teachers can edit course custom fields
     When I log in as "admin"
     And I navigate to "Courses > Course custom fields" in site administration
     And I click on "Add a new custom field" "link"
-    And I click on "Text field" "link"
+    And I click on "Short text" "link"
     And I set the following fields to these values:
       | Name       | Test field |
     And I press "Save changes"

diff --git a/customfield/tests/behat/required_field.feature b/customfield/tests/behat/required_field.feature
index d0aea96..56c0f23 100644 (file)
--- a/customfield/tests/behat/required_field.feature
+++ b/customfield/tests/behat/required_field.feature
@@ -22,7 +22,7 @@ Feature: Requiredness The course custom fields can be mandatory or not
     When I log in as "admin"
     And I navigate to "Courses > Course custom fields" in site administration
     And I click on "Add a new custom field" "link"
-    And I click on "Text field" "link"
+    And I click on "Short text" "link"
     And I set the following fields to these values:
       | Name       | Test field |
       | Short name | testfield  |
@@ -43,7 +43,7 @@ Feature: Requiredness The course custom fields can be mandatory or not
     When I log in as "admin"
     And I navigate to "Courses > Course custom fields" in site administration
     And I click on "Add a new custom field" "link"
-    And I click on "Text field" "link"
+    And I click on "Short text" "link"
     And I set the following fields to these values:
       | Name       | Test field |
       | Short name | testfield  |

diff --git a/customfield/tests/behat/unique_field.feature b/customfield/tests/behat/unique_field.feature
index 8fe7063..e834eaa 100644 (file)
--- a/customfield/tests/behat/unique_field.feature
+++ b/customfield/tests/behat/unique_field.feature
@@ -22,7 +22,7 @@ Feature: Uniqueness The course custom fields can be mandatory or not
     When I log in as "admin"
     And I navigate to "Courses > Course custom fields" in site administration
     And I click on "Add a new custom field" "link"
-    And I click on "Text field" "link"
+    And I click on "Short text" "link"
     And I set the following fields to these values:
       | Name        | Test field |
       | Short name  | testfield  |