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

Restore direct click and work around issue with other specs

Christophe Bliard72736f413f8c
diff --git a/spec/features/work_packages/progress_modal_spec.rb b/spec/features/work_packages/progress_modal_spec.rb
index bd468d01e62..b0961510094 100644
--- a/spec/features/work_packages/progress_modal_spec.rb
+++ b/spec/features/work_packages/progress_modal_spec.rb
@@ -288,8 +288,7 @@ RSpec.describe "Progress modal", :js do
progress_popover.close
- status_field = work_package_create_page.edit_field(:status)
- status_field.update("in progress")
+ work_package_create_page.set_status("in progress")
progress_popover.open
progress_popover.expect_value(:status, "in progress (50%)", disabled: true)
@@ -318,8 +317,7 @@ RSpec.describe "Progress modal", :js do
progress_popover.expect_hints(remaining_work: :derived)
progress_popover.save
- status_field = work_package_create_page.edit_field(:status)
- status_field.update("in progress")
+ work_package_create_page.set_status("in progress")
progress_popover.open
progress_popover.expect_values(work: "14h", remaining_work: "7h")
diff --git a/spec/support/components/autocompleter/ng_select_autocomplete_helpers.rb b/spec/support/components/autocompleter/ng_select_autocomplete_helpers.rb
index 0e088171038..2cbea899606 100644
--- a/spec/support/components/autocompleter/ng_select_autocomplete_helpers.rb
+++ b/spec/support/components/autocompleter/ng_select_autocomplete_helpers.rb
@@ -34,7 +34,7 @@ module Components::Autocompleter
def ng_click_autocompleter(target)
if using_cuprite?
- target.trigger('click')
+ target.click
else
page.execute_script("arguments[0].click();", target.native)
end
@@ -156,7 +156,7 @@ module Components::Autocompleter
text = select_text.presence || query
# click the element to select it
- target_dropdown.find(".ng-option", text:, match: :first, wait: 15).click
+ target_dropdown.first(".ng-option", text:, wait: 15).click
end
# Finds the currently visible, expanded user auto completer and returns its dropdown menu options.
@@ -174,7 +174,7 @@ module Components::Autocompleter
def visible_user_auto_completer_options
find(".ng-dropdown-panel [role='listbox']").all(".ng-option[role='option']").filter_map do |opt|
name = opt.find(".op-user-autocompleter--name").text
- email_element = opt.all(".op-autocompleter__option-principal-email").first
+ email_element = opt.first(".op-autocompleter__option-principal-email")
email = email_element&.text
{ name:, email: }
diff --git a/spec/support/pages/work_packages/full_work_package_create.rb b/spec/support/pages/work_packages/full_work_package_create.rb
index 70004fca282..d1f42d1ee33 100644
--- a/spec/support/pages/work_packages/full_work_package_create.rb
+++ b/spec/support/pages/work_packages/full_work_package_create.rb
@@ -49,5 +49,15 @@ module Pages
new_project_work_packages_path(project.identifier)
end
end
+
+ def set_status(status)
+ # Scroll back to the top to avoid the activation of the status field
+ # displaying the dropdown overlapping it as it would prevent additional
+ # clicks on it.
+ # When scrolled on top, the dropdown is always under it.
+ scroll_to_top
+ status_field = edit_field(:status)
+ status_field.update(status)
+ end
end
end
diff --git a/spec/support/shared/scroll_into_view_helpers.rb b/spec/support/shared/scroll_into_view_helpers.rb
index 082c053363d..843cdcb8d39 100644
--- a/spec/support/shared/scroll_into_view_helpers.rb
+++ b/spec/support/shared/scroll_into_view_helpers.rb
@@ -52,6 +52,11 @@ def scroll_to_and_click(element, block: :start, inline: :nearest)
end
end
+def scroll_to_top
+ top_element = page.find_by_id("content-body")
+ page.execute_script("arguments[0].scrollTo(0, 0);", top_element.native)
+end
+
def expect_element_in_view(element)
script = <<-JS
(function(el) {