summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-05-30 11:44:35 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-05-30 11:44:35 +0300
commit132575faa07384dd738e06b96ad892912d8a2725 (patch)
treec86d07a2bb2f926454e86c519df13a68afa5b327
parent888e493b82435a074938aa25f823c2c9b0fb8026 (diff)
downloadgitlab-ce-132575faa07384dd738e06b96ad892912d8a2725.tar.gz
Fix routiong specs after rename of resque controller
-rw-r--r--features/steps/shared/paths.rb2
-rw-r--r--spec/routing/admin_routing_spec.rb6
-rw-r--r--spec/routing/routing_spec.rb6
3 files changed, 4 insertions, 10 deletions
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index b0d3b0f2a03..628a179ae9d 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -106,7 +106,7 @@ module SharedPaths
end
step 'I visit admin Resque page' do
- visit admin_resque_path
+ visit admin_background_jobs_path
end
step 'I visit admin groups page' do
diff --git a/spec/routing/admin_routing_spec.rb b/spec/routing/admin_routing_spec.rb
index c14fff5109b..36b546fb077 100644
--- a/spec/routing/admin_routing_spec.rb
+++ b/spec/routing/admin_routing_spec.rb
@@ -122,10 +122,10 @@ describe Admin::LogsController, "routing" do
end
end
-# admin_resque GET /admin/resque(.:format) admin/resque#show
-describe Admin::ResqueController, "routing" do
+# admin_background_jobs GET /admin/background_jobs(.:format) admin/background_jobs#show
+describe Admin::BackgroundJobsController, "routing" do
it "to #show" do
- get("/admin/resque").should route_to('admin/resque#show')
+ get("/admin/background_jobs").should route_to('admin/background_jobs#show')
end
end
diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index 049cfeaab01..b6135b4ca81 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -8,18 +8,12 @@ describe SearchController, "routing" do
end
# gitlab_api /api API::API
-# resque /info/resque Resque::Server
# /:path Grack
describe "Mounted Apps", "routing" do
it "to API" do
get("/api").should be_routable
end
- it "to Resque" do
- pending
- get("/info/resque").should be_routable
- end
-
it "to Grack" do
get("/gitlabhq.git").should be_routable
end