deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove Commits#compare, add CompareController

Browse source
This commit is contained in:
Robert Speicher 2012-09-20 15:20:48 -04:00
parent 5a5d214de4
commit 169f16fb32
6 changed files with 53 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
spec/routing/project_routing_spec.rb
View file

@ -289,16 +289,11 @@ describe CommitController, "routing" do
end
end
# compare_project_commits GET /:project_id/commits/compare(.:format) commits#compare
# patch_project_commit GET /:project_id/commits/:id/patch(.:format) commits#patch
# project_commits GET /:project_id/commits(.:format) commits#index
# POST /:project_id/commits(.:format) commits#create
# project_commit GET /:project_id/commits/:id(.:format) commits#show
describe CommitsController, "routing" do
it "to #compare" do
get("/gitlabhq/commits/compare").should route_to('commits#compare', project_id: 'gitlabhq')
end
it "to #patch" do
get("/gitlabhq/commits/1/patch").should route_to('commits#patch', project_id: 'gitlabhq', id: '1')
end
@ -407,6 +402,13 @@ describe TreeController, "routing" do
end
end
describe CompareController, "routing" do
it "to #show" do
get("/gitlabhq/compare/master...stable").should route_to('compare#show', project_id: 'gitlabhq', from: 'master', to: 'stable')
get("/gitlabhq/compare/issue/1234...stable").should route_to('compare#show', project_id: 'gitlabhq', from: 'issue/1234', to: 'stable')
end
end
# TODO: Pending
#
# /:project_id/blame/*path