diff options
author | Mark Lapierre <mlapierre@gitlab.com> | 2019-06-12 12:09:07 +1000 |
---|---|---|
committer | Mark Lapierre <mlapierre@gitlab.com> | 2019-06-12 12:09:07 +1000 |
commit | 7886f44d632f8004024f869aadd20fcc6f225f54 (patch) | |
tree | 7a842f6ad512070133101eff6c4b6612bca6501f | |
parent | 14d19dfab264847477577002940d0c07a96502db (diff) | |
download | gitlab-ce-7886f44d632f8004024f869aadd20fcc6f225f54.tar.gz |
Allow the Projects Dashboard to be validatedqa-ml-validate-after-visit-in-block
-rw-r--r-- | app/views/shared/projects/_search_form.html.haml | 2 | ||||
-rw-r--r-- | qa/qa/page/dashboard/projects.rb | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app/views/shared/projects/_search_form.html.haml b/app/views/shared/projects/_search_form.html.haml index 7c7c0a363ac..4365e3f6877 100644 --- a/app/views/shared/projects/_search_form.html.haml +++ b/app/views/shared/projects/_search_form.html.haml @@ -1,7 +1,7 @@ - form_field_classes = local_assigns[:admin_view] || !Feature.enabled?(:project_list_filter_bar) ? 'input-short js-projects-list-filter' : '' - placeholder = local_assigns[:search_form_placeholder] ? search_form_placeholder : 'Filter by name...' -= form_tag filter_projects_path, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f| += form_tag filter_projects_path, method: :get, class: 'project-filter-form qa-project-filter-form', id: 'project-filter-form' do |f| = search_field_tag :name, params[:name], placeholder: placeholder, class: "project-filter-form-field form-control #{form_field_classes}", diff --git a/qa/qa/page/dashboard/projects.rb b/qa/qa/page/dashboard/projects.rb index 7ab8ee39f72..0c23d7cffbb 100644 --- a/qa/qa/page/dashboard/projects.rb +++ b/qa/qa/page/dashboard/projects.rb @@ -5,7 +5,7 @@ module QA module Dashboard class Projects < Page::Base view 'app/views/shared/projects/_search_form.html.haml' do - element :form_filter_by_name, /form_tag.+id: 'project-filter-form'/ # rubocop:disable QA/ElementWithPattern + element :project_filter_form, required: true end def go_to_project(name) @@ -14,10 +14,14 @@ module QA find_link(text: name).click end + def self.path + '/' + end + private def filter_by_name(name) - page.within('form#project-filter-form') do + within_element(:project_filter_form) do fill_in :name, with: name end end |