Commit 4c61c467 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Add tests to Dashboard#merge_requests filter

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 5953582b
= form_tag filter_path(entity), method: 'get' do = form_tag filter_path(entity), method: 'get' do
%fieldset %fieldset.scope-filter
%ul.nav.nav-pills.nav-stacked %ul.nav.nav-pills.nav-stacked
%li{class: ("active" if params[:scope].blank?)} %li{class: ("active" if params[:scope].blank?)}
= link_to filter_path(entity, scope: nil) do = link_to filter_path(entity, scope: nil) do
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
= link_to filter_path(entity, scope: 'all') do = link_to filter_path(entity, scope: 'all') do
All All
%fieldset %fieldset.status-filter
%ul.nav.nav-pills.nav-stacked %ul.nav.nav-pills.nav-stacked
%li{class: ("active" if params[:status].blank?)} %li{class: ("active" if params[:status].blank?)}
= link_to filter_path(entity, status: nil) do = link_to filter_path(entity, status: nil) do
......
...@@ -2,7 +2,17 @@ Feature: Dashboard Merge Requests ...@@ -2,7 +2,17 @@ Feature: Dashboard Merge Requests
Background: Background:
Given I sign in as a user Given I sign in as a user
And I have authored merge requests And I have authored merge requests
And I have assigned merge requests
And I have other merge requests
And I visit dashboard merge requests page And I visit dashboard merge requests page
Scenario: I should see projects list Scenario: I should see assigned merge_requests
Then I should see my merge requests Then I should see merge requests assigned to me
Scenario: I should see authored merge_requests
When I click "Authored by me" link
Then I should see merge requests authored by me
Scenario: I should see all merge_requests
When I click "All" link
Then I should see all merge requests
...@@ -2,28 +2,73 @@ class DashboardMergeRequests < Spinach::FeatureSteps ...@@ -2,28 +2,73 @@ class DashboardMergeRequests < Spinach::FeatureSteps
include SharedAuthentication include SharedAuthentication
include SharedPaths include SharedPaths
Then 'I should see my merge requests' do step 'I should see merge requests assigned to me' do
merge_requests = @user.merge_requests should_see(assigned_merge_request)
merge_requests.each do |mr| should_not_see(authored_merge_request)
page.should have_content(mr.title[0..10]) should_not_see(other_merge_request)
page.should have_content(mr.target_project.name)
page.should have_content(mr.source_project.name)
end end
step 'I should see merge requests authored by me' do
should_see(authored_merge_request)
should_not_see(assigned_merge_request)
should_not_see(other_merge_request)
end
step 'I should see all merge requests' do
should_see(authored_merge_request)
should_see(assigned_merge_request)
should_see(other_merge_request)
end
step 'I have authored merge requests' do
authored_merge_request
end
step 'I have assigned merge requests' do
assigned_merge_request
end end
And 'I have authored merge requests' do step 'I have other merge requests' do
project1_source = create :project other_merge_request
project1_target= create :project end
project2_source = create :project
project2_target = create :project
step 'I click "Authored by me" link' do
within ".scope-filter" do
click_link 'Authored by me'
end
end
project1_source.team << [@user, :master] step 'I click "All" link' do
project1_target.team << [@user, :master] within ".scope-filter" do
project2_source.team << [@user, :master] click_link 'All'
project2_target.team << [@user, :master] end
end
merge_request1 = create :merge_request, author: @user, source_project: project1_source, target_project: project1_target def should_see(merge_request)
merge_request2 = create :merge_request, author: @user, source_project: project2_source, target_project: project2_target page.should have_content(merge_request.title[0..10])
end
def should_not_see(merge_request)
page.should_not have_content(merge_request.title[0..10])
end
def assigned_merge_request
@assigned_merge_request ||= create :merge_request, assignee: current_user, target_project: project
end
def authored_merge_request
@authored_merge_request ||= create :merge_request, author: current_user, target_project: project
end
def other_merge_request
@other_merge_request ||= create :merge_request, target_project: project
end
def project
@project ||= begin
project =create :project_with_code
project.team << [current_user, :master]
project
end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment