Merge pull request #4037 from marpo60/avoid_redirect

Avoid redirect
This commit is contained in:
Jonne Haß 2013-03-04 00:41:12 -08:00
commit d02e9b72c2
3 changed files with 6 additions and 6 deletions

View file

@ -132,6 +132,6 @@ class ApplicationController < ActionController::Base
end end
def current_user_redirect_path def current_user_redirect_path
current_user.getting_started? ? getting_started_path : root_path current_user.getting_started? ? getting_started_path : stream_path
end end
end end

View file

@ -79,7 +79,7 @@ describe RegistrationsController do
it "redirects to the home path" do it "redirects to the home path" do
get :create, @valid_params get :create, @valid_params
response.should be_redirect response.should be_redirect
response.location.should match /^#{root_url}\??$/ response.location.should match /^#{stream_url}\??$/
end end
end end

View file

@ -18,17 +18,17 @@ describe SessionsController do
end end
describe "#create" do describe "#create" do
it "redirects to root_path for a non-mobile user" do it "redirects to /stream for a non-mobile user" do
post :create, {"user" => {"remember_me" => "0", "username" => @user.username, "password" => "evankorth"}} post :create, {"user" => {"remember_me" => "0", "username" => @user.username, "password" => "evankorth"}}
response.should be_redirect response.should be_redirect
response.location.should match /^#{root_url}\??$/ response.location.should match /^#{stream_url}\??$/
end end
it "redirects to /stream for a mobile user" do it "redirects to /stream for a mobile user" do
@request.env['HTTP_USER_AGENT'] = 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7' @request.env['HTTP_USER_AGENT'] = 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7'
post :create, {"user" => {"remember_me" => "0", "username" => @user.username, "password" => "evankorth"}} post :create, {"user" => {"remember_me" => "0", "username" => @user.username, "password" => "evankorth"}}
response.should be_redirect response.should be_redirect
response.location.should match /^#{root_url}\??$/ response.location.should match /^#{stream_url}\??$/
end end
end end