spec/controllers/application_spec.rb @@ -29,7 +29,7 @@ class ApplicationController < ActionController::Base @user_session = UserSession.find @current_user = @user_session && @user_session.record - if @current_user.nil? && (params[:controller] != 'third_party_registrations_controller') + if @current_user.nil? && ( params[:controller] != 'third_party_registrations' ) load_facebook_user end end app/controllers/application.rb @@ -59,7 +59,7 @@ class OpenIdRegistrationsController < ApplicationController render :action => 'new' else session[:openid_identifier] = openid_identifier - redirect_to edit_third_party_registration_url :user => { :screen_name => registration['nickname'], :email => registration['email'] } + redirect_to edit_third_party_registration_url( :user => { :screen_name => registration['nickname'], :email => registration['email'] } ) end end app/controllers/open_id_registrations_controller.rb @@ -4,8 +4,6 @@ class ThirdPartyRegistrationsController < ApplicationController before_filter :require_no_user - # skip_filter :load_user, :only => [:edit, :update] - # GET /third_party_registration/new # Displays the third party registration form. That view will then post to the correct controller for the # specific kind of registration method selected. app/controllers/third_party_registrations_controller.rb @@ -20,7 +20,7 @@ development: test: api_key: a2821daffa29277398ee7076f96cc36b - secret_key: + secret_key: canvas_page_name: mag2dev callback_url: http://dev.gnolia.com:8888 tunnel: config/facebooker.yml @@ -11,9 +11,6 @@ ActionController::Routing::Routes.draw do |map| map.resources :user_activations map.resources :password_resets - # facebook application - map.resources :seeds, :conditions => { :canvas => true } - # ================== # = Administration = # ================== config/routes.rb @@ -6,7 +6,13 @@ include BeforeFilterBehaviors describe ThirdPartyRegistrationsController do it_should_behave_like "a controller with before_filters" - + + it "should not call load_facebook_user if no UserSession was found" do + UserSession.should_receive(:find).and_return(nil) + controller.should_not_receive( :load_facebook_user ) + get :new + end + describe "responding to GET new" do describe "when not logged in" do spec/controllers/third_party_registrations_controller_spec.rb @@ -52,18 +52,18 @@ describe UserSessionsController do describe "with invalid params" do - it "should re-render the 'new' template" do + before(:each) do UserSession.should_receive(:find).and_return(nil) mock_user_session.should_receive(:save).and_return(false) UserSession.stub!(:new).and_return(mock_user_session(:save => false)) + end + + it "should re-render the 'new' template" do post :create, :user_session => {} response.should render_template('new') end it "should set the show password form flag" do - UserSession.should_receive(:find).and_return(nil) - mock_user_session.should_receive(:save).and_return(false) - UserSession.stub!(:new).and_return(mock_user_session(:save => false)) post :create, :user_session => {} assigns[:show_password_form].should ==(true) end @@ -74,23 +74,35 @@ describe UserSessionsController do describe "responding to DELETE" do - describe "when not logged in" do + describe "when logged in" do - it "should destroy the user_session" do - UserSession.should_receive(:find).and_return(mock_user_session) - mock_user_session.should_receive(:record).and_return(mock_user) - mock_user_session.should_receive(:destroy).and_return(true) - post :destroy - flash[:notice].should ==('Logout successful!') - end + before(:each) do + UserSession.should_receive(:find).and_return(mock_user_session) + mock_user_session.should_receive(:record).and_return(mock_user) + mock_user_session.should_receive(:destroy).and_return(true) + end + + it "should destroy the user_session" do + post :destroy + flash[:notice].should ==('Logout successful!') + end - it "should redirect to the login page" do - UserSession.should_receive(:find).and_return(mock_user_session) - mock_user_session.should_receive(:record).and_return(mock_user) - mock_user_session.should_receive(:destroy).and_return(true) - post :destroy - response.should redirect_to( login_url ) - end + it "should redirect to the login page" do + post :destroy + response.should redirect_to( login_url ) + end + + it "should destroy any facebook cookies" do + facebook_key = 'facebook_key' + cookies = mock('cookies') + controller.stub!(:cookies).and_return(cookies) + + cookies.stub!(:keys).and_return([facebook_key]) + Facebooker.stub!(:api_key).and_return(facebook_key) + cookies.should_receive(:delete).with(facebook_key) + + post :destroy + end end end spec/controllers/user_sessions_controller_spec.rb 1aa0e2f4d007db4d827fb6d2e7bec0f23697370a Jesse Clark jesse@jesseclark.com http://github.com/magnolia/magnolia/commit/4e7c7f8eb5ede09bed79731160dec73239665541 4e7c7f8eb5ede09bed79731160dec73239665541 2009-01-23T16:37:56-08:00 2009-01-23T16:37:56-08:00 Added specs for FacebookConnect login. 5e430fcb96aef4a1b37219f3dff41c31fb1a98dc Jesse Clark jesse@jesseclark.com