Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
555c25e6
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 搜索 >>
未验证
提交
555c25e6
编写于
2月 18, 2014
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix random failing test
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
d169ae13
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
0 addition
and
13 deletion
+0
-13
features/project/merge_requests.feature
features/project/merge_requests.feature
+0
-1
features/steps/project/project_merge_requests.rb
features/steps/project/project_merge_requests.rb
+0
-12
未找到文件。
features/project/merge_requests.feature
浏览文件 @
555c25e6
...
...
@@ -29,7 +29,6 @@ Feature: Project Merge Requests
And
I click link
"Close"
Then
I should see closed merge request
"Bug NS-04"
@javascript
Scenario
:
I
submit new unassigned merge request
Given
I click link
"New Merge Request"
And
I submit new merge request
"Wiki Feature"
...
...
features/steps/project/project_merge_requests.rb
浏览文件 @
555c25e6
...
...
@@ -60,20 +60,8 @@ class ProjectMergeRequests < Spinach::FeatureSteps
step
'I submit new merge request "Wiki Feature"'
do
fill_in
"merge_request_title"
,
with:
"Wiki Feature"
# this must come first, so that the target branch is set
# by the time the "select" for "notes_refactoring" is executed
select
project
.
path_with_namespace
,
from:
"merge_request_target_project_id"
select
"master"
,
from:
"merge_request_source_branch"
find
(
:select
,
"merge_request_target_project_id"
,
{}).
value
.
should
==
project
.
id
.
to_s
find
(
:select
,
"merge_request_source_project_id"
,
{}).
value
.
should
==
project
.
id
.
to_s
# using "notes_refactoring" because "Bug NS-04" uses master/stable,
# this will fail merge_request validation if the branches are the same
find
(
:select
,
"merge_request_target_branch"
,
{}).
find
(
:option
,
"notes_refactoring"
,
{}).
value
.
should
==
"notes_refactoring"
select
"notes_refactoring"
,
from:
"merge_request_target_branch"
click_button
"Submit merge request"
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录