Skip to content
Snippets Groups Projects
Commit f87f6480 authored by Douwe Maan's avatar Douwe Maan
Browse files

Use new routing helper

parent 1489d225
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -24,7 +24,7 @@ class InvitesController < ApplicationController
 
path =
if current_user
dashboard_path
dashboard_projects_path
else
new_user_session_path
end
Loading
Loading
@@ -73,7 +73,7 @@ class InvitesController < ApplicationController
path = group_path(group)
else
label = "who knows what"
path = dashboard_path
path = dashboard_projects_path
end
 
[label, path]
Loading
Loading
Loading
Loading
@@ -78,7 +78,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
@project.project_members.find_by(user_id: current_user).destroy
 
respond_to do |format|
format.html { redirect_to dashboard_path }
format.html { redirect_to dashboard_projects_path }
format.js { render nothing: true }
end
end
Loading
Loading
Loading
Loading
@@ -109,7 +109,7 @@ class ProjectsController < ApplicationController
if request.referer.include?('/admin')
redirect_to admin_namespaces_projects_path
else
redirect_to dashboard_path
redirect_to dashboard_projects_path
end
rescue Projects::DestroyService::DestroyError => ex
redirect_to edit_project_path(@project), alert: ex.message
Loading
Loading
Loading
Loading
@@ -5,7 +5,7 @@
- if current_user
%ul.nav.nav-pills.event_filter.pull-right
%li.pull-right
= link_to dashboard_path(:atom, { private_token: current_user.private_token }), class: 'rss-btn' do
= link_to dashboard_projects_path(:atom, { private_token: current_user.private_token }), class: 'rss-btn' do
%i.fa.fa-rss
= render 'shared/event_filter'
 
Loading
Loading
Loading
Loading
@@ -68,7 +68,7 @@ module SharedPaths
# ----------------------------------------
 
step 'I visit dashboard page' do
visit dashboard_path
visit dashboard_projects_path
end
 
step 'I visit dashboard activity page' do
Loading
Loading
Loading
Loading
@@ -6,7 +6,7 @@ describe "Dashboard Feed", feature: true do
 
context "projects atom feed via private token" do
it "should render projects atom feed" do
visit dashboard_path(:atom, private_token: user.private_token)
visit dashboard_projects_path(:atom, private_token: user.private_token)
expect(body).to have_selector('feed title')
end
end
Loading
Loading
@@ -20,7 +20,7 @@ describe "Dashboard Feed", feature: true do
project.team << [user, :master]
issue_event(issue, user)
note_event(note, user)
visit dashboard_path(:atom, private_token: user.private_token)
visit dashboard_projects_path(:atom, private_token: user.private_token)
end
 
it "should have issue opened event" do
Loading
Loading
Loading
Loading
@@ -70,7 +70,7 @@ describe 'Profile > Preferences', feature: true do
expect(page.current_path).to eq starred_dashboard_projects_path
 
click_link 'Your Projects'
expect(page.current_path).to eq dashboard_path
expect(page.current_path).to eq dashboard_projects_path
end
end
 
Loading
Loading
Loading
Loading
@@ -4,7 +4,7 @@ describe "Dashboard access", feature: true do
include AccessMatchers
 
describe "GET /dashboard" do
subject { dashboard_path }
subject { dashboard_projects_path }
 
it { is_expected.to be_allowed_for :admin }
it { is_expected.to be_allowed_for :user }
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment