Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Adapt test to new top bar structure

Henriette Darge6a4f6c8bcbf2
diff --git a/frontend/src/app/core/setup/globals/onboarding/tours/menu_tour.ts b/frontend/src/app/core/setup/globals/onboarding/tours/menu_tour.ts
index 057a2d5d13d..934a6265a65 100644
--- a/frontend/src/app/core/setup/globals/onboarding/tours/menu_tour.ts
+++ b/frontend/src/app/core/setup/globals/onboarding/tours/menu_tour.ts
@@ -21,7 +21,7 @@ export function menuTourSteps():OnboardingStep[] {
condition: () => document.getElementById('op-app-header--quick-add-menu-button') !== undefined,
},
{
- 'next .op-app-help': I18n.t('js.onboarding.steps.help_menu'),
+ 'next #op-app-header--help-menu-button': I18n.t('js.onboarding.steps.help_menu'),
shape: 'circle',
showSkip: false,
nextButton: { text: I18n.t('js.onboarding.buttons.got_it') },
diff --git a/lib/redmine/menu_manager/top_menu/quick_add_menu.rb b/lib/redmine/menu_manager/top_menu/quick_add_menu.rb
index 97f06745ead..0c40aca43cc 100644
--- a/lib/redmine/menu_manager/top_menu/quick_add_menu.rb
+++ b/lib/redmine/menu_manager/top_menu/quick_add_menu.rb
@@ -63,7 +63,7 @@ module Redmine::MenuManager::TopMenu::QuickAddMenu
def add_first_level_items(menu)
first_level_menu_items_for(:quick_add_menu, @project).each do |item|
menu.with_item(
- href: item.url.present? ? url_for(item.url) : "#",
+ href: item.url.present? ? allowed_node_url(item, @project) : "#",
content_arguments: {
target: "_top",
**item.html_options,
diff --git a/spec/support/components/menu/quick_add_menu.rb b/spec/support/components/menu/quick_add_menu.rb
index 40ce1c5b1d1..0fa4c2e3a2b 100644
--- a/spec/support/components/menu/quick_add_menu.rb
+++ b/spec/support/components/menu/quick_add_menu.rb
@@ -53,7 +53,7 @@ module Components
def expect_work_package_type(*names, present: true)
within_dropdown do
- expect(page).to have_text "Work Packages"
+ expect(page).to have_text "Work packages"
end
names.each do |name|
@@ -76,9 +76,9 @@ module Components
def expect_link(matcher, present: true)
within_dropdown do
if present
- expect(page).to have_link matcher
+ expect(page).to have_link aria: { label: matcher }
else
- expect(page).to have_no_link matcher
+ expect(page).to have_no_link aria: { label: matcher }
end
end
end
diff --git a/spec/support/pages/notifications/center.rb b/spec/support/pages/notifications/center.rb
index c440300118d..3a95b121523 100644
--- a/spec/support/pages/notifications/center.rb
+++ b/spec/support/pages/notifications/center.rb
@@ -147,7 +147,7 @@ module Pages
end
def bell_element
- page.find('opce-in-app-notification-bell [data-test-selector="op-ian-bell"]')
+ page.find_test_selector("op-ian-bell")
end
def expect_no_toaster