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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
5e017a45
Commit
5e017a45
authored
Oct 27, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Assigned merge request should show on dashboard mr overiew feature spec.
parent
93532432
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
1 deletion
+16
-1
features/steps/dashboard/merge_requests.rb
features/steps/dashboard/merge_requests.rb
+16
-1
No files found.
features/steps/dashboard/merge_requests.rb
View file @
5e017a45
...
@@ -4,7 +4,9 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
...
@@ -4,7 +4,9 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
step
'I should see merge requests assigned to me'
do
step
'I should see merge requests assigned to me'
do
should_see
(
assigned_merge_request
)
should_see
(
assigned_merge_request
)
should_see
(
assigned_merge_request_from_fork
)
should_not_see
(
authored_merge_request
)
should_not_see
(
authored_merge_request
)
should_not_see
(
authored_merge_request_from_fork
)
should_not_see
(
other_merge_request
)
should_not_see
(
other_merge_request
)
end
end
...
@@ -12,6 +14,7 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
...
@@ -12,6 +14,7 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
should_see
(
authored_merge_request
)
should_see
(
authored_merge_request
)
should_see
(
authored_merge_request_from_fork
)
should_see
(
authored_merge_request_from_fork
)
should_not_see
(
assigned_merge_request
)
should_not_see
(
assigned_merge_request
)
should_not_see
(
assigned_merge_request_from_fork
)
should_not_see
(
other_merge_request
)
should_not_see
(
other_merge_request
)
end
end
...
@@ -28,6 +31,7 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
...
@@ -28,6 +31,7 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
step
'I have assigned merge requests'
do
step
'I have assigned merge requests'
do
assigned_merge_request
assigned_merge_request
assigned_merge_request_from_fork
end
end
step
'I have other merge requests'
do
step
'I have other merge requests'
do
...
@@ -55,7 +59,10 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
...
@@ -55,7 +59,10 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
end
end
def
assigned_merge_request
def
assigned_merge_request
@assigned_merge_request
||=
create
:merge_request
,
assignee:
current_user
,
target_project:
project
,
source_project:
project
@assigned_merge_request
||=
create
:merge_request
,
assignee:
current_user
,
target_project:
project
,
source_project:
project
end
end
def
authored_merge_request
def
authored_merge_request
...
@@ -81,6 +88,14 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
...
@@ -81,6 +88,14 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
source_project:
forked_project
source_project:
forked_project
end
end
def
assigned_merge_request_from_fork
@assigned_merge_request_from_fork
||=
create
:merge_request
,
source_branch:
'basic_page_fix'
,
assignee:
current_user
,
target_project:
public_project
,
source_project:
forked_project
end
def
project
def
project
@project
||=
begin
@project
||=
begin
project
=
create
:project
project
=
create
: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