From 44c9fcf65f196259eca9d63af84d2ff05664fb75 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Sun, 23 Oct 2011 18:21:07 -0700 Subject: [PATCH] log in to the stream --- app/controllers/application_controller.rb | 2 +- features/logs_in_and_out.feature | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index f359cadc2..6715b70b9 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -121,7 +121,7 @@ class ApplicationController < ActionController::Base end def after_sign_in_path_for(resource) - stored_location_for(:user) || (current_user.getting_started? ? getting_started_path : aspects_path) + stored_location_for(:user) || (current_user.getting_started? ? getting_started_path : multi_path) end def tag_followings diff --git a/features/logs_in_and_out.feature b/features/logs_in_and_out.feature index 61f1c4021..f5017bdcd 100644 --- a/features/logs_in_and_out.feature +++ b/features/logs_in_and_out.feature @@ -6,7 +6,7 @@ Feature: user authentication And I fill in "Username" with "ohai" And I fill in "Password" with "secret" And I press "Sign in" - Then I should be on the aspects page + Then I should be on the multi page @javascript Scenario: user logs out @@ -19,5 +19,5 @@ Feature: user authentication Scenario: user uses token auth Given a user with username "ohai" and password "secret" When I post a photo with a token - And I go to the aspects page + And I go to the multi page Then I should be on the new user session page