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
This commit is contained in:
Dan Davison 2019-06-17 22:45:38 +00:00
commit 8a153abd2d
4 changed files with 20 additions and 11 deletions

View file

@ -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}",

View file

@ -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

View file

@ -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

View file

@ -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|