summaryrefslogtreecommitdiff
path: root/spec/routing
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-06-10 03:59:39 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-06-13 17:59:11 -0400
commit94d3c1433df9380ca83f1f35a540074ff0690410 (patch)
tree98da5a0832c587199b848af871e499a8980c4bf7 /spec/routing
parent2bc4fd2d047c1c4c4637f045ed3a51d414359c2a (diff)
downloadgitlab-ce-94d3c1433df9380ca83f1f35a540074ff0690410.tar.gz
Add RootController
This controller is now the target for `root_url`. It sub-classes DashboardController so we can render the old default without a redirect if the user hasn't customized their dashboard location.
Diffstat (limited to 'spec/routing')
-rw-r--r--spec/routing/routing_spec.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index 199851be482..f268e4755d1 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -204,11 +204,9 @@ end
# dashboard GET /dashboard(.:format) dashboard#show
# dashboard_issues GET /dashboard/issues(.:format) dashboard#issues
# dashboard_merge_requests GET /dashboard/merge_requests(.:format) dashboard#merge_requests
-# root / dashboard#show
describe DashboardController, "routing" do
it "to #index" do
expect(get("/dashboard")).to route_to('dashboard#show')
- expect(get("/")).to route_to('dashboard#show')
end
it "to #issues" do
@@ -220,6 +218,14 @@ describe DashboardController, "routing" do
end
end
+# root / root#show
+describe RootController, 'routing' do
+ it 'to #show' do
+ expect(get('/')).to route_to('root#show')
+ end
+end
+
+
# new_user_session GET /users/sign_in(.:format) devise/sessions#new
# user_session POST /users/sign_in(.:format) devise/sessions#create
# destroy_user_session DELETE /users/sign_out(.:format) devise/sessions#destroy