Commit 132575faa07384dd738e06b96ad892912d8a2725

Authored by Dmitriy Zaporozhets
1 parent 888e493b

Fix routiong specs after rename of resque controller

features/steps/shared/paths.rb
@@ -106,7 +106,7 @@ module SharedPaths @@ -106,7 +106,7 @@ module SharedPaths
106 end 106 end
107 107
108 step 'I visit admin Resque page' do 108 step 'I visit admin Resque page' do
109 - visit admin_resque_path 109 + visit admin_background_jobs_path
110 end 110 end
111 111
112 step 'I visit admin groups page' do 112 step 'I visit admin groups page' do
spec/routing/admin_routing_spec.rb
@@ -122,10 +122,10 @@ describe Admin::LogsController, "routing" do @@ -122,10 +122,10 @@ describe Admin::LogsController, "routing" do
122 end 122 end
123 end 123 end
124 124
125 -# admin_resque GET /admin/resque(.:format) admin/resque#show  
126 -describe Admin::ResqueController, "routing" do 125 +# admin_background_jobs GET /admin/background_jobs(.:format) admin/background_jobs#show
  126 +describe Admin::BackgroundJobsController, "routing" do
127 it "to #show" do 127 it "to #show" do
128 - get("/admin/resque").should route_to('admin/resque#show') 128 + get("/admin/background_jobs").should route_to('admin/background_jobs#show')
129 end 129 end
130 end 130 end
131 131
spec/routing/routing_spec.rb
@@ -8,18 +8,12 @@ describe SearchController, "routing" do @@ -8,18 +8,12 @@ describe SearchController, "routing" do
8 end 8 end
9 9
10 # gitlab_api /api API::API 10 # gitlab_api /api API::API
11 -# resque /info/resque Resque::Server  
12 # /:path Grack 11 # /:path Grack
13 describe "Mounted Apps", "routing" do 12 describe "Mounted Apps", "routing" do
14 it "to API" do 13 it "to API" do
15 get("/api").should be_routable 14 get("/api").should be_routable
16 end 15 end
17 16
18 - it "to Resque" do  
19 - pending  
20 - get("/info/resque").should be_routable  
21 - end  
22 -  
23 it "to Grack" do 17 it "to Grack" do
24 get("/gitlabhq.git").should be_routable 18 get("/gitlabhq.git").should be_routable
25 end 19 end