diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /spec/controllers/projects/compare_controller_spec.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'spec/controllers/projects/compare_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects/compare_controller_spec.rb | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/spec/controllers/projects/compare_controller_spec.rb b/spec/controllers/projects/compare_controller_spec.rb index 80a6d3960cd..2412b970342 100644 --- a/spec/controllers/projects/compare_controller_spec.rb +++ b/spec/controllers/projects/compare_controller_spec.rb @@ -156,7 +156,7 @@ RSpec.describe Projects::CompareController do it 'shows a flash message and redirects' do show_request - expect(flash[:alert]).to eq('Invalid branch name') + expect(flash[:alert]).to eq("Invalid branch name(s): master%' AND 2554=4423 AND '%'='") expect(response).to have_gitlab_http_status(:found) end end @@ -169,7 +169,20 @@ RSpec.describe Projects::CompareController do it 'shows a flash message and redirects' do show_request - expect(flash[:alert]).to eq('Invalid branch name') + expect(flash[:alert]).to eq("Invalid branch name(s): master%' AND 2554=4423 AND '%'='") + expect(response).to have_gitlab_http_status(:found) + end + end + + context 'when the both refs are invalid' do + let(:from_project_id) { nil } + let(:from_ref) { "master%' AND 2554=4423 AND '%'='" } + let(:to_ref) { "improve%' =,awesome" } + + it 'shows a flash message and redirects' do + show_request + + expect(flash[:alert]).to eq("Invalid branch name(s): improve%' =,awesome, master%' AND 2554=4423 AND '%'='") expect(response).to have_gitlab_http_status(:found) end end |