Skip to content
Snippets Groups Projects
Unverified Commit 64f0f569 authored by Andrejs Cunskis's avatar Andrejs Cunskis Committed by GitLab
Browse files

Merge branch 'andrey-e2e-test-healthcheck-fix' into 'master'

Fix e2e test healthcheck for release environment

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/169429



Merged-by: default avatarAndrejs Cunskis <acunskis@gitlab.com>
Approved-by: default avatarReuben Pereira <2967854-rpereira2@users.noreply.gitlab.com>
parents 3918550b 54d2b6ff
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -141,8 +141,11 @@ def accept_insecure_certs?
end
 
def running_on_dot_com?
uri = URI.parse(Runtime::Scenario.gitlab_address)
uri.host.include?('.com')
URI.parse(Runtime::Scenario.gitlab_address).host.include?('.com')
end
def running_on_release?
URI.parse(Runtime::Scenario.gitlab_address).host.include?('release.gitlab.net')
end
 
def running_on_dev?
Loading
Loading
Loading
Loading
@@ -64,8 +64,9 @@ def elements_css
#
# @return [void]
def wait_for_login_page_to_load
# Do not perform headless request on .com due to cloudfare
if Runtime::Env.running_on_dot_com?
# Do not perform headless request on .com or release environment due to cloudfare
# TODO: add additional check to detect when environment doesn't allow to check sign in page via headless request
if Runtime::Env.running_on_dot_com? || Runtime::Env.running_on_release?
debug("Checking for required elements via web browser")
return Capybara.current_session.using_wait_time(wait) { Runtime::Browser.visit(:gitlab, Page::Main::Login) }
end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment