summaryrefslogtreecommitdiff
path: root/spec/routing
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-12-08 20:59:41 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-12-11 10:30:10 +0200
commitd8b7df3cbcfd4fcdf204fdcba01720e60fb598bf (patch)
treeae7f128bb569a4cf97b390e510eff2f3d2bb77b0 /spec/routing
parent3f768f9a14ad90bbd79d384e3c287db4feea3e35 (diff)
downloadgitlab-ce-d8b7df3cbcfd4fcdf204fdcba01720e60fb598bf.tar.gz
Add support for nested groups to admin routingdz-fix-admin-routes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec/routing')
-rw-r--r--spec/routing/admin_routing_spec.rb14
1 files changed, 13 insertions, 1 deletions
diff --git a/spec/routing/admin_routing_spec.rb b/spec/routing/admin_routing_spec.rb
index 69eeb45ed71..661b671301e 100644
--- a/spec/routing/admin_routing_spec.rb
+++ b/spec/routing/admin_routing_spec.rb
@@ -66,7 +66,8 @@ describe Admin::ProjectsController, "routing" do
end
it "to #show" do
- expect(get("/admin/projects/gitlab")).to route_to('admin/projects#show', namespace_id: 'gitlab')
+ expect(get("/admin/projects/gitlab/gitlab-ce")).to route_to('admin/projects#show', namespace_id: 'gitlab', id: 'gitlab-ce')
+ expect(get("/admin/projects/gitlab/subgroup/gitlab-ce")).to route_to('admin/projects#show', namespace_id: 'gitlab/subgroup', id: 'gitlab-ce')
end
end
@@ -119,3 +120,14 @@ describe Admin::HealthCheckController, "routing" do
expect(get("/admin/health_check")).to route_to('admin/health_check#show')
end
end
+
+describe Admin::GroupsController, "routing" do
+ it "to #index" do
+ expect(get("/admin/groups")).to route_to('admin/groups#index')
+ end
+
+ it "to #show" do
+ expect(get("/admin/groups/gitlab")).to route_to('admin/groups#show', id: 'gitlab')
+ expect(get("/admin/groups/gitlab/subgroup")).to route_to('admin/groups#show', id: 'gitlab/subgroup')
+ end
+end