From e8aaf2c1584e8547eed851f8f9f9f21042e1a4e7 Mon Sep 17 00:00:00 2001 From: Noel De Martin Date: Tue, 25 Jan 2022 17:36:36 +0100 Subject: [PATCH] MOBILE-3833 behat: Update strings --- mod/chat/tests/behat/app_basic_usage.feature | 12 +++---- mod/chat/tests/behat/app_navigation.feature | 2 +- .../tests/behat/app_basic_usage.feature | 6 ++-- mod/forum/tests/behat/app_basic_usage.feature | 34 +++++++++---------- mod/forum/tests/behat/app_navigation.feature | 8 ++--- mod/login/tests/behat/app_basic_usage.feature | 4 +-- tests/behat/app_behat_runtime.js | 2 +- tests/behat/navigation_deeplinks.feature | 2 +- 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/mod/chat/tests/behat/app_basic_usage.feature b/mod/chat/tests/behat/app_basic_usage.feature index f3727631f..ef4f1d2da 100755 --- a/mod/chat/tests/behat/app_basic_usage.feature +++ b/mod/chat/tests/behat/app_basic_usage.feature @@ -23,10 +23,10 @@ Feature: Test basic usage of chat in app # Send messages as student1 When I enter the course "Course 1" as "student1" in the app And I press "Test chat name" in the app - Then I should find "Click here to enter the chat now" in the app - And I should find "View past chat sessions" in the app + Then I should find "Enter the chat" in the app + And I should find "Past sessions" in the app - When I press "Click here to enter the chat now" in the app + When I press "Enter the chat" in the app And I set the field "New message" to "Hi!" in the app And I press "Send" in the app Then I should find "Hi!" in the app @@ -39,7 +39,7 @@ Feature: Test basic usage of chat in app # Read messages, view connected users, send beep and reply as student2 When I enter the course "Course 1" as "student2" in the app And I press "Test chat name" in the app - And I press "Click here to enter the chat now" in the app + And I press "Enter the chat" in the app Then I should find "Hi!" in the app And I should find "I am David" in the app @@ -57,7 +57,7 @@ Feature: Test basic usage of chat in app # Send messages as student1 Given I enter the course "Course 1" as "student1" in the app And I press "Test chat name" in the app - And I press "Click here to enter the chat now" in the app + And I press "Enter the chat" in the app And I set the field "New message" to "Hi!" in the app And I press "Send" in the app Then I should find "Hi!" in the app @@ -69,7 +69,7 @@ Feature: Test basic usage of chat in app # Read messages from past sessions as student2 When I enter the course "Course 1" as "student2" in the app And I press "Test chat name" in the app - And I press "View past chat sessions" in the app + And I press "Past sessions" in the app And I press "Show incomplete sessions" in the app And I press "david student" near "(2)" in the app Then I should find "Hi!" in the app diff --git a/mod/chat/tests/behat/app_navigation.feature b/mod/chat/tests/behat/app_navigation.feature index fb4cd37ad..eccea87d3 100644 --- a/mod/chat/tests/behat/app_navigation.feature +++ b/mod/chat/tests/behat/app_navigation.feature @@ -31,7 +31,7 @@ Feature: Test chat navigation # Sessions When I press "Test chat name" in the app - And I press "View past chat sessions" in the app + And I press "Past sessions" in the app Then I should find "No sessions found" in the app # Sessions — split view diff --git a/mod/course/tests/behat/app_basic_usage.feature b/mod/course/tests/behat/app_basic_usage.feature index a51cec01e..088c511c1 100755 --- a/mod/course/tests/behat/app_basic_usage.feature +++ b/mod/course/tests/behat/app_basic_usage.feature @@ -419,7 +419,7 @@ Feature: Test basic usage of one course in app And I press "Enrol me" in the app And I press "OK" in the app And I wait loading to finish in the app - And I press "Contents" in the app + And I press "Course" in the app Then the header should be "Course 1" in the app And I should find "Choice course 1" in the app And I should find "assignment" in the app @@ -453,9 +453,9 @@ Feature: Test basic usage of one course in app And I press "Available courses" in the app And I press "Course 1" in the app Then I should find "Download course" in the app - And I should find "Contents" in the app + And I should find "Course" in the app - When I press "Contents" in the app + When I press "Course" in the app Then the header should be "Course 1" in the app And I should find "Choice course 1" in the app And I should find "assignment" in the app diff --git a/mod/forum/tests/behat/app_basic_usage.feature b/mod/forum/tests/behat/app_basic_usage.feature index 63a4821f6..12eaf072d 100755 --- a/mod/forum/tests/behat/app_basic_usage.feature +++ b/mod/forum/tests/behat/app_basic_usage.feature @@ -27,7 +27,7 @@ Feature: Test basic usage of forum activity in app Scenario: Create new discussion When I enter the course "Course 1" as "student1" in the app And I press "Test forum name" in the app - And I press "Add a new discussion topic" in the app + And I press "Add discussion topic" in the app And I set the field "Subject" to "My happy subject" in the app And I set the field "Message" to "An awesome message" in the app And I press "Post to forum" in the app @@ -39,7 +39,7 @@ Feature: Test basic usage of forum activity in app Scenario: Reply a post When I enter the course "Course 1" as "student1" in the app And I press "Test forum name" in the app - And I press "Add a new discussion topic" in the app + And I press "Add discussion topic" in the app And I set the field "Subject" to "DiscussionSubject" in the app And I set the field "Message" to "DiscussionMessage" in the app And I press "Post to forum" in the app @@ -55,11 +55,11 @@ Feature: Test basic usage of forum activity in app Scenario: Star and pin discussions (student) When I enter the course "Course 1" as "student1" in the app And I press "Test forum name" in the app - And I press "Add a new discussion topic" in the app + And I press "Add discussion topic" in the app And I set the field "Subject" to "starred subject" in the app And I set the field "Message" to "starred message" in the app And I press "Post to forum" in the app - And I press "Add a new discussion topic" in the app + And I press "Add discussion topic" in the app And I set the field "Subject" to "normal subject" in the app And I set the field "Message" to "normal message" in the app And I press "Post to forum" in the app @@ -89,15 +89,15 @@ Feature: Test basic usage of forum activity in app Scenario: Star and pin discussions (teacher) When I enter the course "Course 1" as "teacher1" in the app And I press "Test forum name" in the app - And I press "Add a new discussion topic" in the app + And I press "Add discussion topic" in the app And I set the field "Subject" to "Auto-test star" in the app And I set the field "Message" to "Auto-test star message" in the app And I press "Post to forum" in the app - And I press "Add a new discussion topic" in the app + And I press "Add discussion topic" in the app And I set the field "Subject" to "Auto-test pin" in the app And I set the field "Message" to "Auto-test pin message" in the app And I press "Post to forum" in the app - And I press "Add a new discussion topic" in the app + And I press "Add discussion topic" in the app And I set the field "Subject" to "Auto-test plain" in the app And I set the field "Message" to "Auto-test plain message" in the app And I press "Post to forum" in the app @@ -119,7 +119,7 @@ Feature: Test basic usage of forum activity in app Scenario: Edit a not sent reply offline When I enter the course "Course 1" as "student1" in the app And I press "Test forum name" in the app - And I press "Add a new discussion topic" in the app + And I press "Add discussion topic" in the app And I set the field "Subject" to "Auto-test" in the app And I set the field "Message" to "Auto-test message" in the app And I press "Post to forum" in the app @@ -153,7 +153,7 @@ Feature: Test basic usage of forum activity in app When I enter the course "Course 1" as "student1" in the app And I press "Test forum name" in the app And I switch offline mode to "true" - And I press "Add a new discussion topic" in the app + And I press "Add discussion topic" in the app And I set the field "Subject" to "Auto-test" in the app And I set the field "Message" to "Auto-test message" in the app And I press "Post to forum" in the app @@ -175,7 +175,7 @@ Feature: Test basic usage of forum activity in app Scenario: Edit a forum post (only online) When I enter the course "Course 1" as "student1" in the app And I press "Test forum name" in the app - And I press "Add a new discussion topic" in the app + And I press "Add discussion topic" in the app And I set the field "Subject" to "Auto-test" in the app And I set the field "Message" to "Auto-test message" in the app And I press "Post to forum" in the app @@ -202,7 +202,7 @@ Feature: Test basic usage of forum activity in app Scenario: Delete a forum post (only online) When I enter the course "Course 1" as "student1" in the app And I press "Test forum name" in the app - And I press "Add a new discussion topic" in the app + And I press "Add discussion topic" in the app And I set the field "Subject" to "Auto-test" in the app And I set the field "Message" to "Auto-test message" in the app And I press "Post to forum" in the app @@ -236,7 +236,7 @@ Feature: Test basic usage of forum activity in app Scenario: Add/view ratings Given I enter the course "Course 1" as "student1" in the app And I press "Test forum name" in the app - And I press "Add a new discussion topic" in the app + And I press "Add discussion topic" in the app And I set the field "Subject" to "Auto-test" in the app And I set the field "Message" to "Auto-test message" in the app And I press "Post to forum" in the app @@ -283,7 +283,7 @@ Feature: Test basic usage of forum activity in app Scenario: Reply a post offline When I enter the course "Course 1" as "student1" in the app And I press "Test forum name" in the app - And I press "Add a new discussion topic" in the app + And I press "Add discussion topic" in the app And I set the field "Subject" to "DiscussionSubject" in the app And I set the field "Message" to "DiscussionMessage" in the app And I press "Post to forum" in the app @@ -315,7 +315,7 @@ Feature: Test basic usage of forum activity in app When I enter the course "Course 1" as "student1" in the app And I press "Test forum name" in the app And I switch offline mode to "true" - And I press "Add a new discussion topic" in the app + And I press "Add discussion topic" in the app And I set the field "Subject" to "DiscussionSubject" in the app And I set the field "Message" to "DiscussionMessage" in the app And I press "Post to forum" in the app @@ -338,7 +338,7 @@ Feature: Test basic usage of forum activity in app When I enter the course "Course 1" as "student1" in the app And I press "Test forum name" in the app And I switch offline mode to "true" - And I press "Add a new discussion topic" in the app + And I press "Add discussion topic" in the app And I set the field "Subject" to "DiscussionSubject" in the app And I set the field "Message" to "DiscussionMessage" in the app And I press "Post to forum" in the app @@ -360,7 +360,7 @@ Feature: Test basic usage of forum activity in app Scenario: Prefetch When I enter the course "Course 1" as "student1" in the app And I press "Test forum name" in the app - And I press "Add a new discussion topic" in the app + And I press "Add discussion topic" in the app And I set the field "Subject" to "DiscussionSubject 1" in the app And I set the field "Message" to "DiscussionMessage 1" in the app And I press "Post to forum" in the app @@ -374,7 +374,7 @@ Feature: Test basic usage of forum activity in app And I press the back button in the app When I press "Test forum name" in the app - And I press "Add a new discussion topic" in the app + And I press "Add discussion topic" in the app And I set the field "Subject" to "DiscussionSubject 2" in the app And I set the field "Message" to "DiscussionMessage 2" in the app And I press "Post to forum" in the app diff --git a/mod/forum/tests/behat/app_navigation.feature b/mod/forum/tests/behat/app_navigation.feature index 975887b6a..f72b98764 100644 --- a/mod/forum/tests/behat/app_navigation.feature +++ b/mod/forum/tests/behat/app_navigation.feature @@ -102,12 +102,12 @@ Feature: Test forum navigation # Offline When I press the back button in the app - And I press "Add a new discussion topic" in the app + And I press "Add discussion topic" in the app And I switch offline mode to "true" And I set the field "Subject" to "Offline discussion 1" in the app And I set the field "Message" to "Offline discussion 1 message" in the app And I press "Post to forum" in the app - And I press "Add a new discussion topic" in the app + And I press "Add discussion topic" in the app And I set the field "Subject" to "Offline discussion 2" in the app And I set the field "Message" to "Offline discussion 2 message" in the app And I press "Post to forum" in the app @@ -194,12 +194,12 @@ Feature: Test forum navigation And I should find "Discussion 05 first reply" inside the split-view content in the app # Offline - When I press "Add a new discussion topic" in the app + When I press "Add discussion topic" in the app And I switch offline mode to "true" And I set the field "Subject" to "Offline discussion 1" in the app And I set the field "Message" to "Offline discussion 1 message" in the app And I press "Post to forum" in the app - And I press "Add a new discussion topic" in the app + And I press "Add discussion topic" in the app And I set the field "Subject" to "Offline discussion 2" in the app And I set the field "Message" to "Offline discussion 2 message" in the app And I press "Post to forum" in the app diff --git a/mod/login/tests/behat/app_basic_usage.feature b/mod/login/tests/behat/app_basic_usage.feature index e985ce73f..b94698e0b 100755 --- a/mod/login/tests/behat/app_basic_usage.feature +++ b/mod/login/tests/behat/app_basic_usage.feature @@ -36,7 +36,7 @@ Feature: Test basic usage of login in app And I press the user menu button in the app And I press "Log out" in the app And I wait the app to restart - And I press "Add a new account" in the app + And I press "Add" in the app And I set the field "Your site" to "Wrong Site Address" in the app And I press enter in the app Then I should find "Cannot connect" in the app @@ -47,7 +47,7 @@ Feature: Test basic usage of login in app And I log in as "student1" And I press the user menu button in the app And I press "Switch account" in the app - And I press "Add a new account" in the app + And I press "Add" in the app And I wait the app to restart And I set the field "Your site" to "Wrong Site Address" in the app And I press enter in the app diff --git a/tests/behat/app_behat_runtime.js b/tests/behat/app_behat_runtime.js index 03e647250..fac2f2dd1 100644 --- a/tests/behat/app_behat_runtime.js +++ b/tests/behat/app_behat_runtime.js @@ -497,7 +497,7 @@ })[0]; break; case 'user menu' : - foundButton = findElementsBasedOnText({ text: 'Account' })[0]; + foundButton = findElementsBasedOnText({ text: 'User account' })[0]; break; case 'page menu': foundButton = findElementsBasedOnText({ text: 'Display options' })[0]; diff --git a/tests/behat/navigation_deeplinks.feature b/tests/behat/navigation_deeplinks.feature index ef6ac776f..0b7ec9a82 100644 --- a/tests/behat/navigation_deeplinks.feature +++ b/tests/behat/navigation_deeplinks.feature @@ -28,7 +28,7 @@ Feature: It navigates properly using deep links. And I press the user menu button in the app And I press "Log out" in the app And I wait the app to restart - And I press "Add a new account" in the app + And I press "Add" in the app And I set the field "Your site" to "$WWWROOT" in the app And I press "Connect to your site" in the app And I log in as "student1"