Commit 4793b6e94da496a732262f81e77e61746e8ee98c
- Diff rendering mode:
- inline
- side by side
app/models/merge_request.rb
(4 / 0)
| 335 | 335 | target_repository.project.oauth_consumer | |
| 336 | 336 | end | |
| 337 | 337 | ||
| 338 | def ending_commit_exists? | ||
| 339 | !source_repository.git.commit(ending_commit).nil? | ||
| 340 | end | ||
| 341 | |||
| 338 | 342 | def to_xml(opts = {}) | |
| 339 | 343 | info_proc = Proc.new do |options| | |
| 340 | 344 | builder = options[:builder] |
test/unit/merge_request_test.rb
(11 / 0)
| 197 | 197 | @merge_request.ending_commit = 'alreadymerged' | |
| 198 | 198 | assert_equal(0, @merge_request.commits_to_be_merged.size) | |
| 199 | 199 | end | |
| 200 | |||
| 201 | should 'know if the specified commit exists in the source repository' do | ||
| 202 | source_git = mock('Source repository Git repo') | ||
| 203 | source_git.expects(:commit).with('ff00ddca').returns(nil) | ||
| 204 | source_git.expects(:commit).with('ff00ddcb').returns(mock("Ending commit")) | ||
| 205 | @merge_request.source_repository.stubs(:git).returns(source_git) | ||
| 206 | @merge_request.ending_commit = 'ff00ddca' | ||
| 207 | assert !@merge_request.ending_commit_exists? | ||
| 208 | @merge_request.ending_commit = 'ff00ddcb' | ||
| 209 | assert @merge_request.ending_commit_exists? | ||
| 210 | end | ||
| 200 | 211 | end | |
| 201 | 212 | ||
| 202 | 213 | context 'The state machine' do |
