Enable tree resource, remove old tree routes

2 files changed, 10 insertions, 27 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 4f55d7e5f7c..d1ed8749d95 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -122,24 +122,14 @@ Gitlab::Application.routes.draw do
       end
 
       member do
-        get "tree",      constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }
-        get "logs_tree", constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }
-
         get "blob",
           constraints: {
             id:   /[a-zA-Z.0-9\/_\-]+/,
             path: /.*/
           }
 
-        # tree viewer
-        get "tree/:path" => "refs#tree",
-          as: :tree_file,
-          constraints: {
-            id:   /[a-zA-Z.0-9\/_\-]+/,
-            path: /.*/
-          }
-
-        # tree viewer
+        # tree viewer logs
+        get "logs_tree", constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }
         get "logs_tree/:path" => "refs#logs_tree",
           as: :logs_file,
           constraints: {
@@ -217,7 +207,7 @@ Gitlab::Application.routes.draw do
     # resources :blame,  only: [:show], constraints: {id: /.+/}
     # resources :blob,   only: [:show], constraints: {id: /.+/}
     # resources :raw,    only: [:show], constraints: {id: /.+/}
-    # resources :tree,   only: [:show], constraints: {id: /.+/}
+    resources :tree,   only: [:show], constraints: {id: /.+/}
   end
 
   root to: "dashboard#index"
diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb
index 9900a31f232..f9c99a209fc 100644
--- a/spec/routing/project_routing_spec.rb
+++ b/spec/routing/project_routing_spec.rb
@@ -192,10 +192,8 @@ describe ProtectedBranchesController, "routing" do
 end
 
 #    switch_project_refs GET    /:project_id/switch(.:format)              refs#switch
-#       tree_project_ref GET    /:project_id/:id/tree(.:format)            refs#tree
-#  logs_tree_project_ref GET    /:project_id/:id/logs_tree(.:format)       refs#logs_tree
 #       blob_project_ref GET    /:project_id/:id/blob(.:format)            refs#blob
-#  tree_file_project_ref GET    /:project_id/:id/tree/:path(.:format)      refs#tree
+#  logs_tree_project_ref GET    /:project_id/:id/logs_tree(.:format)       refs#logs_tree
 #  logs_file_project_ref GET    /:project_id/:id/logs_tree/:path(.:format) refs#logs_tree
 # blame_file_project_ref GET    /:project_id/:id/blame/:path(.:format)     refs#blame
 describe RefsController, "routing" do
@@ -203,11 +201,6 @@ describe RefsController, "routing" do
     get("/gitlabhq/switch").should route_to('refs#switch', project_id: 'gitlabhq')
   end
 
-  it "to #tree" do
-    get("/gitlabhq/stable/tree").should             route_to('refs#tree', project_id: 'gitlabhq', id: 'stable')
-    get("/gitlabhq/stable/tree/foo/bar/baz").should route_to('refs#tree', project_id: 'gitlabhq', id: 'stable', path: 'foo/bar/baz')
-  end
-
   it "to #logs_tree" do
     get("/gitlabhq/stable/logs_tree").should             route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable')
     get("/gitlabhq/stable/logs_tree/foo/bar/baz").should route_to('refs#logs_tree', project_id: 'gitlabhq', id: 'stable', path: 'foo/bar/baz')
@@ -406,6 +399,12 @@ describe NotesController, "routing" do
   end
 end
 
+describe TreeController, "routing" do
+  it "to #show" do
+    get("/gitlabhq/tree/master/app/models/project.rb").should route_to('tree#show', project_id: 'gitlabhq', id: 'master/app/models/project.rb')
+  end
+end
+
 # TODO: Pending
 #
 # /:project_id/blame/*path
@@ -457,10 +456,4 @@ describe "pending routing" do
       get("/gitlabhq/raw/master/app/models/project.rb").should route_to('raw#show', project_id: 'gitlabhq', id: 'master/app/models/project.rb')
     end
   end
-
-  describe "/:project_id/tree/:id" do
-    it "routes to a ref with a path" do
-      get("/gitlabhq/tree/master/app/models/project.rb").should route_to('tree#show', project_id: 'gitlabhq', id: 'master/app/models/project.rb')
-    end
-  end
 end