Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
3ac444b8
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,发现更多精彩内容 >>
提交
3ac444b8
编写于
10月 11, 2017
作者:
J
Jose Ivan Vargas
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix trigger elements and element is not clickable at this position
上级
59bb5bc5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
11 deletion
+13
-11
spec/features/projects/merge_requests/user_comments_on_diff_spec.rb
...res/projects/merge_requests/user_comments_on_diff_spec.rb
+7
-5
spec/features/protected_branches_spec.rb
spec/features/protected_branches_spec.rb
+4
-4
spec/support/shared_examples/features/protected_branches_access_control_ce.rb
...examples/features/protected_branches_access_control_ce.rb
+2
-2
未找到文件。
spec/features/projects/merge_requests/user_comments_on_diff_spec.rb
浏览文件 @
3ac444b8
...
...
@@ -31,7 +31,7 @@ describe 'User comments on a diff', :js do
page
.
within
(
'.files > div:nth-child(3)'
)
do
expect
(
page
).
to
have_content
(
'Line is wrong'
)
find
(
'.js-toggle-diff-comments'
).
trigger
(
'click'
)
find
(
'.js-toggle-diff-comments'
).
click
expect
(
page
).
not_to
have_content
(
'Line is wrong'
)
end
...
...
@@ -64,7 +64,7 @@ describe 'User comments on a diff', :js do
# Hide the comment.
page
.
within
(
'.files > div:nth-child(3)'
)
do
find
(
'.js-toggle-diff-comments'
).
trigger
(
'click'
)
find
(
'.js-toggle-diff-comments'
).
click
expect
(
page
).
not_to
have_content
(
'Line is wrong'
)
end
...
...
@@ -77,7 +77,7 @@ describe 'User comments on a diff', :js do
# Show the comment.
page
.
within
(
'.files > div:nth-child(3)'
)
do
find
(
'.js-toggle-diff-comments'
).
trigger
(
'click'
)
find
(
'.js-toggle-diff-comments'
).
click
end
# Now both the comments should be shown.
...
...
@@ -90,7 +90,9 @@ describe 'User comments on a diff', :js do
end
# Check the same comments in the side-by-side view.
click_link
(
'Side-by-side'
)
page
.
execute_script
(
"document.querySelector('#parallel-diff-btn').click()"
)
wait_for_requests
...
...
@@ -157,7 +159,7 @@ describe 'User comments on a diff', :js do
end
page
.
within
(
'.merge-request-tabs'
)
do
find
(
'.notes-tab'
).
trigger
(
'click'
)
find
(
'.notes-tab'
).
click
end
wait_for_requests
...
...
spec/features/protected_branches_spec.rb
浏览文件 @
3ac444b8
...
...
@@ -48,7 +48,7 @@ feature 'Protected Branches', :js do
expect
(
page
).
to
have_content
(
'fix'
)
expect
(
find
(
'.all-branches'
)).
to
have_selector
(
'li'
,
count:
1
)
page
.
find
(
'[data-target="#modal-delete-branch"]'
).
trigger
(
:click
)
page
.
find
(
'[data-target="#modal-delete-branch"]'
).
click
expect
(
page
).
to
have_css
(
'.js-delete-branch[disabled]'
)
fill_in
'delete_branch_input'
,
with:
'fix'
...
...
@@ -67,9 +67,9 @@ feature 'Protected Branches', :js do
form
=
'.js-new-protected-branch'
within
form
do
find
(
".js-allowed-to-merge"
).
trigger
(
'click'
)
find
(
".js-allowed-to-merge"
).
click
click_link
'No one'
find
(
".js-allowed-to-push"
).
trigger
(
'click'
)
find
(
".js-allowed-to-push"
).
click
click_link
'Developers + Masters'
end
...
...
@@ -171,7 +171,7 @@ feature 'Protected Branches', :js do
end
def
set_protected_branch_name
(
branch_name
)
find
(
".js-protected-branch-select"
).
trigger
(
'click'
)
find
(
".js-protected-branch-select"
).
click
find
(
".dropdown-input-field"
).
set
(
branch_name
)
click_on
(
"Create wildcard
#{
branch_name
}
"
)
end
...
...
spec/support/shared_examples/features/protected_branches_access_control_ce.rb
浏览文件 @
3ac444b8
...
...
@@ -34,7 +34,7 @@ shared_examples "protected branches > access control > CE" do
within
(
'.js-allowed-to-push-container'
)
do
expect
(
first
(
"li"
)).
to
have_content
(
"Roles"
)
click_on
access_type_name
find
(
:link
,
access_type_name
).
click
end
end
...
...
@@ -79,7 +79,7 @@ shared_examples "protected branches > access control > CE" do
within
(
'.js-allowed-to-merge-container'
)
do
expect
(
first
(
"li"
)).
to
have_content
(
"Roles"
)
click_on
access_type_name
find
(
:link
,
access_type_name
).
click
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录