Commit 776d4ba5 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'fix-json-endpoint-redirection' into 'master'

Bugfix: don't redirect to JSON endpoints after sign in

See merge request !11561
parents 5460153c 49ded5c1
...@@ -277,7 +277,10 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -277,7 +277,10 @@ class Projects::IssuesController < Projects::ApplicationController
notice = "Please sign in to create the new issue." notice = "Please sign in to create the new issue."
if request.get? && !request.xhr?
store_location_for :user, request.fullpath store_location_for :user, request.fullpath
end
redirect_to new_user_session_path, notice: notice redirect_to new_user_session_path, notice: notice
end end
end end
...@@ -156,6 +156,32 @@ describe Projects::IssuesController do ...@@ -156,6 +156,32 @@ describe Projects::IssuesController do
end end
end end
describe 'Redirect after sign in' do
context 'with an AJAX request' do
it 'does not store the visited URL' do
xhr :get,
:show,
format: :json,
namespace_id: project.namespace,
project_id: project,
id: issue.iid
expect(session['user_return_to']).to be_blank
end
end
context 'without an AJAX request' do
it 'stores the visited URL' do
get :show,
namespace_id: project.namespace.to_param,
project_id: project,
id: issue.iid
expect(session['user_return_to']).to eq("/#{project.namespace.to_param}/#{project.to_param}/issues/#{issue.iid}")
end
end
end
describe 'PUT #update' do describe 'PUT #update' do
before do before do
sign_in(user) sign_in(user)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment