Show More
@@ -288,10 +288,11 b' class TestPullrequestsController:' | |||
|
288 | 288 | commits = [ |
|
289 | 289 | {'message': 'ancestor'}, |
|
290 | 290 | {'message': 'change'}, |
|
291 | {'message': 'change2'}, | |
|
291 | 292 | ] |
|
292 | 293 | commit_ids = backend.create_master_repo(commits) |
|
293 | 294 | target = backend.create_repo(heads=['ancestor']) |
|
294 | source = backend.create_repo(heads=['change']) | |
|
295 | source = backend.create_repo(heads=['change2']) | |
|
295 | 296 | |
|
296 | 297 | response = self.app.post( |
|
297 | 298 | url( |
@@ -301,7 +302,7 b' class TestPullrequestsController:' | |||
|
301 | 302 | ), |
|
302 | 303 | [ |
|
303 | 304 | ('source_repo', source.repo_name), |
|
304 | ('source_ref', 'branch:default:' + commit_ids['change']), | |
|
305 | ('source_ref', 'branch:default:' + commit_ids['change2']), | |
|
305 | 306 | ('target_repo', target.repo_name), |
|
306 | 307 | ('target_ref', 'branch:default:' + commit_ids['ancestor']), |
|
307 | 308 | ('pullrequest_desc', 'Description'), |
@@ -314,7 +315,10 b' class TestPullrequestsController:' | |||
|
314 | 315 | ('__end__', 'reasons:sequence'), |
|
315 | 316 | ('__end__', 'reviewer:mapping'), |
|
316 | 317 | ('__end__', 'review_members:sequence'), |
|
317 |
(' |
|
|
318 | ('__start__', 'revisions:sequence'), | |
|
319 | ('revisions', commit_ids['change']), | |
|
320 | ('revisions', commit_ids['change2']), | |
|
321 | ('__end__', 'revisions:sequence'), | |
|
318 | 322 | ('user', ''), |
|
319 | 323 | ('csrf_token', csrf_token), |
|
320 | 324 | ], |
@@ -325,8 +329,8 b' class TestPullrequestsController:' | |||
|
325 | 329 | pull_request = PullRequest.get(pull_request_id) |
|
326 | 330 | |
|
327 | 331 | # check that we have now both revisions |
|
328 | assert pull_request.revisions == [commit_ids['change']] | |
|
329 | assert pull_request.source_ref == 'branch:default:' + commit_ids['change'] | |
|
332 | assert pull_request.revisions == [commit_ids['change2'], commit_ids['change']] | |
|
333 | assert pull_request.source_ref == 'branch:default:' + commit_ids['change2'] | |
|
330 | 334 | expected_target_ref = 'branch:default:' + commit_ids['ancestor'] |
|
331 | 335 | assert pull_request.target_ref == expected_target_ref |
|
332 | 336 | |
@@ -369,7 +373,9 b' class TestPullrequestsController:' | |||
|
369 | 373 | ('__end__', 'reasons:sequence'), |
|
370 | 374 | ('__end__', 'reviewer:mapping'), |
|
371 | 375 | ('__end__', 'review_members:sequence'), |
|
372 |
(' |
|
|
376 | ('__start__', 'revisions:sequence'), | |
|
377 | ('revisions', commit_ids['change']), | |
|
378 | ('__end__', 'revisions:sequence'), | |
|
373 | 379 | ('user', ''), |
|
374 | 380 | ('csrf_token', csrf_token), |
|
375 | 381 | ], |
@@ -431,7 +437,9 b' class TestPullrequestsController:' | |||
|
431 | 437 | ('__end__', 'reasons:sequence'), |
|
432 | 438 | ('__end__', 'reviewer:mapping'), |
|
433 | 439 | ('__end__', 'review_members:sequence'), |
|
434 |
(' |
|
|
440 | ('__start__', 'revisions:sequence'), | |
|
441 | ('revisions', commit_ids['change']), | |
|
442 | ('__end__', 'revisions:sequence'), | |
|
435 | 443 | ('user', ''), |
|
436 | 444 | ('csrf_token', csrf_token), |
|
437 | 445 | ], |
General Comments 0
You need to be logged in to leave comments.
Login now