Merge branch 'qa-ml-validate-after-visit-in-block' into 'master'

[CE] Validate page after visit in block

See merge request gitlab-org/gitlab-ce!29524

4 files changed, 20 insertions, 11 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
diff --git a/qa/qa/runtime/address.rb b/qa/qa/runtime/address.rb
index 98d042fb43a..c622051bb6d 100644
--- a/qa/qa/runtime/address.rb
+++ b/qa/qa/runtime/address.rb
@@ -5,7 +5,7 @@ module QA
     class Address
       attr_reader :address
 
-      def initialize(instance, page = nil)
+      def initialize(instance, page)
         @instance = instance
         @address  = host + (page.is_a?(String) ? page : page&.path)
       end
diff --git a/qa/qa/runtime/browser.rb b/qa/qa/runtime/browser.rb
index 3bf4b3bbbfb..ed0779b93cc 100644
--- a/qa/qa/runtime/browser.rb
+++ b/qa/qa/runtime/browser.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rspec/core'
+require 'rspec/expectations'
 require 'capybara/rspec'
 require 'capybara-screenshot/rspec'
 require 'selenium-webdriver'
@@ -27,13 +28,12 @@ module QA
       # In case of an address that is a symbol we will try to guess address
       # based on `Runtime::Scenario#something_address`.
       #
-      def visit(address, page = nil, &block)
-        Browser::Session.new(address, page).perform(&block)
+      def visit(address, page_class, &block)
+        Browser::Session.new(address, page_class).perform(&block)
       end
 
-      def self.visit(address, page = nil, &block)
-        new.visit(address, page, &block)
-        page.validate_elements_present!
+      def self.visit(address, page_class, &block)
+        new.visit(address, page_class, &block)
       end
 
       def self.configure!
@@ -128,8 +128,11 @@ module QA
       class Session
         include Capybara::DSL
 
-        def initialize(instance, page = nil)
-          @session_address = Runtime::Address.new(instance, page)
+        attr_reader :page_class
+
+        def initialize(instance, page_class)
+          @session_address = Runtime::Address.new(instance, page_class)
+          @page_class = page_class
         end
 
         def url
@@ -139,6 +142,8 @@ module QA
         def perform(&block)
           visit(url)
 
+          page_class.validate_elements_present!
+
           if QA::Runtime::Env.qa_cookies
             browser = Capybara.current_session.driver.browser
             QA::Runtime::Env.qa_cookies.each do |cookie|