diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2012-09-20 13:25:28 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2012-09-26 16:32:22 -0400 |
| commit | a8ea8d98a4f88a292289ddfedef4358033b68ec0 (patch) | |
| tree | a8ddf0e30017a14c22aab902c775c081ba3456d4 /spec/routing | |
| parent | 398ba6f1bb60f176444dedc7b26188e08b920f54 (diff) | |
| download | gitlab-ce-a8ea8d98a4f88a292289ddfedef4358033b68ec0.tar.gz | |
Update RefExtractor to handle atom feeds
Diffstat (limited to 'spec/routing')
| -rw-r--r-- | spec/routing/project_routing_spec.rb | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb index 01bc303deee..04164d5d068 100644 --- a/spec/routing/project_routing_spec.rb +++ b/spec/routing/project_routing_spec.rb @@ -293,11 +293,7 @@ end # 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 -# new_project_commit GET /:project_id/commits/new(.:format) commits#new -# edit_project_commit GET /:project_id/commits/:id/edit(.:format) commits#edit # project_commit GET /:project_id/commits/:id(.:format) commits#show -# PUT /:project_id/commits/:id(.:format) commits#update -# DELETE /:project_id/commits/:id(.:format) commits#destroy describe CommitsController, "routing" do it "to #compare" do get("/gitlabhq/commits/compare").should route_to('commits#compare', project_id: 'gitlabhq') @@ -307,6 +303,10 @@ describe CommitsController, "routing" do get("/gitlabhq/commits/1/patch").should route_to('commits#patch', project_id: 'gitlabhq', id: '1') end + it "does something with atom feeds" do + get("/gitlabhq/commits/master.atom").should route_to('commits#show', project_id: 'gitlabhq', id: 'master.atom') + end + it_behaves_like "RESTful project resources" do let(:actions) { [:index, :show] } let(:controller) { 'commits' } @@ -425,6 +425,7 @@ end # /:project_id/commits/*path # /gitlabhq/commits/master/app/contexts/base_context.rb # /gitlabhq/commits/test/branch/name/app/contexts/base_context.rb +# /gitlabhq/commits/master.atom # # /:project_id/raw/*path # /gitlabhq/raw/master/app/contexts/base_context.rb @@ -436,13 +437,6 @@ end describe "pending routing" do before { pending } - describe "/:project_id/commit/:id" do - it "routes to a specific commit" do - get("/gitlabhq/commit/f4b1449").should route_to('commit#show', project_id: 'gitlabhq', id: 'f4b1449') - get("/gitlabhq/commit/f4b14494ef6abf3d144c28e4af0c20143383e062").should route_to('commit#show', project_id: 'gitlabhq', id: 'f4b14494ef6abf3d144c28e4af0c20143383e062') - end - end - describe "/:project_id/raw/:id" do it "routes to a ref with a path" do get("/gitlabhq/raw/master/app/models/project.rb").should route_to('raw#show', project_id: 'gitlabhq', id: 'master/app/models/project.rb') |