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
|
# frozen_string_literal: true
require 'spec_helper'
RSpec.describe Projects::MergeRequestsController, feature_category: :source_code_management do
let_it_be(:merge_request) { create(:merge_request) }
let_it_be(:project) { merge_request.project }
let_it_be(:user) { merge_request.author }
describe 'GET #show' do
let_it_be(:group) { create(:group) }
let_it_be(:user) { create(:user) }
let_it_be(:project) { create(:project, :public, group: group) }
let(:merge_request) { create :merge_request, source_project: project, author: user }
context 'when the author of the merge request is banned', feature_category: :insider_threat do
let_it_be(:user) { create(:user, :banned) }
subject { response }
before do
get project_merge_request_path(project, merge_request)
end
it { is_expected.to have_gitlab_http_status(:not_found) }
end
end
describe 'GET #index' do
let_it_be(:public_project) { create(:project, :public) }
it_behaves_like 'rate limited endpoint', rate_limit_key: :search_rate_limit do
let_it_be(:current_user) { user }
before do
sign_in current_user
end
def request
get project_merge_requests_path(public_project), params: { scope: 'all', search: 'test' }
end
end
it_behaves_like 'rate limited endpoint', rate_limit_key: :search_rate_limit_unauthenticated do
def request
get project_merge_requests_path(public_project), params: { scope: 'all', search: 'test' }
end
end
end
describe 'GET #discussions' do
let_it_be(:discussion) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project) }
let_it_be(:discussion_reply) do
create(:discussion_note_on_merge_request, noteable: merge_request, project: project, in_reply_to: discussion)
end
let_it_be(:state_event) { create(:resource_state_event, merge_request: merge_request) }
let_it_be(:discussion_2) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project) }
let_it_be(:discussion_3) { create(:diff_note_on_merge_request, noteable: merge_request, project: project) }
before do
login_as(user)
end
context 'pagination' do
def get_discussions(**params)
get discussions_project_merge_request_path(project, merge_request, params: params.merge(format: :json))
end
it 'returns paginated notes and cursor based on per_page param' do
get_discussions(per_page: 2)
discussions = Gitlab::Json.parse(response.body)
notes = discussions.flat_map { |d| d['notes'] }
expect(discussions.count).to eq(2)
expect(notes).to match(
[
a_hash_including('id' => discussion.id.to_s),
a_hash_including('id' => discussion_reply.id.to_s),
a_hash_including('type' => 'StateNote')
])
cursor = response.header['X-Next-Page-Cursor']
expect(cursor).to be_present
get_discussions(per_page: 1, cursor: cursor)
discussions = Gitlab::Json.parse(response.body)
notes = discussions.flat_map { |d| d['notes'] }
expect(discussions.count).to eq(1)
expect(notes).to match([a_hash_including('id' => discussion_2.id.to_s)])
end
end
end
context 'token authentication' do
context 'when public project' do
let_it_be(:public_project) { create(:project, :public) }
it_behaves_like 'authenticates sessionless user for the request spec', 'index atom', public_resource: true do
let(:url) { project_merge_requests_url(public_project, format: :atom) }
end
end
context 'when private project' do
let_it_be(:private_project) { create(:project, :private) }
it_behaves_like 'authenticates sessionless user for the request spec', 'index atom',
public_resource: false,
ignore_metrics: true do
let(:url) { project_merge_requests_url(private_project, format: :atom) }
before do
private_project.add_maintainer(user)
end
end
end
end
describe 'GET #pipelines.json' do
before do
login_as(user)
end
it 'avoids N+1 queries', :use_sql_query_cache do
create_pipeline
# warm up
get pipelines_project_merge_request_path(project, merge_request, format: :json)
control = ActiveRecord::QueryRecorder.new(skip_cached: false) do
get pipelines_project_merge_request_path(project, merge_request, format: :json)
end
expect(response).to have_gitlab_http_status(:ok)
expect(Gitlab::Json.parse(response.body)['count']['all']).to eq(1)
create_pipeline
expect do
get pipelines_project_merge_request_path(project, merge_request, format: :json)
end.to issue_same_number_of_queries_as(control)
expect(response).to have_gitlab_http_status(:ok)
expect(Gitlab::Json.parse(response.body)['count']['all']).to eq(2)
end
context 'when there are pipelines with failed builds' do
before do
pipeline = create_pipeline
create(:ci_build, :failed, pipeline: pipeline)
create(:ci_build, :failed, pipeline: pipeline)
end
it 'returns the failed build count but not the failed builds' do
get pipelines_project_merge_request_path(project, merge_request, format: :json)
expect(response).to have_gitlab_http_status(:ok)
expect(Gitlab::Json.parse(response.body)['pipelines'].size).to eq(1)
expect(Gitlab::Json.parse(response.body)['pipelines'][0]['failed_builds_count']).to eq(2)
expect(Gitlab::Json.parse(response.body)['pipelines'][0]).not_to have_key('failed_builds')
end
it 'avoids N+1 queries', :use_sql_query_cache do
# warm up
get pipelines_project_merge_request_path(project, merge_request, format: :json)
control = ActiveRecord::QueryRecorder.new(skip_cached: false) do
get pipelines_project_merge_request_path(project, merge_request, format: :json)
end
expect(response).to have_gitlab_http_status(:ok)
expect(Gitlab::Json.parse(response.body)['count']['all']).to eq(1)
pipeline_2 = create_pipeline
create(:ci_build, :failed, pipeline: pipeline_2)
create(:ci_build, :failed, pipeline: pipeline_2)
expect do
get pipelines_project_merge_request_path(project, merge_request, format: :json)
end.to issue_same_number_of_queries_as(control)
expect(response).to have_gitlab_http_status(:ok)
expect(Gitlab::Json.parse(response.body)['count']['all']).to eq(2)
end
end
describe '#rapid_diffs' do
context 'when the feature flag rapid_diffs is disabled' do
before do
stub_feature_flags(rapid_diffs: false)
end
it 'returns 404' do
get diffs_project_merge_request_path(project, merge_request, rapid_diffs: 'true')
expect(response).to have_gitlab_http_status(:not_found)
end
it 'uses diffs action when rapid_diffs query parameter doesnt exist' do
get diffs_project_merge_request_path(project, merge_request)
expect(response).to have_gitlab_http_status(:ok)
expect(response.body).to include('data-page="projects:merge_requests:diffs"')
end
end
it 'returns 200' do
get diffs_project_merge_request_path(project, merge_request, rapid_diffs: 'true')
expect(response).to have_gitlab_http_status(:ok)
expect(response.body).to include('data-page="projects:merge_requests:rapid_diffs"')
end
it 'uses diffs action when rapid_diffs query parameter doesnt exist' do
get diffs_project_merge_request_path(project, merge_request)
expect(response).to have_gitlab_http_status(:ok)
expect(response.body).to include('data-page="projects:merge_requests:diffs"')
end
it 'shows only first 5 files' do
get diffs_project_merge_request_path(project, merge_request, rapid_diffs: 'true')
expect(response.body.scan('<diff-file ').size).to eq(5)
end
context 'for stream_url' do
it 'returns stream_url with offset' do
get diffs_project_merge_request_path(project, merge_request, rapid_diffs: 'true')
url = "/#{project.full_path}/-/merge_requests/#{merge_request.iid}/diffs_stream?offset=5&view=inline"
expect(assigns(:stream_url)).to eq(url)
end
context 'when view is set to parallel' do
it 'returns stream_url with parallel view' do
get diffs_project_merge_request_path(project, merge_request, rapid_diffs: 'true', view: 'parallel')
url = "/#{project.full_path}/-/merge_requests/#{merge_request.iid}/diffs_stream?offset=5&view=parallel"
expect(assigns(:stream_url)).to eq(url)
end
end
end
end
private
def create_pipeline
create(
:ci_pipeline, :with_job, :success,
project: merge_request.source_project,
ref: merge_request.source_branch,
sha: merge_request.diff_head_sha
)
end
end
describe 'PUT #update' do
before do
project.add_developer(user)
login_as(user)
end
it 'applies correct timezone to merge_after' do
put project_merge_request_path(project, merge_request, merge_request: { merge_after: '2024-09-03T21:18' })
expect(response).to redirect_to(project_merge_request_path(project, merge_request))
expect(merge_request.reload.merge_schedule.merge_after).to eq(
Time.zone.parse('2024-09-03T21:18')
)
end
it 'resets merge_schedule if merge_after is not set' do
create(:merge_request_merge_schedule, merge_request: merge_request, merge_after: '2024-10-27T21:06')
expect do
put project_merge_request_path(project, merge_request, merge_request: { merge_after: '' })
end.to change { merge_request.reload.merge_schedule }.to(nil)
end
it 'does not reset merge_schedule if merge_after is not sent' do
create(:merge_request_merge_schedule, merge_request: merge_request, merge_after: '2024-10-27T21:06')
expect do
put project_merge_request_path(project, merge_request, merge_request: { title: 'Something' })
end.not_to change { merge_request.reload.merge_schedule.merge_after }
end
end
end
|