Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
05886c63
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
05886c63
编写于
12月 10, 2018
作者:
D
ddavison
提交者:
Sanad Liaquat
1月 09, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow QA to run in remote grid environments
Signed-off-by:
N
ddavison
<
ddavison@gitlab.com
>
上级
9370ba6f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
49 addition
and
17 deletion
+49
-17
qa/qa/runtime/browser.rb
qa/qa/runtime/browser.rb
+24
-17
qa/qa/runtime/env.rb
qa/qa/runtime/env.rb
+25
-0
未找到文件。
qa/qa/runtime/browser.rb
浏览文件 @
05886c63
...
...
@@ -40,22 +40,23 @@ module QA
return
if
Capybara
.
drivers
.
include?
(
:chrome
)
Capybara
.
register_driver
:chrome
do
|
app
|
capabilities
=
Selenium
::
WebDriver
::
Remote
::
Capabilities
.
chrome
(
# This enables access to logs with `page.driver.manage.get_log(:browser)`
loggingPrefs:
{
browser:
"ALL"
,
client:
"ALL"
,
driver:
"ALL"
,
server:
"ALL"
}
)
Capybara
.
register_driver
QA
::
Runtime
::
Env
.
browser
do
|
app
|
capabilities
=
Selenium
::
WebDriver
::
Remote
::
Capabilities
.
send
(
QA
::
Runtime
::
Env
.
browser
,
# This enables access to logs with `page.driver.manage.get_log(:browser)`
loggingPrefs:
{
browser:
"ALL"
,
client:
"ALL"
,
driver:
"ALL"
,
server:
"ALL"
})
if
QA
::
Runtime
::
Env
.
accept_insecure_certs?
capabilities
[
'acceptInsecureCerts'
]
=
true
end
options
=
Selenium
::
WebDriver
::
Chrome
::
Options
.
new
# QA::Runtime::Env.browser.capitalize will work for every driver type except PhantomJS.
# We will have no use to use PhantomJS so this shouldn't be a problem.
options
=
Selenium
::
WebDriver
.
const_get
(
QA
::
Runtime
::
Env
.
browser
.
capitalize
)
::
Options
.
new
options
.
add_argument
(
"window-size=1240,1680"
)
# Chrome won't work properly in a Docker container in sandbox mode
...
...
@@ -80,12 +81,18 @@ module QA
# Disable /dev/shm use in CI. See https://gitlab.com/gitlab-org/gitlab-ee/issues/4252
options
.
add_argument
(
"disable-dev-shm-usage"
)
if
QA
::
Runtime
::
Env
.
running_in_ci?
Capybara
::
Selenium
::
Driver
.
new
(
app
,
browser: :chrome
,
selenium_options
=
{
browser:
QA
::
Runtime
::
Env
.
browser
,
clear_local_storage:
true
,
desired_capabilities:
capabilities
,
options:
options
}
selenium_options
[
:url
]
=
QA
::
Runtime
::
Env
.
remote_grid
if
QA
::
Runtime
::
Env
.
remote_grid
Capybara
::
Selenium
::
Driver
.
new
(
app
,
selenium_options
)
end
...
...
@@ -93,7 +100,7 @@ module QA
Capybara
::
Screenshot
.
prune_strategy
=
:keep_last_run
# From https://github.com/mattheworiordan/capybara-screenshot/issues/84#issuecomment-41219326
Capybara
::
Screenshot
.
register_driver
(
:chrome
)
do
|
driver
,
path
|
Capybara
::
Screenshot
.
register_driver
(
QA
::
Runtime
::
Env
.
browser
)
do
|
driver
,
path
|
driver
.
browser
.
save_screenshot
(
path
)
end
...
...
@@ -102,8 +109,8 @@ module QA
end
Capybara
.
configure
do
|
config
|
config
.
default_driver
=
:chrome
config
.
javascript_driver
=
:chrome
config
.
default_driver
=
QA
::
Runtime
::
Env
.
browser
config
.
javascript_driver
=
QA
::
Runtime
::
Env
.
browser
config
.
default_max_wait_time
=
10
# https://github.com/mattheworiordan/capybara-screenshot/issues/164
config
.
save_path
=
::
File
.
expand_path
(
'../../tmp'
,
__dir__
)
...
...
qa/qa/runtime/env.rb
浏览文件 @
05886c63
...
...
@@ -56,6 +56,31 @@ module QA
@personal_access_token
||=
ENV
[
'PERSONAL_ACCESS_TOKEN'
]
end
def
remote_grid
# if username specified, password/auth token is required
# can be
# - "http://user:pass@somehost.com/wd/hub"
# - "https://user:pass@somehost.com:443/wd/hub"
# - "http://localhost:4444/wd/hub"
"
#{
remote_grid_protocol
}
://
#{
"
#{
remote_grid_username
}
:
#{
remote_grid_access_key
}
@"
if
remote_grid_username
}#{
ENV
[
'QA_REMOTE_GRID'
]
}
/wd/hub"
if
ENV
[
'QA_REMOTE_GRID'
]
end
def
remote_grid_username
ENV
[
'QA_REMOTE_GRID_USERNAME'
]
end
def
remote_grid_access_key
ENV
[
'QA_REMOTE_GRID_ACCESS_KEY'
]
end
def
remote_grid_protocol
ENV
[
'QA_REMOTE_GRID_PROTOCOL'
]
||
'http'
end
def
browser
ENV
[
'QA_BROWSER'
]
||
:chrome
end
def
user_username
ENV
[
'GITLAB_USERNAME'
]
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录