Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
a59b2305
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
a59b2305
编写于
7月 04, 2019
作者:
J
John Hawthorn
提交者:
GitHub
7月 04, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #36592 from jhawthorn/system_testing_preload
Preload browser driver_path to fix system testing under parallelism
上级
6fd43bd0
b21ef266
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
29 addition
and
0 deletion
+29
-0
actionpack/lib/action_dispatch/system_test_case.rb
actionpack/lib/action_dispatch/system_test_case.rb
+1
-0
actionpack/lib/action_dispatch/system_testing/browser.rb
actionpack/lib/action_dispatch/system_testing/browser.rb
+13
-0
actionpack/lib/action_dispatch/system_testing/driver.rb
actionpack/lib/action_dispatch/system_testing/driver.rb
+2
-0
actionpack/test/dispatch/system_testing/driver_test.rb
actionpack/test/dispatch/system_testing/driver_test.rb
+13
-0
未找到文件。
actionpack/lib/action_dispatch/system_test_case.rb
浏览文件 @
a59b2305
...
...
@@ -4,6 +4,7 @@
require
"capybara/dsl"
require
"capybara/minitest"
require
"selenium/webdriver"
require
"action_controller"
require
"action_dispatch/system_testing/driver"
require
"action_dispatch/system_testing/browser"
...
...
actionpack/lib/action_dispatch/system_testing/browser.rb
浏览文件 @
a59b2305
...
...
@@ -39,6 +39,19 @@ def capabilities
end
end
# driver_path can be configured as a proc. The webdrivers gem uses this
# proc to update web drivers. Running this proc early allows us to only
# update the webdriver once and avoid race conditions when using
# parallel tests.
def
preload
case
type
when
:chrome
::
Selenium
::
WebDriver
::
Chrome
::
Service
.
driver_path
.
try
(
:call
)
when
:firefox
::
Selenium
::
WebDriver
::
Firefox
::
Service
.
driver_path
.
try
(
:call
)
end
end
private
def
headless_chrome_browser_options
capabilities
.
args
<<
"--headless"
...
...
actionpack/lib/action_dispatch/system_testing/driver.rb
浏览文件 @
a59b2305
...
...
@@ -9,6 +9,8 @@ def initialize(name, **options, &capabilities)
@screen_size
=
options
[
:screen_size
]
@options
=
options
[
:options
]
@capabilities
=
capabilities
@browser
.
preload
end
def
use
...
...
actionpack/test/dispatch/system_testing/driver_test.rb
浏览文件 @
a59b2305
...
...
@@ -120,4 +120,17 @@ class DriverTest < ActiveSupport::TestCase
driver
.
use
end
end
test
"preloads browser's driver_path"
do
called
=
false
original_driver_path
=
::
Selenium
::
WebDriver
::
Chrome
::
Service
.
driver_path
::
Selenium
::
WebDriver
::
Chrome
::
Service
.
driver_path
=
->
{
called
=
true
}
ActionDispatch
::
SystemTesting
::
Driver
.
new
(
:selenium
,
screen_size:
[
1400
,
1400
],
using: :chrome
)
assert
called
ensure
::
Selenium
::
WebDriver
::
Chrome
::
Service
.
driver_path
=
original_driver_path
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录