From c9ebdf468d0ffc669b2ac9c388730d6c3f2741a2 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 4 Jun 2021 00:10:03 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/features/projects/blobs/blob_show_spec.rb | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'spec/features/projects/blobs') diff --git a/spec/features/projects/blobs/blob_show_spec.rb b/spec/features/projects/blobs/blob_show_spec.rb index 3598aa2f423..595304789a6 100644 --- a/spec/features/projects/blobs/blob_show_spec.rb +++ b/spec/features/projects/blobs/blob_show_spec.rb @@ -172,7 +172,7 @@ RSpec.describe 'File blob', :js do end end - context 'sucessfully change ref of similar name' do + context 'successfully change ref of similar name' do before do project.repository.create_branch('dev') project.repository.create_branch('development') @@ -182,14 +182,32 @@ RSpec.describe 'File blob', :js do visit_blob('files/js/application.js', ref: 'development') switch_ref_to('dev') - expect(page.find('.file-title-name').text).to eq('application.js') + aggregate_failures do + expect(page.find('.file-title-name').text).to eq('application.js') + expect(page).not_to have_css('flash-container') + end end it 'switch ref from shorter to longer ref name' do visit_blob('files/js/application.js', ref: 'dev') switch_ref_to('development') + aggregate_failures do + expect(page.find('.file-title-name').text).to eq('application.js') + expect(page).not_to have_css('flash-container') + end + end + end + + it 'successfully changes ref when the ref name matches the project name' do + project.repository.create_branch(project.name) + + visit_blob('files/js/application.js', ref: project.name) + switch_ref_to('master') + + aggregate_failures do expect(page.find('.file-title-name').text).to eq('application.js') + expect(page).not_to have_css('flash-container') end end end -- cgit v1.2.1