Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
731d574d
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,体验更适合开发者的 AI 搜索 >>
提交
731d574d
编写于
4月 01, 2017
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
差异文件
Merge branch '30236-fix-capybara-timeouts' into 'master'
Increase Capybara's timeout Closes #30236 See merge request !10337
上级
b54acba8
2fa56074
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
13 deletion
+12
-13
features/support/capybara.rb
features/support/capybara.rb
+2
-2
spec/support/capybara.rb
spec/support/capybara.rb
+7
-3
spec/support/test_env.rb
spec/support/test_env.rb
+3
-8
未找到文件。
features/support/capybara.rb
浏览文件 @
731d574d
...
...
@@ -3,7 +3,7 @@ require 'capybara/poltergeist'
require
'capybara-screenshot/spinach'
# Give CI some extra time
timeout
=
(
ENV
[
'CI'
]
||
ENV
[
'CI_SERVER'
])
?
30
:
1
0
timeout
=
(
ENV
[
'CI'
]
||
ENV
[
'CI_SERVER'
])
?
60
:
3
0
Capybara
.
javascript_driver
=
:poltergeist
Capybara
.
register_driver
:poltergeist
do
|
app
|
...
...
@@ -25,5 +25,5 @@ Capybara.ignore_hidden_elements = false
Capybara
::
Screenshot
.
prune_strategy
=
:keep_last_run
Spinach
.
hooks
.
before_run
do
TestEnv
.
warm_asset_cache
unless
ENV
[
'CI'
]
||
ENV
[
'CI_SERVER'
]
TestEnv
.
eager_load_driver_server
end
spec/support/capybara.rb
浏览文件 @
731d574d
# rubocop:disable Style/GlobalVars
require
'capybara/rails'
require
'capybara/rspec'
require
'capybara/poltergeist'
require
'capybara-screenshot/rspec'
# Give CI some extra time
timeout
=
(
ENV
[
'CI'
]
||
ENV
[
'CI_SERVER'
])
?
30
:
1
0
timeout
=
(
ENV
[
'CI'
]
||
ENV
[
'CI_SERVER'
])
?
60
:
3
0
Capybara
.
javascript_driver
=
:poltergeist
Capybara
.
register_driver
:poltergeist
do
|
app
|
...
...
@@ -26,7 +27,10 @@ Capybara.ignore_hidden_elements = true
Capybara
::
Screenshot
.
prune_strategy
=
:keep_last_run
RSpec
.
configure
do
|
config
|
config
.
before
(
:suite
)
do
TestEnv
.
warm_asset_cache
config
.
before
(
:context
,
:js
)
do
next
if
$capybara_server_already_started
TestEnv
.
eager_load_driver_server
$capybara_server_already_started
=
true
end
end
spec/support/test_env.rb
浏览文件 @
731d574d
...
...
@@ -169,16 +169,11 @@ module TestEnv
#
# Otherwise they'd be created by the first test, often timing out and
# causing a transient test failure
def
warm_asset_cache
return
if
warm_asset_cache?
def
eager_load_driver_server
return
unless
defined?
(
Capybara
)
Capybara
.
current_session
.
driver
.
visit
'/'
end
def
warm_asset_cache?
cache
=
Rails
.
root
.
join
(
*
%w(tmp cache assets test)
)
Dir
.
exist?
(
cache
)
&&
Dir
.
entries
(
cache
).
length
>
2
puts
"Starting the Capybara driver' server..."
Capybara
.
current_session
.
visit
'/'
end
private
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录