1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446
|
# frozen_string_literal: true
require 'spec_helper'
RSpec.describe 'Branches', feature_category: :source_code_management do
let_it_be(:user) { create(:user) }
let_it_be(:project) { create(:project, :public, :repository) }
let(:repository) { project.repository }
context 'when logged in as reporter' do
before do
sign_in(user)
project.add_reporter(user)
end
it 'does not show delete button' do
visit project_branches_path(project)
expect(page).not_to have_css '.js-delete-branch-button'
end
end
context 'when 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) do
create_file(message: "a commit in stale-#{i}", branch_name: "stale-#{i}")
end
end
# Add 6 active branches
(1..6).each do |i|
travel_to((threshold - i.hours).ago) do
create_file(message: "a commit in active-#{i}", branch_name: "active-#{i}")
end
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_testid 'branches-dropdown' do
first('span', 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_testid 'branches-dropdown' do
first('span', 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
new_branches_count = 20
sql_queries_count_threshold = 10
control = ActiveRecord::QueryRecorder.new { visit project_branches_path(project) }
(1..new_branches_count).each { |number| repository.add_branch(user, "new-branch-#{number}", 'master') }
expect { visit project_branches_filtered_path(project, state: 'all') }
.not_to exceed_query_limit(control).with_threshold(sql_queries_count_threshold)
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')
clear_search_input
expect(page).not_to have_content('fix')
expect(all('.all-branches', wait: false).last).to have_selector('li', count: 0)
end
end
describe 'Link to branch rules' do
it 'does not have possibility to navigate to branch rules', :js do
expect(page).not_to have_content(s_("Branches|View branch rules"))
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 'when 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 'New'
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 'New'
end
end
describe 'Navigate to branch rules from branches page' do
it 'shows repository settings page with Branch rules section expanded' do
visit project_branches_path(project)
view_branch_rules
expect(page).to have_content(
_('Define rules for who can push, merge, and the required approvals for each branch.'))
end
end
end
end
describe 'merge request badge', :js do
let_it_be(:project) { create(:project, :public, :repository) }
let_it_be(:merge_request) do
create(
:merge_request,
source_project: project,
target_project: project,
target_branch: 'master',
source_branch: 'feature'
)
end
before_all do
project.project_feature.update_column(:merge_requests_access_level, ProjectFeature::PRIVATE)
end
context 'when user has access to merge requests' do
before do
project.add_maintainer(user)
sign_in(user)
visit project_branches_path(project)
end
it 'shows merge request badge' do
expect(page).to have_selector('.gl-badge', text: merge_request.to_reference)
end
end
context 'when user does not have access to merge requests' do
before do
sign_in(user)
visit project_branches_path(project)
end
it 'shows merge request badge' do
expect(page).not_to have_selector('.gl-badge', text: merge_request.to_reference)
end
end
end
context 'when 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 'New'
end
end
end
context 'with one or more pipeline', :js do
let_it_be(: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 '[data-testid="status_success_borderless-icon"]'
end
end
it 'displays a placeholder when not available' do
page.all('.all-branches li') do |li|
expect(li).to have_css '.pipeline-status 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 '.pipeline-status 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
wait_for_requests
within_testid('branch-more-actions') do
find('.gl-new-dropdown-toggle').click
end
click_link 'Compare'
end
expect(page).to have_content 'Commits'
end
end
context 'on a read-only instance', :js 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', :js 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(branch_name:, message: 'message')
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 clear_search_input
find('input[data-testid="branch-search"]').set('')
end
def delete_branch_and_confirm
wait_for_requests
within_testid('branch-more-actions', match: :first) do
find('.gl-new-dropdown-toggle', match: :first).click
end
find_by_testid('delete-branch-button').click
within '.modal-footer' do
click_button 'Yes, delete branch'
end
end
def view_branch_rules
page.within('.nav-controls') do
click_link s_("Branches|View branch rules")
end
wait_for_requests
end
end
|