Move partial to right place and fix tests.

2 files changed, 7 insertions, 7 deletions

diff --git a/spec/controllers/root_controller_spec.rb b/spec/controllers/root_controller_spec.rb
index abbbf6855fc..64dfe8f34e3 100644
--- a/spec/controllers/root_controller_spec.rb
+++ b/spec/controllers/root_controller_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe RootController do
-  describe 'GET show' do
+  describe 'GET index' do
     context 'with a user' do
       let(:user) { create(:user) }
 
@@ -16,15 +16,15 @@ describe RootController do
         end
 
         it 'redirects to their specified dashboard' do
-          get :show
+          get :index
           expect(response).to redirect_to starred_dashboard_projects_path
         end
       end
 
       context 'who uses the default dashboard setting' do
         it 'renders the default dashboard' do
-          get :show
-          expect(response).to render_template 'dashboard/show'
+          get :index
+          expect(response).to render_template 'dashboard/projects/index'
         end
       end
     end
diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index dd045826692..dfa18f69e05 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -206,7 +206,7 @@ end
 # dashboard_merge_requests GET    /dashboard/merge_requests(.:format) dashboard#merge_requests
 describe DashboardController, "routing" do
   it "to #index" do
-    expect(get("/dashboard")).to route_to('dashboard#show')
+    expect(get("/dashboard")).to route_to('dashboard/projects#index')
   end
 
   it "to #issues" do
@@ -220,8 +220,8 @@ end
 
 #                     root        /                                   root#show
 describe RootController, 'routing' do
-  it 'to #show' do
-    expect(get('/')).to route_to('root#show')
+  it 'to #index' do
+    expect(get('/')).to route_to('root#index')
   end
 end