2017-04-05 08:43:03 -04:00
|
|
|
require 'spec_helper'
|
|
|
|
|
2017-06-25 04:14:07 -04:00
|
|
|
feature 'Dashboard Merge Requests' do
|
|
|
|
include FilterItemSelectHelper
|
2017-07-14 09:36:37 -04:00
|
|
|
include SortingHelper
|
2017-06-25 04:14:07 -04:00
|
|
|
|
2017-04-05 08:43:03 -04:00
|
|
|
let(:current_user) { create :user }
|
2017-08-02 15:55:11 -04:00
|
|
|
let(:project) { create(:project) }
|
2017-04-05 08:43:03 -04:00
|
|
|
|
2017-08-02 15:55:11 -04:00
|
|
|
let(:public_project) { create(:project, :public, :repository) }
|
2017-06-25 04:14:07 -04:00
|
|
|
let(:forked_project) { Projects::ForkService.new(public_project, current_user).execute }
|
2017-05-30 00:35:49 -04:00
|
|
|
|
2017-06-25 04:14:07 -04:00
|
|
|
before do
|
|
|
|
project.add_master(current_user)
|
|
|
|
sign_in(current_user)
|
2017-04-05 08:43:03 -04:00
|
|
|
end
|
|
|
|
|
2017-06-25 04:14:07 -04:00
|
|
|
context 'new merge request dropdown' do
|
2017-08-02 15:55:11 -04:00
|
|
|
let(:project_with_disabled_merge_requests) { create(:project, :merge_requests_disabled) }
|
2017-06-25 04:14:07 -04:00
|
|
|
|
2017-06-14 14:18:56 -04:00
|
|
|
before do
|
2017-06-25 04:14:07 -04:00
|
|
|
project_with_disabled_merge_requests.add_master(current_user)
|
2017-06-14 14:18:56 -04:00
|
|
|
visit merge_requests_dashboard_path
|
|
|
|
end
|
2017-05-30 00:35:49 -04:00
|
|
|
|
|
|
|
it 'shows projects only with merge requests feature enabled', js: true do
|
|
|
|
find('.new-project-item-select-button').trigger('click')
|
|
|
|
|
|
|
|
page.within('.select2-results') do
|
|
|
|
expect(page).to have_content(project.name_with_namespace)
|
2017-06-25 04:14:07 -04:00
|
|
|
expect(page).not_to have_content(project_with_disabled_merge_requests.name_with_namespace)
|
2017-05-30 00:35:49 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-06-25 04:14:07 -04:00
|
|
|
context 'no merge requests exist' do
|
|
|
|
it 'shows an empty state' do
|
|
|
|
visit merge_requests_dashboard_path(assignee_id: current_user.id)
|
2017-04-05 08:43:03 -04:00
|
|
|
|
2017-06-25 04:14:07 -04:00
|
|
|
expect(page).to have_selector('.empty-state')
|
|
|
|
end
|
2017-04-05 08:43:03 -04:00
|
|
|
end
|
|
|
|
|
2017-06-25 04:14:07 -04:00
|
|
|
context 'merge requests exist' do
|
|
|
|
let!(:assigned_merge_request) do
|
|
|
|
create(:merge_request, assignee: current_user, target_project: project, source_project: project)
|
|
|
|
end
|
|
|
|
|
|
|
|
let!(:assigned_merge_request_from_fork) do
|
|
|
|
create(:merge_request,
|
|
|
|
source_branch: 'markdown', assignee: current_user,
|
|
|
|
target_project: public_project, source_project: forked_project
|
|
|
|
)
|
|
|
|
end
|
2017-04-05 08:43:03 -04:00
|
|
|
|
2017-06-25 04:14:07 -04:00
|
|
|
let!(:authored_merge_request) do
|
|
|
|
create(:merge_request,
|
|
|
|
source_branch: 'markdown', author: current_user,
|
|
|
|
target_project: project, source_project: project
|
|
|
|
)
|
|
|
|
end
|
|
|
|
|
|
|
|
let!(:authored_merge_request_from_fork) do
|
|
|
|
create(:merge_request,
|
|
|
|
source_branch: 'feature_conflict',
|
|
|
|
author: current_user,
|
|
|
|
target_project: public_project, source_project: forked_project
|
|
|
|
)
|
|
|
|
end
|
|
|
|
|
|
|
|
let!(:other_merge_request) do
|
|
|
|
create(:merge_request,
|
|
|
|
source_branch: 'fix',
|
|
|
|
target_project: project, source_project: project
|
|
|
|
)
|
|
|
|
end
|
|
|
|
|
|
|
|
before do
|
2017-04-05 08:43:03 -04:00
|
|
|
visit merge_requests_dashboard_path(assignee_id: current_user.id)
|
|
|
|
end
|
|
|
|
|
2017-06-25 04:14:07 -04:00
|
|
|
it 'shows assigned merge requests' do
|
|
|
|
expect(page).to have_content(assigned_merge_request.title)
|
|
|
|
expect(page).to have_content(assigned_merge_request_from_fork.title)
|
|
|
|
|
|
|
|
expect(page).not_to have_content(authored_merge_request.title)
|
|
|
|
expect(page).not_to have_content(authored_merge_request_from_fork.title)
|
|
|
|
expect(page).not_to have_content(other_merge_request.title)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'shows authored merge requests', js: true do
|
|
|
|
filter_item_select('Any Assignee', '.js-assignee-search')
|
|
|
|
filter_item_select(current_user.to_reference, '.js-author-search')
|
|
|
|
|
|
|
|
expect(page).to have_content(authored_merge_request.title)
|
|
|
|
expect(page).to have_content(authored_merge_request_from_fork.title)
|
|
|
|
|
|
|
|
expect(page).not_to have_content(assigned_merge_request.title)
|
|
|
|
expect(page).not_to have_content(assigned_merge_request_from_fork.title)
|
|
|
|
expect(page).not_to have_content(other_merge_request.title)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'shows all merge requests', js: true do
|
|
|
|
filter_item_select('Any Assignee', '.js-assignee-search')
|
|
|
|
filter_item_select('Any Author', '.js-author-search')
|
|
|
|
|
|
|
|
expect(page).to have_content(authored_merge_request.title)
|
|
|
|
expect(page).to have_content(authored_merge_request_from_fork.title)
|
|
|
|
expect(page).to have_content(assigned_merge_request.title)
|
|
|
|
expect(page).to have_content(assigned_merge_request_from_fork.title)
|
|
|
|
expect(page).to have_content(other_merge_request.title)
|
2017-04-05 08:43:03 -04:00
|
|
|
end
|
2017-07-14 09:36:37 -04:00
|
|
|
|
|
|
|
it 'shows sorted merge requests' do
|
|
|
|
sorting_by('Oldest updated')
|
|
|
|
|
|
|
|
visit merge_requests_dashboard_path(assignee_id: current_user.id)
|
|
|
|
|
|
|
|
expect(find('.issues-filters')).to have_content('Oldest updated')
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'keeps sorting merge requests after visiting Projects MR page' do
|
|
|
|
sorting_by('Oldest updated')
|
|
|
|
|
|
|
|
visit project_merge_requests_path(project)
|
|
|
|
|
|
|
|
expect(find('.issues-filters')).to have_content('Oldest updated')
|
|
|
|
end
|
2017-04-05 08:43:03 -04:00
|
|
|
end
|
|
|
|
end
|