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

Enable tree resource, remove old tree routes

Browse source
This commit is contained in:
Robert Speicher 2012-09-17 12:26:29 -04:00
parent 2ddb191706
commit 884eb73297
2 changed files with 10 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
config/routes.rb
View file

@ -122,24 +122,14 @@ Gitlab::Application.routes.draw do
end end
member do member do
get "tree", constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }
get "logs_tree", constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }
get "blob", get "blob",
constraints: { constraints: {
id: /[a-zA-Z.0-9\/_\-]+/, id: /[a-zA-Z.0-9\/_\-]+/,
path: /.*/ path: /.*/
} }
# tree viewer # tree viewer logs
get "tree/:path" => "refs#tree", get "logs_tree", constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }
as: :tree_file,
constraints: {
id: /[a-zA-Z.0-9\/_\-]+/,
path: /.*/
}
# tree viewer
get "logs_tree/:path" => "refs#logs_tree", get "logs_tree/:path" => "refs#logs_tree",
as: :logs_file, as: :logs_file,
constraints: { constraints: {
@ -217,7 +207,7 @@ Gitlab::Application.routes.draw do
# resources :blame, only: [:show], constraints: {id: /.+/} # resources :blame, only: [:show], constraints: {id: /.+/}
# resources :blob, only: [:show], constraints: {id: /.+/} # resources :blob, only: [:show], constraints: {id: /.+/}
# resources :raw, only: [:show], constraints: {id: /.+/} # resources :raw, only: [:show], constraints: {id: /.+/}
# resources :tree, only: [:show], constraints: {id: /.+/} resources :tree, only: [:show], constraints: {id: /.+/}
end end
root to: "dashboard#index" root to: "dashboard#index"

21
spec/routing/project_routing_spec.rb
View file

@ -192,10 +192,8 @@ describe ProtectedBranchesController, "routing" do
end end
# switch_project_refs GET /:project_id/switch(.:format) refs#switch # 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 # 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 # 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 # blame_file_project_ref GET /:project_id/:id/blame/:path(.:format) refs#blame
describe RefsController, "routing" do describe RefsController, "routing" do
@ -203,11 +201,6 @@ describe RefsController, "routing" do
get("/gitlabhq/switch").should route_to('refs#switch', project_id: 'gitlabhq') get("/gitlabhq/switch").should route_to('refs#switch', project_id: 'gitlabhq')
end 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 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").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') 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
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 # TODO: Pending
# #
# /:project_id/blame/*path # /: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') get("/gitlabhq/raw/master/app/models/project.rb").should route_to('raw#show', project_id: 'gitlabhq', id: 'master/app/models/project.rb')
end end
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 end