334 lines
10 KiB
Ruby
334 lines
10 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'spec_helper'
|
|
|
|
RSpec.describe 'Branches' do
|
|
let(:user) { create(:user) }
|
|
let(:project) { create(:project, :public, :repository) }
|
|
let(:repository) { project.repository }
|
|
|
|
context 'logged in as developer' do
|
|
before do
|
|
sign_in(user)
|
|
project.add_developer(user)
|
|
end
|
|
|
|
context 'on the projects with 6 active branches and 4 stale branches' do
|
|
let(:project) { create(:project, :public, :empty_repo) }
|
|
let(:repository) { project.repository }
|
|
let(:threshold) { Gitlab::Git::Branch::STALE_BRANCH_THRESHOLD }
|
|
|
|
before do
|
|
# Add 4 stale branches
|
|
(1..4).reverse_each do |i|
|
|
travel_to((threshold + i.hours).ago) { create_file(message: "a commit in stale-#{i}", branch_name: "stale-#{i}") }
|
|
end
|
|
# Add 6 active branches
|
|
(1..6).each do |i|
|
|
travel_to((threshold - i.hours).ago) { create_file(message: "a commit in active-#{i}", branch_name: "active-#{i}") }
|
|
end
|
|
end
|
|
|
|
describe 'Overview page of the branches' do
|
|
it 'shows the first 5 active branches and the first 4 stale branches sorted by last updated' do
|
|
visit project_branches_path(project)
|
|
|
|
expect(page).to have_content(sorted_branches(repository, count: 5, sort_by: :updated_desc, state: 'active'))
|
|
expect(page).to have_content(sorted_branches(repository, count: 4, sort_by: :updated_asc, state: 'stale'))
|
|
|
|
expect(page).to have_button('Copy branch name')
|
|
|
|
expect(page).to have_link('Show more active branches', href: project_branches_filtered_path(project, state: 'active'))
|
|
expect(page).not_to have_content('Show more stale branches')
|
|
end
|
|
end
|
|
|
|
describe 'Active branches page' do
|
|
it 'shows 6 active branches sorted by last updated' do
|
|
visit project_branches_filtered_path(project, state: 'active')
|
|
|
|
expect(page).to have_content(sorted_branches(repository, count: 6, sort_by: :updated_desc, state: 'active'))
|
|
end
|
|
end
|
|
|
|
describe 'Stale branches page' do
|
|
it 'shows 4 stale branches sorted by last updated' do
|
|
visit project_branches_filtered_path(project, state: 'stale')
|
|
|
|
expect(page).to have_content(sorted_branches(repository, count: 4, sort_by: :updated_asc, state: 'stale'))
|
|
end
|
|
end
|
|
|
|
describe 'All branches page' do
|
|
it 'shows 10 branches sorted by last updated' do
|
|
visit project_branches_filtered_path(project, state: 'all')
|
|
|
|
expect(page).to have_content(sorted_branches(repository, count: 10, sort_by: :updated_desc))
|
|
end
|
|
end
|
|
|
|
context 'with branches over more than one page' do
|
|
before do
|
|
allow(Kaminari.config).to receive(:default_per_page).and_return(5)
|
|
end
|
|
|
|
it 'shows only default_per_page active branches sorted by last updated' do
|
|
visit project_branches_filtered_path(project, state: 'active')
|
|
|
|
expect(page).to have_content(sorted_branches(repository, count: Kaminari.config.default_per_page, sort_by: :updated_desc, state: 'active'))
|
|
end
|
|
|
|
it 'shows only default_per_page branches sorted by last updated on All branches' do
|
|
visit project_branches_filtered_path(project, state: 'all')
|
|
|
|
expect(page).to have_content(sorted_branches(repository, count: Kaminari.config.default_per_page, sort_by: :updated_desc))
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'Find branches' do
|
|
it 'shows filtered branches', :js do
|
|
visit project_branches_path(project)
|
|
|
|
search_for_branch('fix')
|
|
|
|
expect(page).to have_content('fix')
|
|
expect(find('.all-branches')).to have_selector('li', count: 1)
|
|
end
|
|
end
|
|
|
|
describe 'Delete unprotected branch on Overview' do
|
|
it 'removes branch after confirmation', :js do
|
|
visit project_branches_filtered_path(project, state: 'all')
|
|
|
|
expect(all('.all-branches').last).to have_selector('li', count: 20)
|
|
|
|
delete_branch_and_confirm
|
|
|
|
expect(page).to have_content('Branch was deleted')
|
|
end
|
|
end
|
|
|
|
describe 'All branches page' do
|
|
it 'shows all the branches sorted by last updated by default' do
|
|
visit project_branches_filtered_path(project, state: 'all')
|
|
|
|
expect(page).to have_content(sorted_branches(repository, count: 20, sort_by: :updated_desc))
|
|
end
|
|
|
|
it 'sorts the branches by name', :js do
|
|
visit project_branches_filtered_path(project, state: 'all')
|
|
|
|
click_button "Updated date" # Open sorting dropdown
|
|
within '[data-testid="branches-dropdown"]' do
|
|
find('p', text: 'Name').click
|
|
end
|
|
|
|
expect(page).to have_content(sorted_branches(repository, count: 20, sort_by: :name))
|
|
end
|
|
|
|
it 'sorts the branches by oldest updated', :js do
|
|
visit project_branches_filtered_path(project, state: 'all')
|
|
|
|
click_button "Updated date" # Open sorting dropdown
|
|
within '[data-testid="branches-dropdown"]' do
|
|
find('p', text: 'Oldest updated').click
|
|
end
|
|
|
|
expect(page).to have_content(sorted_branches(repository, count: 20, sort_by: :updated_asc))
|
|
end
|
|
|
|
it 'avoids a N+1 query in branches index' do
|
|
control_count = ActiveRecord::QueryRecorder.new { visit project_branches_path(project) }.count
|
|
|
|
%w(one two three four five).each { |ref| repository.add_branch(user, ref, 'master') }
|
|
|
|
expect { visit project_branches_filtered_path(project, state: 'all') }.not_to exceed_query_limit(control_count)
|
|
end
|
|
end
|
|
|
|
describe 'Find branches on All branches' do
|
|
it 'shows filtered branches', :js do
|
|
visit project_branches_filtered_path(project, state: 'all')
|
|
|
|
search_for_branch('fix')
|
|
|
|
expect(page).to have_content('fix')
|
|
expect(find('.all-branches')).to have_selector('li', count: 1)
|
|
end
|
|
end
|
|
|
|
describe 'Delete unprotected branch on All branches' do
|
|
it 'removes branch after confirmation', :js do
|
|
visit project_branches_filtered_path(project, state: 'all')
|
|
|
|
search_for_branch('fix')
|
|
|
|
expect(all('.all-branches').last).to have_selector('li', count: 1)
|
|
|
|
delete_branch_and_confirm
|
|
|
|
expect(page).to have_content('Branch was deleted')
|
|
|
|
page.refresh
|
|
|
|
search_for_branch('fix')
|
|
|
|
expect(page).not_to have_content('fix')
|
|
expect(all('.all-branches').last).to have_selector('li', count: 0)
|
|
end
|
|
end
|
|
|
|
context 'on project with 0 branch' do
|
|
let(:project) { create(:project, :public, :empty_repo) }
|
|
let(:repository) { project.repository }
|
|
|
|
describe '0 branches on Overview' do
|
|
it 'shows warning' do
|
|
visit project_branches_path(project)
|
|
|
|
expect(page).not_to have_selector('.all-branches')
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'logged in as maintainer' do
|
|
before do
|
|
sign_in(user)
|
|
project.add_maintainer(user)
|
|
end
|
|
|
|
it 'shows the merge request button' do
|
|
visit project_branches_path(project)
|
|
|
|
page.within first('.all-branches li') do
|
|
expect(page).to have_content 'Merge request'
|
|
end
|
|
end
|
|
|
|
context 'when the project is archived' do
|
|
let(:project) { create(:project, :public, :repository, :archived) }
|
|
|
|
it 'does not show the merge request button when the project is archived' do
|
|
visit project_branches_path(project)
|
|
|
|
page.within first('.all-branches li') do
|
|
expect(page).not_to have_content 'Merge request'
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'logged out' do
|
|
before do
|
|
visit project_branches_path(project)
|
|
end
|
|
|
|
it 'does not show merge request button' do
|
|
page.within first('.all-branches li') do
|
|
expect(page).not_to have_content 'Merge request'
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'with one or more pipeline', :js do
|
|
let(:project) { create(:project, :public, :empty_repo) }
|
|
|
|
before do
|
|
sha = create_file(branch_name: "branch")
|
|
create(:ci_pipeline,
|
|
project: project,
|
|
user: user,
|
|
ref: "branch",
|
|
sha: sha,
|
|
status: :success,
|
|
created_at: 5.months.ago)
|
|
visit project_branches_path(project)
|
|
end
|
|
|
|
it 'shows pipeline status when available' do
|
|
page.within first('.all-branches li') do
|
|
expect(page).to have_css 'a.ci-status-icon-success'
|
|
end
|
|
end
|
|
|
|
it 'displays a placeholder when not available' do
|
|
page.all('.all-branches li') do |li|
|
|
expect(li).to have_css 'svg.s24'
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'with no pipelines', :js do
|
|
before do
|
|
visit project_branches_path(project)
|
|
end
|
|
|
|
it 'does not show placeholder or pipeline status' do
|
|
page.all('.all-branches') do |branches|
|
|
expect(branches).not_to have_css 'svg.s24'
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'comparing branches' do
|
|
before do
|
|
sign_in(user)
|
|
project.add_developer(user)
|
|
end
|
|
|
|
shared_examples 'compares branches' do
|
|
it 'compares branches' do
|
|
visit project_branches_path(project)
|
|
|
|
page.within first('.all-branches li') do
|
|
click_link 'Compare'
|
|
end
|
|
|
|
expect(page).to have_content 'Commits'
|
|
end
|
|
end
|
|
|
|
context 'on a read-only instance' do
|
|
before do
|
|
allow(Gitlab::Database).to receive(:read_only?).and_return(true)
|
|
end
|
|
|
|
it_behaves_like 'compares branches'
|
|
end
|
|
|
|
context 'on a read-write instance' do
|
|
it_behaves_like 'compares branches'
|
|
end
|
|
end
|
|
|
|
def sorted_branches(repository, count:, sort_by:, state: nil)
|
|
branches = repository.branches_sorted_by(sort_by)
|
|
branches = branches.select { |b| state == 'active' ? b.active? : b.stale? } if state
|
|
sorted_branches =
|
|
branches.first(count).map do |branch|
|
|
Regexp.escape(branch.name)
|
|
end
|
|
|
|
Regexp.new(sorted_branches.join('.*'))
|
|
end
|
|
|
|
def create_file(message: 'message', branch_name:)
|
|
repository.create_file(user, generate(:branch), 'content', message: message, branch_name: branch_name)
|
|
end
|
|
|
|
def search_for_branch(name)
|
|
branch_search = find('input[data-testid="branch-search"]')
|
|
branch_search.set(name)
|
|
branch_search.native.send_keys(:enter)
|
|
end
|
|
|
|
def delete_branch_and_confirm
|
|
find('.js-delete-branch-button', match: :first).click
|
|
|
|
within '.modal-footer' do
|
|
click_button 'Yes, delete branch'
|
|
end
|
|
end
|
|
end
|