Remove Commits#compare, add CompareController

1 files changed, 7 insertions, 5 deletions

diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb
index 04164d5d068..2939f2fcfcc 100644
--- a/spec/routing/project_routing_spec.rb
+++ b/spec/routing/project_routing_spec.rb
@@ -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