Download as
Browse Code »

Commit 132575faa07384dd738e06b96ad892912d8a2725

Authored by Dmitriy Zaporozhets
1 parent 888e493b
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix routiong specs after rename of resque controller

Showing 3 changed files with 4 additions and 10 deletions   Show diff stats
features/steps/shared/paths.rb
  Diff comments   View file @132575f
... ... @@ -106,7 +106,7 @@ module SharedPaths
106 106 end
107 107  
108 108 step 'I visit admin Resque page' do
109   - visit admin_resque_path
  109 + visit admin_background_jobs_path
110 110 end
111 111  
112 112 step 'I visit admin groups page' do
... ...
spec/routing/admin_routing_spec.rb
  Diff comments   View file @132575f
... ... @@ -122,10 +122,10 @@ describe Admin::LogsController, "routing" do
122 122 end
123 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 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 129 end
130 130 end
131 131  
... ...
spec/routing/routing_spec.rb
  Diff comments   View file @132575f
... ... @@ -8,18 +8,12 @@ describe SearchController, "routing" do
8 8 end
9 9  
10 10 # gitlab_api /api API::API
11   -# resque /info/resque Resque::Server
12 11 # /:path Grack
13 12 describe "Mounted Apps", "routing" do
14 13 it "to API" do
15 14 get("/api").should be_routable
16 15 end
17 16  
18   - it "to Resque" do
19   - pending
20   - get("/info/resque").should be_routable
21   - end
22   -
23 17 it "to Grack" do
24 18 get("/gitlabhq.git").should be_routable
25 19 end
... ...