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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
fa88f2c0
Commit
fa88f2c0
authored
Jul 16, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use real branches from test repo
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
abd2bc00
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
features/steps/dashboard/merge_requests.rb
features/steps/dashboard/merge_requests.rb
+4
-4
No files found.
features/steps/dashboard/merge_requests.rb
View file @
fa88f2c0
...
@@ -66,7 +66,7 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
...
@@ -66,7 +66,7 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
def
authored_merge_request
def
authored_merge_request
@authored_merge_request
||=
create
:merge_request
,
@authored_merge_request
||=
create
:merge_request
,
source_branch:
'
simple_merge_request
'
,
source_branch:
'
markdown
'
,
author:
current_user
,
author:
current_user
,
target_project:
project
,
target_project:
project
,
source_project:
project
source_project:
project
...
@@ -74,14 +74,14 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
...
@@ -74,14 +74,14 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
def
other_merge_request
def
other_merge_request
@other_merge_request
||=
create
:merge_request
,
@other_merge_request
||=
create
:merge_request
,
source_branch:
'
2_3_notes_
fix'
,
source_branch:
'fix'
,
target_project:
project
,
target_project:
project
,
source_project:
project
source_project:
project
end
end
def
authored_merge_request_from_fork
def
authored_merge_request_from_fork
@authored_merge_request_from_fork
||=
create
:merge_request
,
@authored_merge_request_from_fork
||=
create
:merge_request
,
source_branch:
'
basic_page
'
,
source_branch:
'
feature_conflict
'
,
author:
current_user
,
author:
current_user
,
target_project:
public_project
,
target_project:
public_project
,
source_project:
forked_project
source_project:
forked_project
...
@@ -89,7 +89,7 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
...
@@ -89,7 +89,7 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
def
assigned_merge_request_from_fork
def
assigned_merge_request_from_fork
@assigned_merge_request_from_fork
||=
create
:merge_request
,
@assigned_merge_request_from_fork
||=
create
:merge_request
,
source_branch:
'
basic_page_fix
'
,
source_branch:
'
markdown
'
,
assignee:
current_user
,
assignee:
current_user
,
target_project:
public_project
,
target_project:
public_project
,
source_project:
forked_project
source_project:
forked_project
...
...
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