trying another thing to get the redirect working

This commit is contained in:
maxwell 2010-11-08 16:30:46 -08:00
parent 52908cec1a
commit a84f9437b0
6 changed files with 25 additions and 5 deletions

View file

@ -18,7 +18,7 @@ class PeopleController < ApplicationController
@person = Person.find(params[:id].to_id)
@post_type = :all
@aspect = :none
if @person
@profile = @person.profile
@contact = current_user.contact_for(@person)

View file

@ -11,6 +11,7 @@ class ServicesController < ApplicationController
end
def create
auth = request.env['omniauth.auth']
provider = auth['provider']
@ -32,7 +33,11 @@ class ServicesController < ApplicationController
end
flash[:notice] = I18n.t 'services.create.success'
redirect_to :back
if current_user.getting_started
redirect_to getting_started_path(:step => 3)
else
redirect_to services_url
end
end
def destroy

View file

@ -24,7 +24,7 @@ class StatusMessagesController < ApplicationController
def index
@aspect = :profile
@post_type = :status_message
@post_type = :status_messages
@person = Person.find(params[:person_id].to_id)

View file

@ -11,7 +11,7 @@
});
});
.span-24.last
.span-15.last
#thumbnails
- for photo in photos
.image_thumb

View file

@ -16,3 +16,4 @@
= link_to t('.view_profile'), person_path(person)
= link_to t('_photos'), person_photos_path(person)
= link_to 'status messages', person_status_messages_path(person)
= "viewing: #{@post_type.to_s.titleize}" if defined?(@post_type)

View file

@ -22,6 +22,7 @@ describe ServicesController do
before do
sign_in :user, user
@controller.stub!(:current_user).and_return(user)
mock_access_token.stub!(:token).and_return("12345")
mock_access_token.stub!(:secret).and_return("56789")
end
@ -36,9 +37,22 @@ describe ServicesController do
describe '#create' do
it 'creates a new OmniauthService' do
request.env['omniauth.auth'] = omniauth_auth
request.env["HTTP_REFERER"] = ""
lambda{post :create}.should change(user.services, :count).by(1)
end
it 'should redirect to getting started if the user still getting started' do
user.getting_started = true
request.env['omniauth.auth'] = omniauth_auth
post :create
response.should redirect_to getting_started_path(:step => 3)
end
it 'should redirect to services url' do
user.getting_started = false
request.env['omniauth.auth'] = omniauth_auth
post :create
response.should redirect_to services_url
end
end
describe '#destroy' do