Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
555c25e6
Commit
555c25e6
authored
Feb 18, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix random failing test
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
d169ae13
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
13 deletions
+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
No files found.
features/project/merge_requests.feature
View file @
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
View file @
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment