From 06e7a0c97a094480bd96bee4f78272bb7264068e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Wed, 10 Jan 2024 10:00:54 +0100 Subject: [PATCH] MOBILE-3947 behat: Fix behat tests on ionic7 upgrade --- scripts/langindex.json | 1 + .../components/timeline/addon-block-timeline.html | 3 ++- src/addons/block/timeline/lang.json | 1 + src/addons/block/timeline/tests/behat/basic_usage.feature | 8 ++++---- src/addons/messages/tests/behat/basic_usage.feature | 1 - src/core/components/combobox/core-combobox.html | 2 +- src/theme/theme.base.scss | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/langindex.json b/scripts/langindex.json index 3c3c3e1f9..c9c894df6 100644 --- a/scripts/langindex.json +++ b/scripts/langindex.json @@ -72,6 +72,7 @@ "addon.block_starredcourses.nocourses": "block_starredcourses", "addon.block_starredcourses.pluginname": "block_starredcourses", "addon.block_tags.pluginname": "block_tags", + "addon.block_timeline.ariadayfilter": "block_timeline", "addon.block_timeline.duedate": "block_timeline", "addon.block_timeline.next30days": "block_timeline", "addon.block_timeline.next3months": "block_timeline", diff --git a/src/addons/block/timeline/components/timeline/addon-block-timeline.html b/src/addons/block/timeline/components/timeline/addon-block-timeline.html index a5bc3a312..4aca795d0 100644 --- a/src/addons/block/timeline/components/timeline/addon-block-timeline.html +++ b/src/addons/block/timeline/components/timeline/addon-block-timeline.html @@ -14,7 +14,8 @@ - + {{ option.name | translate }} diff --git a/src/addons/block/timeline/lang.json b/src/addons/block/timeline/lang.json index b4cb56414..efd22154f 100644 --- a/src/addons/block/timeline/lang.json +++ b/src/addons/block/timeline/lang.json @@ -1,4 +1,5 @@ { + "ariadayfilter": "Filter timeline by date", "duedate": "Due date", "next30days": "Next 30 days", "next3months": "Next 3 months", diff --git a/src/addons/block/timeline/tests/behat/basic_usage.feature b/src/addons/block/timeline/tests/behat/basic_usage.feature index 34b002473..e8591a04f 100644 --- a/src/addons/block/timeline/tests/behat/basic_usage.feature +++ b/src/addons/block/timeline/tests/behat/basic_usage.feature @@ -46,7 +46,7 @@ Feature: Timeline block. | assign | C3 | assign24 | Assignment 24 | ##+1 year## | | assign | C3 | assign25 | Assignment 25 | ##+1 year## | - @lms_from4.0 @ionic7_failure + @lms_from4.0 Scenario: See courses inside block Given I entered the app as "student1" Then I should find "Assignment 00" within "Timeline" "ion-card" in the app @@ -57,7 +57,7 @@ Feature: Timeline block. But I should not find "Assignment 01" within "Timeline" "ion-card" in the app And I should not find "Course 3" within "Timeline" "ion-card" in the app - When I press "Next 30 days" in the app + When I press "Filter timeline by date" in the app And I press "Overdue" in the app Then I should find "Assignment 01" within "Timeline" "ion-card" in the app And I should find "Course 2" within "Timeline" "ion-card" in the app @@ -66,7 +66,7 @@ Feature: Timeline block. And I should not find "Course 1" within "Timeline" "ion-card" in the app And I should not find "Course 3" within "Timeline" "ion-card" in the app - When I press "Overdue" in the app + When I press "Filter timeline by date" in the app And I press "All" in the app Then I should find "Assignment 19" within "Timeline" "ion-card" in the app And I should find "Course 3" within "Timeline" "ion-card" in the app @@ -76,7 +76,7 @@ Feature: Timeline block. Then I should find "Assignment 21" within "Timeline" "ion-card" in the app And I should find "Assignment 25" within "Timeline" "ion-card" in the app - When I press "All" in the app + When I press "Filter timeline by date" in the app And I press "Next 7 days" in the app And I press "Sort by" in the app And I press "Sort by courses" in the app diff --git a/src/addons/messages/tests/behat/basic_usage.feature b/src/addons/messages/tests/behat/basic_usage.feature index 828a310f5..37d0ec60a 100755 --- a/src/addons/messages/tests/behat/basic_usage.feature +++ b/src/addons/messages/tests/behat/basic_usage.feature @@ -19,7 +19,6 @@ Feature: Test basic usage of messages in app | student1 | C1 | student | | student2 | C1 | student | - @ionic7_failure Scenario: View recent conversations and contacts Given I entered the app as "teacher1" When I press "Messages" in the app diff --git a/src/core/components/combobox/core-combobox.html b/src/core/components/combobox/core-combobox.html index 1ffd3db43..8d0868bc5 100644 --- a/src/core/components/combobox/core-combobox.html +++ b/src/core/components/combobox/core-combobox.html @@ -5,7 +5,7 @@ + [interface]="interface" [attr.aria-label]="label" [disabled]="disabled" [hidden]="!!icon"> diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss index f362be48a..37c3e2adf 100644 --- a/src/theme/theme.base.scss +++ b/src/theme/theme.base.scss @@ -1161,7 +1161,7 @@ ion-select-popover { ion-item.core-select-option-title { cursor: pointer; - ion-radio { + ion-radio::part(container) { display: none; } }