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
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
|
# encoding: utf-8
#--
# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#++
require File.dirname(__FILE__) + '/../test_helper'
class MergeRequestsControllerTest < ActionController::TestCase
should_render_in_site_specific_context
def setup
@project = projects(:johans)
MergeRequestStatus.create_defaults_for_project(@project)
grit = Grit::Repo.new(grit_test_repo("dot_git"), :is_bare => true)
Repository.any_instance.stubs(:git).returns(grit)
@source_repository = repositories(:johans2)
@target_repository = repositories(:johans)
@merge_request = merge_requests(:moes_to_johans_open)
@merge_request.stubs(:calculate_merge_base).returns("ff")
@merge_request.stubs(:commit_merged?).returns(true)
version = @merge_request.create_new_version
MergeRequestVersion.any_instance.stubs(:affected_commits).returns([])
@merge_request.versions << version
version.stubs(:merge_request).returns(@merge_request)
@merge_request.stubs(:commits_for_selection).returns([])
assert_not_nil @merge_request.versions.last
end
context "#index (GET)" do
should " not require login" do
session[:user_id] = nil
get :index, :project_id => @project.to_param,
:repository_id => @target_repository.to_param
assert_response :success
end
should "gets all the merge requests in the repository" do
%w(html xml).each do |format|
get :index, :project_id => @project.to_param,
:repository_id => @target_repository.to_param,
:format => format
assert_equal @target_repository.merge_requests.open, assigns(:open_merge_requests)
end
end
should "gets a comment count for" do
get :index, :project_id => @project.to_param,
:repository_id => @target_repository.to_param
assert_equal @target_repository.comments.count, assigns(:comment_count)
end
should "filter on status" do
@merge_request.update_attribute(:status_tag, 'merged')
get :index, :project_id => @project.to_param,
:repository_id => @target_repository.to_param,
:status => "merged"
assert_response :success
assert_equal [@merge_request], assigns(:open_merge_requests)
end
should "have the MergeRequestList breadcrumb as root" do
get :index, :project_id => @project.to_param,
:repository_id => @target_repository.to_param
assert_instance_of Breadcrumb::MergeRequests, assigns(:root)
end
end
def stub_commits(merge_request)
commits = ["9dbb89110fc45362fc4dc3f60d960381",
"6823e6622e1da9751c87380ff01a1db1",
"526fa6c0b3182116d8ca2dc80dedeafb",
"286e8afb9576366a2a43b12b94738f07"].collect do |sha|
m = mock
m.stubs(:id).returns(sha)
m.stubs(:id_abbrev).returns(sha[0..7])
m.stubs(:committer).returns(Grit::Actor.new("bob", "bob@example.com"))
m.stubs(:author).returns(Grit::Actor.new("bob", "bob@example.com"))
m.stubs(:short_message).returns("bla bla")
m.stubs(:committed_date).returns(3.days.ago)
m.stubs(:to_patch).returns("From: #{sha}\nSubject: [PATCH]")
m
end
merge_request.stubs(:commits_for_selection).returns(commits)
merge_request.stubs(:commits_to_be_merged).returns(commits[0..1])
end
context "#show (GET)" do
should " not require login" do
session[:user_id] = nil
MergeRequest.expects(:find_by_sequence_number!).returns(@merge_request)
stub_commits(@merge_request)
[@merge_request.source_repository, @merge_request.target_repository].each do |r|
r.stubs(:git).returns(stub_everything("Git"))
end
get :show, :project_id => @project.to_param,
:repository_id => @target_repository.to_param,
:id => @merge_request.to_param
assert_response :success
assert_select "h3", :content => "Add a new comment:"
end
should "get a list of the commits to be merged" do
%w(html patch xml).each do |format|
MergeRequest.expects(:find).returns(@merge_request)
stub_commits(@merge_request)
get :show, :project_id => @project.to_param,
:repository_id => @target_repository.to_param,
:id => @merge_request.to_param, :format => format
assert_response :success
assert_equal 2, assigns(:commits).size
end
end
should "allow committers to change status" do
login_as :johan
stub_commits(@merge_request)
MergeRequest.expects(:find).returns(@merge_request)
git_stub = stub_everything("Grit", :commit_deltas_from => [])
[@merge_request.source_repository, @merge_request.target_repository].each do |r|
r.stubs(:git).returns(git_stub)
end
get :show, :project_id => @project.to_param,
:repository_id => repositories(:johans).name,
:id => @merge_request.id
assert_response :success
assert_select "select#comment_state"
end
should 'not display a comment change field unless the current user can change the MR' do
login_as :moe
assert !@merge_request.resolvable_by?(users(:moe))
get :show, :project_id => @project.to_param,
:repository_id => repositories(:johans).name,
:id => @merge_request.to_param
assert_response :success
assert_select "select#comment_state", false
end
should 'display a comment change field if the current user can change the MR' do
login_as :johan
assert @merge_request.resolvable_by?(users(:johan))
get :show, :project_id => @project.to_param,
:repository_id => repositories(:johans).name,
:id => @merge_request.to_param
assert_response :success
assert_select "select#comment_state"
end
context "legacy merge requests" do
setup { @merge_request.update_attribute(:legacy, true) }
should "create a version for the legacy merge_requests" do
get :show, :project_id => @project.to_param,
:repository_id => repositories(:johans).name,
:id => @merge_request.to_param
assert_response :success
assert_template "merge_requests/legacy"
end
end
end
context "#new (GET)" do
setup do
Grit::Repo.any_instance.stubs(:heads).returns([])
end
should "requires login" do
session[:user_id] = nil
get :new, :project_id => @project.to_param,
:repository_id => @source_repository.to_param
assert_redirected_to(new_sessions_path)
end
should "is successful" do
login_as :johan
get :new, :project_id => @project.to_param,
:repository_id => @source_repository.to_param
assert_response :success
end
should 'assign to @project even when accessed through a user' do
johan = users(:johan)
login_as :johan
@source_repository.owner = johan
@source_repository.save!
get :new, :user_id => johan.to_param, :repository_id => @source_repository.to_param, :project_id => @project.to_param
assert_response :success
end
should "assigns the new merge_requests' source_repository" do
login_as :johan
get :new, :project_id => @project.to_param,
:repository_id => @source_repository.to_param
assert_equal @source_repository, assigns(:merge_request).source_repository
end
should "gets a list of possible target clones" do
login_as :johan
get :new, :project_id => @project.to_param,
:repository_id => @source_repository.to_param
assert_equal [repositories(:johans)], assigns(:repositories)
end
should "not suggest merging with a non-MR repo" do
clone = Repository.new_by_cloning(@source_repository)
clone.name = "a-clone"
clone.user = users(:johan)
clone.owner = users(:johan)
clone.kind = Repository::KIND_USER_REPO
clone.merge_requests_enabled = false
assert clone.save
login_as :johan
get :new, :project_id => @project.to_param,
:repository_id => @source_repository.to_param
assert !assigns(:repositories).include?(clone)
end
should "set a default mainline target repo id" do
login_as :johan
get :new, :project_id => @project.to_param, :repository_id => @source_repository.to_param
assert_equal repositories(:johans).id, assigns(:merge_request).target_repository_id
end
end
def do_post(data={})
post :create, :project_id => @project.to_param,
:repository_id => @source_repository.to_param, :merge_request => {
:target_repository_id => @target_repository.id,
:ending_commit => '6823e6622e1da9751c87380ff01a1db1',
:summary => "some changes to be merged"
}.merge(data)
end
context "#create (POST)" do
setup do
Grit::Repo.any_instance.stubs(:heads).returns([])
end
should "require login" do
session[:user_id] = nil
do_post
assert_redirected_to(new_sessions_path)
end
should "scope to the source_repository" do
login_as :johan
do_post
assert_equal @source_repository, assigns(:merge_request).source_repository
end
should "scope to the current_user" do
login_as :johan
do_post
assert_equal users(:johan), assigns(:merge_request).user
end
should "create the record on successful data" do
login_as :johan
mock_token = mock("Mocked access token")
mock_token.stubs(:token).returns("key")
mock_token.stubs(:secret).returns("secret")
mock_token.stubs(:authorize_url).returns("http://oauth.example/authorize?key=123")
@controller.expects(:obtain_oauth_request_token).returns(mock_token)
assert_difference("MergeRequest.count") do
do_post
assert_response :redirect
result = assigns(:merge_request)
assert_equal(terms_accepted_project_repository_merge_request_path(@source_repository.project, @target_repository, result), session[:return_to])
end
end
should 'not require off-site signoff of terms unless the repository needs it' do
login_as(:johan)
post :create, :project_id => @project.to_param,
:repository_id => @target_repository.to_param, :merge_request => {
:target_repository_id => @source_repository.id,
:ending_commit => '6823e6622e1da9751c87380ff01a1db1',
:summary => "some changes"
}
result = assigns(:merge_request)
assert !result.acceptance_of_terms_required?
assert result.open?
assert_match(/sent a merge request to "#{@source_repository.name}"/i, flash[:success])
end
should "create an event when the request doesn't require signof" do
login_as :johan
assert_difference("@project.events.count", 1) do
post :create, :project_id => @project.to_param,
:repository_id => @target_repository.to_param, :merge_request => {
:target_repository_id => @source_repository.id,
:ending_commit => '6823e6622e1da9751c87380ff01a1db1',
:summary => "some changes"
}
end
end
should "it re-renders on invalid data, with the target repos list" do
login_as :johan
do_post :target_repository => nil
assert_response :success
assert_template(("merge_requests/new"))
assert_equal [repositories(:johans)], assigns(:repositories)
end
end
context "Merge request landing page" do
should "GET the mergerequest landing page" do
login_as :johan
session[:return_to] = "/foo/bar"
get :oauth_return
assert_response :redirect
assert_redirected_to "/foo/bar"
end
should "route the merge_request_landing_page" do
assert_recognizes({
:controller => "merge_requests",
:action => "oauth_return",
}, "/merge_request_landing_page")
end
should "have a named route" do
assert_equal "/merge_request_landing_page", merge_request_landing_page_path
end
end
context 'Terms accepted (GET)' do
setup do
@merge_request = @source_repository.proposed_merge_requests.new({
:summary => "plz merge",
:proposal => 'Would like this to be merged',
:user => users(:johan),
:ending_commit => '6823e6622e1da9751c87380ff01a1db1',
:target_repository => @target_repository,
:summary => "foo"
})
assert @merge_request.save
@merge_request.stubs(:commits_to_be_merged).returns([])
MergeRequest.stubs(:find).returns(@merge_request)
login_as :johan
end
should 'set the status to open when done authenticating thru OAuth' do
@merge_request.stubs(:valid_oauth_credentials?).returns(true)
get :terms_accepted, {:project_id => @project.to_param,
:repository_id => @target_repository.to_param,
:id => @merge_request.to_param}
assert_response :redirect
assert @merge_request.open?
end
should 'not set the status to open if OAuth authentication has not been performed' do
@merge_request.stubs(:valid_oauth_credentials?).returns(false)
get :terms_accepted, :project_id => @project.to_param,
:repository_id => @target_repository.to_param,
:id => @merge_request.to_param
assert_response :redirect
assert !@merge_request.open?
end
end
def do_edit_get
get :edit, :project_id => @project.to_param, :repository_id => @target_repository.to_param,
:id => @merge_request.to_param
end
context "#edit (GET)" do
should "requires login" do
session[:user_id] = nil
do_edit_get
assert_redirected_to(new_sessions_path)
end
should "requires ownership to edit" do
login_as :moe
do_edit_get
assert_match(/you're not the owner/i, flash[:error])
assert_response :redirect
end
should "is successfull" do
login_as :johan
do_edit_get
assert_response :success
end
should "gets a list of possible target clones" do
login_as :johan
do_edit_get
assert_equal [@source_repository], assigns(:repositories)
end
end
def do_put(data={})
put :update, :project_id => @project.to_param,
:repository_id => @target_repository.to_param,
:id => @merge_request.to_param,
:merge_request => {
:target_repository_id => @target_repository.id,
}.merge(data)
end
def do_commit_status_get(data = {})
options = {:project_id => @project.to_param,:repository_id => @target_repository.to_param,:id => @merge_request.id}.merge(data)
get :commit_status, options
end
context 'commit_merged (GET)' do
setup do
@merge_request.stubs(:commit_merged?).with('ffc').returns(false)
@merge_request.stubs(:commit_merged?).with('ffo').returns(true)
MergeRequest.stubs(:find).returns(@merge_request)
end
should 'return false if the given commit has not been merged' do
do_commit_status_get(:commit_id => 'ff0')
assert_response :success
assert_equal 'true', @response.body
end
should 'return true if the given commit has been merged' do
do_commit_status_get(:commit_id => 'ffc')
assert_response :success
assert_equal 'false', @response.body
end
end
context "#update (PUT)" do
should "requires login" do
session[:user_id] = nil
do_put
assert_redirected_to(new_sessions_path)
end
should "requires ownership to update" do
login_as :moe
do_put
assert_match(/you're not the owner/i, flash[:error])
assert_response :redirect
end
should "scopes to the source_repository" do
login_as :johan
do_put
assert_equal @source_repository, assigns(:merge_request).source_repository
end
should "scopes to the current_user" do
login_as :johan
do_put
assert_equal users(:johan), assigns(:merge_request).user
end
should "updates the record on successful data" do
login_as :johan
do_put :proposal => "hai, plz merge kthnkxbye"
assert_redirected_to(project_repository_merge_request_path(@project, @target_repository, @merge_request))
assert_match(/merge request was updated/i, flash[:success])
assert_equal "hai, plz merge kthnkxbye", @merge_request.reload.proposal
end
should "it re-renders on invalid data, with the target repos list" do
login_as :johan
do_put :target_repository => nil
assert_response :success
assert_template(("merge_requests/edit"))
assert_equal [@source_repository], assigns(:repositories)
end
should "only allows the owner to update" do
login_as :moe
do_put
assert_no_difference("MergeRequest.count") do
assert_redirected_to(project_repository_path(@project, @target_repository))
assert_equal nil, flash[:success]
assert_match(/You're not the owner of this merge request/i, flash[:error])
end
end
end
context "#get commit_list" do
setup do
@commits = %w(ffcffcffc ff0ff0ff0).collect do |sha|
m = mock
m.stubs(:id).returns(sha)
m.stubs(:id_abbrev).returns(sha[0..7])
m.stubs(:committer).returns(Grit::Actor.new("bob", "bob@example.com"))
m.stubs(:author).returns(Grit::Actor.new("bob", "bob@example.com"))
m.stubs(:short_message).returns("bla bla")
m.stubs(:committed_date).returns(3.days.ago)
m
end
merge_request = MergeRequest.new
merge_request.stubs(:commits_for_selection).returns(@commits)
MergeRequest.expects(:new).returns(merge_request)
end
should " render a list of commits that can be merged" do
login_as :johan
post :commit_list, :project_id => @project.to_param,
:repository_id => @target_repository.to_param,
:merge_request => {}
assert_equal @commits, assigns(:commits)
end
end
context "GET #target_branches" do
should "retrive a list of the target repository branches" do
grit = Grit::Repo.new(grit_test_repo("dot_git"), :is_bare => true)
MergeRequest.any_instance.expects(:target_branches_for_selection).returns(grit.branches)
login_as :johan
post :target_branches, :project_id => @project.to_param,
:repository_id => @target_repository.to_param,
:merge_request => {:target_repository_id => repositories(:johans).id}
assert_response :success
assert_equal grit.branches, assigns(:target_branches)
end
end
context 'GET #version' do
should 'render the diff browser for the given version' do
MergeRequest.stubs(:find).returns(@merge_request)
get :version, :project_id => @project.to_param, :repository_id => @target_repository.to_param,
:id => @merge_request.to_param, :version => @merge_request.versions.first.version
assert_response :success
end
end
def do_delete
delete :destroy, :project_id => @project.to_param,
:repository_id => @target_repository.to_param,
:id => @merge_request.to_param
end
context "#destroy (DELETE)" do
should "requires login" do
session[:user_id] = nil
do_delete
assert_redirected_to(new_sessions_path)
end
should "scopes to the source_repository" do
login_as :johan
do_delete
assert_equal @source_repository, assigns(:merge_request).source_repository
end
should "soft-delete the record" do
login_as :johan
assert_difference("@target_repository.merge_requests.open.count", -1) do
do_delete
end
assert_redirected_to(project_repository_path(@project, @target_repository))
assert_match(/merge request was retracted/i, flash[:success])
end
should "only allows the owner to delete" do
login_as :moe
do_delete
assert_no_difference("MergeRequest.count") do
assert_redirected_to(project_repository_path(@project, @target_repository))
assert_equal nil, flash[:success]
assert_match(/You're not the owner of this merge request/i, flash[:error])
end
end
end
context 'Redirection from the outside' do
setup do
@merge_request = merge_requests(:moes_to_johans)
end
should 'redirect to the correct URL when supplying only an id' do
get :direct_access, :id => @merge_request.id
assert_redirected_to({
:action => 'show',
:project_id => @merge_request.target_repository.project,
:repository_id => @merge_request.target_repository,
:id => @merge_request.to_param})
end
end
context "routing" do
should "route for repositories thats owned by users with dots in their username on #index" do
assert_recognizes({
:controller => "merge_requests",
:action => "index",
:user_id => "mc.hammer",
:project_id => "myproject",
:repository_id => "myrepo",
}, {:path => "/~mc.hammer/myproject/myrepo/merge_requests", :method => :get})
assert_generates("/~mc.hammer/myproject/myrepo/merge_requests", {
:controller => "merge_requests",
:action => "index",
:user_id => "mc.hammer",
:project_id => "myproject",
:repository_id => "myrepo",
})
end
should "route for repositories thats owned by users with dots in their username on #show" do
assert_recognizes({
:controller => "merge_requests",
:action => "show",
:user_id => "mc.hammer",
:project_id => "myproject",
:repository_id => "myrepo",
:id => "42"
}, {:path => "/~mc.hammer/myproject/myrepo/merge_requests/42", :method => :get})
assert_generates("/~mc.hammer/myproject/myrepo/merge_requests/42", {
:controller => "merge_requests",
:action => "show",
:user_id => "mc.hammer",
:project_id => "myproject",
:repository_id => "myrepo",
:id => "42"
})
end
end
end
|