diff options
author | Marin Jankovski <maxlazio@gmail.com> | 2014-10-27 11:53:35 +0300 |
---|---|---|
committer | Marin Jankovski <maxlazio@gmail.com> | 2014-10-27 11:53:35 +0300 |
commit | 5e017a4566495b0024ab065e7ceab279ff77e030 (patch) | |
tree | df507addbba25018149d604061117b0520c3a051 /features/steps/dashboard | |
parent | 93532432dce129e9075ffa18bc99d77019f63eb2 (diff) |
Assigned merge request should show on dashboard mr overiew feature spec.
Diffstat (limited to 'features/steps/dashboard')
-rw-r--r-- | features/steps/dashboard/merge_requests.rb | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/features/steps/dashboard/merge_requests.rb b/features/steps/dashboard/merge_requests.rb index 64ba04079e6..75e53173d3f 100644 --- a/features/steps/dashboard/merge_requests.rb +++ b/features/steps/dashboard/merge_requests.rb @@ -4,7 +4,9 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps step 'I should see merge requests assigned to me' do should_see(assigned_merge_request) + should_see(assigned_merge_request_from_fork) should_not_see(authored_merge_request) + should_not_see(authored_merge_request_from_fork) should_not_see(other_merge_request) end @@ -12,6 +14,7 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps should_see(authored_merge_request) should_see(authored_merge_request_from_fork) should_not_see(assigned_merge_request) + should_not_see(assigned_merge_request_from_fork) should_not_see(other_merge_request) end @@ -28,6 +31,7 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps step 'I have assigned merge requests' do assigned_merge_request + assigned_merge_request_from_fork end step 'I have other merge requests' do @@ -55,7 +59,10 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps end 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 def authored_merge_request @@ -81,6 +88,14 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps source_project: forked_project 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 @project ||= begin project =create :project |