Move partial to right place and fix tests.

This commit is contained in:
Douwe Maan 2015-09-08 15:14:14 +01:00
parent 5d785457db
commit 1489d225d6
6 changed files with 10 additions and 10 deletions

View File

@ -15,7 +15,7 @@ class GroupsController < Groups::ApplicationController
layout :determine_layout layout :determine_layout
def index def index
redirect_to (current_user ? dashboard_groups_path : explore_groups_path) redirect_to(current_user ? dashboard_groups_path : explore_groups_path)
end end
def new def new

View File

@ -11,7 +11,7 @@ class ProjectsController < ApplicationController
layout :determine_layout layout :determine_layout
def index def index
redirect_to (current_user ? root_path : explore_root_path) redirect_to(current_user ? root_path : explore_root_path)
end end
def new def new

View File

@ -26,7 +26,7 @@ class SnippetsController < ApplicationController
render 'index' render 'index'
else else
redirect_to (current_user ? dashboard_snippets_path : explore_snippets_path) redirect_to(current_user ? dashboard_snippets_path : explore_snippets_path)
end end
end end

View File

@ -1,7 +1,7 @@
require 'spec_helper' require 'spec_helper'
describe RootController do describe RootController do
describe 'GET show' do describe 'GET index' do
context 'with a user' do context 'with a user' do
let(:user) { create(:user) } let(:user) { create(:user) }
@ -16,15 +16,15 @@ describe RootController do
end end
it 'redirects to their specified dashboard' do it 'redirects to their specified dashboard' do
get :show get :index
expect(response).to redirect_to starred_dashboard_projects_path expect(response).to redirect_to starred_dashboard_projects_path
end end
end end
context 'who uses the default dashboard setting' do context 'who uses the default dashboard setting' do
it 'renders the default dashboard' do it 'renders the default dashboard' do
get :show get :index
expect(response).to render_template 'dashboard/show' expect(response).to render_template 'dashboard/projects/index'
end end
end end
end end

View File

@ -206,7 +206,7 @@ end
# dashboard_merge_requests GET /dashboard/merge_requests(.:format) dashboard#merge_requests # dashboard_merge_requests GET /dashboard/merge_requests(.:format) dashboard#merge_requests
describe DashboardController, "routing" do describe DashboardController, "routing" do
it "to #index" do it "to #index" do
expect(get("/dashboard")).to route_to('dashboard#show') expect(get("/dashboard")).to route_to('dashboard/projects#index')
end end
it "to #issues" do it "to #issues" do
@ -220,8 +220,8 @@ end
# root / root#show # root / root#show
describe RootController, 'routing' do describe RootController, 'routing' do
it 'to #show' do it 'to #index' do
expect(get('/')).to route_to('root#show') expect(get('/')).to route_to('root#index')
end end
end end