Skip to content
GitLab
Next
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Primary navigation
Search or go to…
Project
GitLab
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Privacy statement
Keyboard shortcuts
?
What's new
4
Snippets
Groups
Projects
Show more breadcrumbs
GitLab.org
GitLab
Commits
2a347758
Commit
2a347758
authored
2 years ago
by
Mark Lapierre
Browse files
Options
Downloads
Plain Diff
Merge branch 'extract-capybata-wait-time-to-env-variable' into 'master'
Extract capybara max wait time to env var See merge request
!90988
parents
2ef0caee
b1624f8f
No related branches found
No related tags found
1 merge request
!90988
Extract capybara max wait time to env var
Pipeline
#575545957
passed
2 years ago
Stage: sync
Stage: prepare
Stage: build-images
Stage: lint
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
qa/qa/runtime/browser.rb
+1
-1
1 addition, 1 deletion
qa/qa/runtime/browser.rb
qa/qa/runtime/env.rb
+4
-0
4 additions, 0 deletions
qa/qa/runtime/env.rb
with
5 additions
and
1 deletion
qa/qa/runtime/browser.rb
+
1
−
1
View file @
2a347758
...
...
@@ -16,7 +16,7 @@ class Browser
NotRespondingError
=
Class
.
new
(
RuntimeError
)
CAPYBARA_MAX_WAIT_TIME
=
10
CAPYBARA_MAX_WAIT_TIME
=
Env
.
max_capybara_wait_time
def
self
.
blank_page?
[
''
,
'about:blank'
,
'data:,'
].
include?
(
Capybara
.
current_session
.
driver
.
browser
.
current_url
)
...
...
This diff is collapsed.
Click to expand it.
qa/qa/runtime/env.rb
+
4
−
0
View file @
2a347758
...
...
@@ -461,6 +461,10 @@ def skip_smoke_reliable?
enabled?
(
ENV
[
'QA_SKIP_SMOKE_RELIABLE'
],
default:
false
)
end
def
max_capybara_wait_time
ENV
.
fetch
(
'MAX_CAPYBARA_WAIT_TIME'
,
10
).
to_i
end
private
def
remote_grid_credentials
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment