sorcery 0.1.1 → 0.2.0

data/spec/rails3/app_root/spec/controller_activity_logging_spec.rb

@@ -0,0 +1,84 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe ApplicationController do
+  before(:all) do
+    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/activity_logging")
+  end
+  
+  after(:all) do
+    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/activity_logging")
+  end
+  
+  # ----------------- ACTIVITY LOGGING -----------------------
+  describe ApplicationController, "with activity logging features" do
+    before(:all) do
+      sorcery_reload!([:activity_logging])
+    end
+
+    before(:each) do
+      create_new_user
+    end
+
+    after(:each) do
+      User.delete_all
+    end
+
+    it "should respond to 'current_users'" do
+      subject.should respond_to(:current_users)
+    end
+
+    it "'current_users' should be empty when no users are logged in" do
+      subject.current_users.size.should == 0
+    end
+
+    it "should log login time on login" do
+      now = Time.now.utc
+      login_user
+      @user.last_login_at.should_not be_nil
+      @user.last_login_at.to_s(:db).should >= now.to_s(:db)
+      @user.last_login_at.to_s(:db).should <= (now+2).to_s(:db)
+    end
+
+    it "should log logout time on logout" do
+      login_user
+      now = Time.now.utc
+      logout_user
+      User.first.last_logout_at.should_not be_nil
+      User.first.last_logout_at.to_s(:db).should >= now.to_s(:db)
+      User.first.last_logout_at.to_s(:db).should <= (now+2).to_s(:db)
+    end
+
+    it "should log last activity time when logged in" do
+      login_user
+      now = Time.now.utc
+      get :some_action
+      User.first.last_activity_at.to_s(:db).should >= now.to_s(:db)
+      User.first.last_activity_at.to_s(:db).should <= (now+2).to_s(:db)
+    end
+
+    it "'current_users' should hold the user object when 1 user is logged in" do
+      login_user
+      get :some_action
+      subject.current_users.size.should == 1
+      subject.current_users[0].should == @user
+    end
+
+    it "'current_users' should show all current_users, whether they have logged out before or not." do
+      user1 = create_new_user({:username => 'gizmo1', :email => "bla1@bla.com", :password => 'secret1'})
+      login_user(user1)
+      get :some_action
+      clear_user_without_logout
+      user2 = create_new_user({:username => 'gizmo2', :email => "bla2@bla.com", :password => 'secret2'})
+      login_user(user2)
+      get :some_action
+      clear_user_without_logout
+      user3 = create_new_user({:username => 'gizmo3', :email => "bla3@bla.com", :password => 'secret3'})
+      login_user(user3)
+      get :some_action
+      subject.current_users.size.should == 3
+      subject.current_users[0].should == user1
+      subject.current_users[1].should == user2
+      subject.current_users[2].should == user3
+    end
+  end
+end

data/spec/rails3/app_root/spec/controller_brute_force_protection_spec.rb

@@ -0,0 +1,65 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe ApplicationController do
+  before(:all) do
+    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/brute_force_protection")
+  end
+  
+  after(:all) do
+    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/brute_force_protection")
+  end
+  
+  # ----------------- SESSION TIMEOUT -----------------------
+  describe ApplicationController, "with brute force protection features" do
+    before(:all) do
+      sorcery_reload!([:brute_force_protection])
+      create_new_user
+    end
+    
+    after(:each) do
+      Sorcery::Controller::Config.reset!
+      sorcery_controller_property_set(:user_class, User)
+    end
+    
+    it "should count login retries" do
+      3.times {get :test_login, :username => 'gizmo', :password => 'blabla'}
+      User.find_by_username('gizmo').failed_logins_count.should == 3
+    end
+    
+    it "should reset the counter on a good login" do
+      sorcery_model_property_set(:consecutive_login_retries_amount_limit, 5)
+      3.times {get :test_login, :username => 'gizmo', :password => 'blabla'}
+      get :test_login, :username => 'gizmo', :password => 'secret'
+      User.find_by_username('gizmo').failed_logins_count.should == 0
+    end
+    
+    it "should lock user when number of retries reached the limit" do
+      User.find_by_username('gizmo').lock_expires_at.should be_nil
+      sorcery_model_property_set(:consecutive_login_retries_amount_limit, 1)
+      get :test_login, :username => 'gizmo', :password => 'blabla'
+      User.find_by_username('gizmo').lock_expires_at.should_not be_nil
+    end
+
+    it "should unlock after lock time period passes" do
+      sorcery_model_property_set(:consecutive_login_retries_amount_limit, 2)
+      sorcery_model_property_set(:login_lock_time_period, 0.2)
+      get :test_login, :username => 'gizmo', :password => 'blabla'
+      get :test_login, :username => 'gizmo', :password => 'blabla'
+      User.find_by_username('gizmo').lock_expires_at.should_not be_nil
+      sleep 0.3
+      get :test_login, :username => 'gizmo', :password => 'blabla'
+      User.find_by_username('gizmo').lock_expires_at.should be_nil
+    end
+
+    it "should not unlock if time period is 0 (permanent lock)" do
+      sorcery_model_property_set(:consecutive_login_retries_amount_limit, 2)
+      sorcery_model_property_set(:login_lock_time_period, 0)
+      get :test_login, :username => 'gizmo', :password => 'blabla'
+      get :test_login, :username => 'gizmo', :password => 'blabla'
+      unlock_date = User.find_by_username('gizmo').lock_expires_at
+      sleep 1
+      get :test_login, :username => 'gizmo', :password => 'blabla'
+      User.find_by_username('gizmo').lock_expires_at.to_s.should == unlock_date.to_s
+    end
+  end
+end

data/spec/rails3/app_root/spec/controller_http_basic_auth_spec.rb

@@ -0,0 +1,50 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe ApplicationController do
+  
+  # ----------------- HTTP BASIC AUTH -----------------------
+  describe ApplicationController, "with http basic auth features" do
+    before(:all) do
+      sorcery_reload!([:http_basic_auth])
+      create_new_user
+    end
+    
+    after(:each) do
+      logout_user
+    end
+    
+    it "requests basic authentication when before_filter is used" do
+      get :test_http_basic_auth
+      response.code.should == "401"
+    end
+    
+    it "authenticates from http basic if credentials are sent" do
+      @request.env["HTTP_AUTHORIZATION"] = "Basic " + Base64::encode64("#{@user.username}:secret")
+      get :test_http_basic_auth, nil, :http_authentication_used => true
+      response.should be_a_success
+    end
+    
+    it "fails authentication if credentials are wrong" do
+      @request.env["HTTP_AUTHORIZATION"] = "Basic " + Base64::encode64("#{@user.username}:wrong!")
+      get :test_http_basic_auth, nil, :http_authentication_used => true
+      response.code.should redirect_to root_url
+    end
+    
+    it "should allow configuration option 'controller_to_realm_map'" do
+      sorcery_controller_property_set(:controller_to_realm_map, {"1" => "2"})
+      Sorcery::Controller::Config.controller_to_realm_map.should == {"1" => "2"}
+    end
+    
+    it "should display the correct realm name configured for the controller" do
+      sorcery_controller_property_set(:controller_to_realm_map, {"application" => "Salad"})
+      get :test_http_basic_auth
+      response.headers["WWW-Authenticate"].should == "Basic realm=\"Salad\""
+    end
+    
+    it "should sign in the user's session on successful login" do
+      @request.env["HTTP_AUTHORIZATION"] = "Basic " + Base64::encode64("#{@user.username}:secret")
+      get :test_http_basic_auth, nil, :http_authentication_used => true
+      session[:user_id].should == User.find_by_username(@user.username).id
+    end
+  end
+end

data/spec/rails3/app_root/spec/controller_oauth2_spec.rb

@@ -0,0 +1,117 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+def stub_all_oauth2_requests!
+  @client = OAuth2::Client.new("key","secret", :site => "http://myapi.com")
+  OAuth2::Client.stub!(:new).and_return(@client)
+  @acc_token = OAuth2::AccessToken.new(@client, "", "asd", nil, {})
+  @webby = @client.web_server
+  OAuth2::Strategy::WebServer.stub!(:new).and_return(@webby)
+  @webby.stub!(:get_access_token).and_return(@acc_token)
+  @acc_token.stub!(:get).and_return({"id"=>"123", "name"=>"Noam Ben Ari", "first_name"=>"Noam", "last_name"=>"Ben Ari", "link"=>"http://www.facebook.com/nbenari1", "hometown"=>{"id"=>"110619208966868", "name"=>"Haifa, Israel"}, "location"=>{"id"=>"106906559341067", "name"=>"Pardes Hanah, Hefa, Israel"}, "bio"=>"I'm a new daddy, and enjoying it!", "gender"=>"male", "email"=>"nbenari@gmail.com", "timezone"=>2, "locale"=>"en_US", "languages"=>[{"id"=>"108405449189952", "name"=>"Hebrew"}, {"id"=>"106059522759137", "name"=>"English"}, {"id"=>"112624162082677", "name"=>"Russian"}], "verified"=>true, "updated_time"=>"2011-02-16T20:59:38+0000"}.to_json)
+end
+
+describe ApplicationController do
+  before(:all) do
+    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/oauth")
+    sorcery_reload!([:oauth])
+    sorcery_controller_property_set(:oauth_providers, [:facebook])
+    sorcery_controller_oauth_property_set(:facebook, :key, "eYVNBjBDi33aa9GkA3w")
+    sorcery_controller_oauth_property_set(:facebook, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
+    sorcery_controller_oauth_property_set(:facebook, :callback_url, "http://blabla.com")
+  end
+  
+  after(:all) do
+    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/oauth")
+  end
+  # ----------------- OAuth -----------------------
+  describe ApplicationController, "with OAuth features" do
+  
+    before(:each) do
+      stub_all_oauth2_requests!
+    end
+      
+    after(:each) do
+      User.delete_all
+    end
+    
+    it "auth_at_provider redirects correctly" do
+      create_new_user
+      get :auth_at_provider_test2
+      response.should be_a_redirect
+      response.should redirect_to("http://myapi.com/oauth/authorize?client_id=key&redirect_uri=http%3A%2F%2Fblabla.com&scope=email%2Coffline_access&type=web_server")
+    end
+    
+    it "'login_from_access_token' logins if user exists" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      create_new_external_user(:facebook)
+      get :test_login_from_access_token2
+      flash[:notice].should == "Success!"
+    end
+    
+    it "'login_from_access_token' fails if user doesn't exist" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      create_new_user
+      get :test_login_from_access_token2
+      flash[:alert].should == "Failed!"
+    end
+  end
+  
+  describe ApplicationController, "'create_from_provider!'" do
+    before(:each) do
+      stub_all_oauth2_requests!
+      User.delete_all
+    end
+      
+    it "should create a new user" do
+      sorcery_controller_property_set(:authentications_class, Authentication)
+      sorcery_controller_oauth_property_set(:facebook, :user_info_mapping, {:username => "name"})
+      lambda do
+        get :test_create_from_provider, :provider => "facebook"
+      end.should change(User, :count).by(1)
+      User.first.username.should == "Noam Ben Ari"
+    end
+    
+    it "should support nested attributes" do
+      sorcery_controller_property_set(:authentications_class, Authentication)
+      sorcery_controller_oauth_property_set(:facebook, :user_info_mapping, {:username => "hometown/name"})
+      lambda do
+        get :test_create_from_provider, :provider => "facebook"
+      end.should change(User, :count).by(1)
+      User.first.username.should == "Haifa, Israel"
+    end
+  end
+  
+  describe ApplicationController, "OAuth with User Activation features" do
+    before(:all) do
+      ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/activation")
+      sorcery_reload!([:user_activation,:oauth], :user_activation_mailer => ::SorceryMailer)
+      sorcery_controller_property_set(:oauth_providers, [:facebook])
+      sorcery_controller_oauth_property_set(:facebook, :key, "eYVNBjBDi33aa9GkA3w")
+      sorcery_controller_oauth_property_set(:facebook, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
+      sorcery_controller_oauth_property_set(:facebook, :callback_url, "http://blabla.com")
+    end
+    
+    after(:all) do
+      ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/activation")
+    end
+    
+    after(:each) do
+      User.delete_all
+    end
+    
+    it "should not send activation email to external users" do
+      old_size = ActionMailer::Base.deliveries.size
+      create_new_external_user(:facebook)
+      ActionMailer::Base.deliveries.size.should == old_size
+    end
+    
+    it "should not send external users an activation success email" do
+      sorcery_model_property_set(:activation_success_email_method_name, nil)
+      create_new_external_user(:facebook)
+      old_size = ActionMailer::Base.deliveries.size
+      @user.activate!
+      ActionMailer::Base.deliveries.size.should == old_size
+    end
+  end
+  
+end

data/spec/rails3/app_root/spec/controller_oauth_spec.rb

@@ -0,0 +1,117 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'ostruct'
+
+def stub_all_oauth_requests!
+  @consumer = OAuth::Consumer.new("key","secret", :site => "http://myapi.com")
+  OAuth::Consumer.stub!(:new).and_return(@consumer)
+  
+  @req_token = OAuth::RequestToken.new(@consumer)
+  @consumer.stub!(:get_request_token).and_return(@req_token)
+  @acc_token = OAuth::AccessToken.new(@consumer)
+  @req_token.stub!(:get_access_token).and_return(@acc_token)
+  session[:request_token] = @req_token
+  response = OpenStruct.new()
+  response.body = {"following"=>false, "listed_count"=>0, "profile_link_color"=>"0084B4", "profile_image_url"=>"http://a1.twimg.com/profile_images/536178575/noamb_normal.jpg", "description"=>"Programmer/Heavy Metal Fan/New Father", "status"=>{"text"=>"coming soon to sorcery gem: twitter and facebook authentication support.", "truncated"=>false, "favorited"=>false, "source"=>"web", "geo"=>nil, "in_reply_to_screen_name"=>nil, "in_reply_to_user_id"=>nil, "in_reply_to_status_id_str"=>nil, "created_at"=>"Sun Mar 06 23:01:12 +0000 2011", "contributors"=>nil, "place"=>nil, "retweeted"=>false, "in_reply_to_status_id"=>nil, "in_reply_to_user_id_str"=>nil, "coordinates"=>nil, "retweet_count"=>0, "id"=>44533012284706816, "id_str"=>"44533012284706816"}, "show_all_inline_media"=>false, "geo_enabled"=>true, "profile_sidebar_border_color"=>"a8c7f7", "url"=>nil, "followers_count"=>10, "screen_name"=>"nbenari", "profile_use_background_image"=>true, "location"=>"Israel", "statuses_count"=>25, "profile_background_color"=>"022330", "lang"=>"en", "verified"=>false, "notifications"=>false, "profile_background_image_url"=>"http://a3.twimg.com/profile_background_images/104087198/04042010339.jpg", "favourites_count"=>5, "created_at"=>"Fri Nov 20 21:58:19 +0000 2009", "is_translator"=>false, "contributors_enabled"=>false, "protected"=>false, "follow_request_sent"=>false, "time_zone"=>"Greenland", "profile_text_color"=>"333333", "name"=>"Noam Ben Ari", "friends_count"=>10, "profile_sidebar_fill_color"=>"C0DFEC", "id"=>123, "id_str"=>"91434812", "profile_background_tile"=>false, "utc_offset"=>-10800}.to_json
+  @acc_token.stub!(:get).and_return(response)
+end
+
+describe ApplicationController do
+  before(:all) do
+    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/oauth")
+    sorcery_reload!([:oauth])
+    sorcery_controller_property_set(:oauth_providers, [:twitter])
+    sorcery_controller_oauth_property_set(:twitter, :key, "eYVNBjBDi33aa9GkA3w")
+    sorcery_controller_oauth_property_set(:twitter, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
+    sorcery_controller_oauth_property_set(:twitter, :callback_url, "http://blabla.com")
+  end
+  
+  after(:all) do
+    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/oauth")
+  end
+  # ----------------- OAuth -----------------------
+  describe ApplicationController, "'login_from_access_token'" do
+  
+    before(:each) do
+      stub_all_oauth_requests!
+    end
+      
+    after(:each) do
+      User.delete_all
+    end
+    
+    it "auth_at_provider redirects correctly" do
+      create_new_user
+      get :auth_at_provider_test
+      response.should be_a_redirect
+      response.should redirect_to("http://myapi.com/oauth/authorize?oauth_callback=http%3A%2F%2Fblabla.com&oauth_token=")
+    end
+    
+    it "logins if user exists" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      create_new_external_user(:twitter)
+      get :test_login_from_access_token, :oauth_verifier => "blablaRERASDFcxvSDFA"
+      flash[:notice].should == "Success!"
+    end
+    
+    it "'login_from_access_token' fails if user doesn't exist" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      create_new_user
+      get :test_login_from_access_token, :oauth_verifier => "blablaRERASDFcxvSDFA"
+      flash[:alert].should == "Failed!"
+    end
+  end
+  
+  describe ApplicationController, "'create_from_provider!'" do
+    before(:each) do
+      stub_all_oauth_requests!
+      User.delete_all
+    end
+      
+    it "should create a new user" do
+      sorcery_controller_property_set(:authentications_class, Authentication)
+      sorcery_controller_oauth_property_set(:twitter, :user_info_mapping, {:username => "screen_name"})
+      lambda do
+        get :test_create_from_provider, :provider => "twitter"
+      end.should change(User, :count).by(1)
+      User.first.username.should == "nbenari"
+    end
+    
+    it "should support nested attributes" do
+      sorcery_controller_property_set(:authentications_class, Authentication)
+      sorcery_controller_oauth_property_set(:twitter, :user_info_mapping, {:username => "status/text"})
+      lambda do
+        get :test_create_from_provider, :provider => "twitter"
+      end.should change(User, :count).by(1)
+      User.first.username.should == "coming soon to sorcery gem: twitter and facebook authentication support."
+    end
+  end
+  
+  describe ApplicationController, "OAuth with User Activation features" do
+    before(:all) do
+      ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/activation")
+      sorcery_reload!([:user_activation,:oauth], :user_activation_mailer => ::SorceryMailer)
+    end
+    
+    after(:all) do
+      ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/activation")
+    end
+    
+    after(:each) do
+      User.delete_all
+    end
+    
+    it "should not send activation email to external users" do
+      old_size = ActionMailer::Base.deliveries.size
+      create_new_external_user(:twitter)
+      ActionMailer::Base.deliveries.size.should == old_size
+    end
+    
+    it "should not send external users an activation success email" do
+      sorcery_model_property_set(:activation_success_email_method_name, nil)
+      create_new_external_user(:twitter)
+      old_size = ActionMailer::Base.deliveries.size
+      @user.activate!
+      ActionMailer::Base.deliveries.size.should == old_size
+    end
+  end
+end

data/spec/rails3/{controller_remember_me_spec.rb → app_root/spec/controller_remember_me_spec.rb}

@@ -6,7 +6,7 @@ describe ApplicationController do
   describe ApplicationController, "with remember me features" do
     before(:all) do
       ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/remember_me")
-      plugin_model_configure([:remember_me])
+      sorcery_reload!([:remember_me])
     end
     
     before(:each) do
@@ -25,7 +25,7 @@ describe ApplicationController do
     
     it "should set cookie on remember_me!" do
       post :test_login_with_remember, :username => 'gizmo', :password => 'secret'
-      cookies["remember_me_token"].should == assigns[:logged_in_user].remember_me_token
+      cookies["remember_me_token"].should == assigns[:current_user].remember_me_token
     end
     
     it "should clear cookie on forget_me!" do
@@ -50,11 +50,11 @@ describe ApplicationController do
       session[:user_id] = @user.id
       subject.remember_me!
       subject.instance_eval do
-        @logged_in_user = nil
+        @current_user = nil
       end
       session[:user_id] = nil
       get :test_login_from_cookie
-      assigns[:logged_in_user].should == @user
+      assigns[:current_user].should == @user
     end
     
     it "should not remember_me! when not asked to" do

data/spec/rails3/{controller_session_timeout_spec.rb → app_root/spec/controller_session_timeout_spec.rb}

@@ -5,8 +5,8 @@ describe ApplicationController do
   # ----------------- SESSION TIMEOUT -----------------------
   describe ApplicationController, "with session timeout features" do
     before(:all) do
-      plugin_model_configure([:session_timeout])
-      plugin_set_controller_config_property(:session_timeout,0.5)
+      sorcery_reload!([:session_timeout])
+      sorcery_controller_property_set(:session_timeout,0.5)
       create_new_user
     end
     
@@ -26,7 +26,7 @@ describe ApplicationController do
     end
     
     it "with 'session_timeout_from_last_action' should not logout if there was activity" do
-      plugin_set_controller_config_property(:session_timeout_from_last_action, true)
+      sorcery_controller_property_set(:session_timeout_from_last_action, true)
       login_user
       sleep 0.3
       get :test_should_be_logged_in
@@ -38,12 +38,13 @@ describe ApplicationController do
     end
     
     it "with 'session_timeout_from_last_action' should logout if there was no activity" do
-      plugin_set_controller_config_property(:session_timeout_from_last_action, true)
+      sorcery_controller_property_set(:session_timeout_from_last_action, true)
       login_user
       sleep 0.6
       get :test_should_be_logged_in
       session[:user_id].should be_nil
       response.should be_a_redirect
     end
+    
   end
 end

data/spec/rails3/{controller_spec.rb → app_root/spec/controller_spec.rb}

@@ -5,21 +5,21 @@ describe ApplicationController do
   # ----------------- PLUGIN CONFIGURATION -----------------------
   describe ApplicationController, "plugin configuration" do
     before(:all) do
-      plugin_model_configure
+      sorcery_reload!
     end
     
     after(:each) do
       Sorcery::Controller::Config.reset!
-      plugin_model_configure
+      sorcery_reload!
     end
     
     it "should enable configuration option 'user_class'" do
-      plugin_set_controller_config_property(:user_class, TestUser)
+      sorcery_controller_property_set(:user_class, TestUser)
       Sorcery::Controller::Config.user_class.should equal(TestUser)
     end
     
     it "should enable configuration option 'not_authenticated_action'" do
-      plugin_set_controller_config_property(:not_authenticated_action, :my_action)
+      sorcery_controller_property_set(:not_authenticated_action, :my_action)
       Sorcery::Controller::Config.not_authenticated_action.should equal(:my_action)
     end
     
@@ -34,7 +34,7 @@ describe ApplicationController do
   
     after(:each) do
       Sorcery::Controller::Config.reset!
-      plugin_set_controller_config_property(:user_class, User)
+      sorcery_controller_property_set(:user_class, User)
     end
     
     it "should respond to the instance method login" do
@@ -49,8 +49,8 @@ describe ApplicationController do
       should respond_to(:logged_in?)
     end
     
-    it "should respond to the instance method logged_in_user" do
-      should respond_to(:logged_in_user)
+    it "should respond to the instance method current_user" do
+      should respond_to(:current_user)
     end
   
     it "login(username,password) should return the user when success and set the session with user.id" do
@@ -82,34 +82,41 @@ describe ApplicationController do
       subject.logged_in?.should be_false
     end
     
-    it "logged_in_user should return the user instance if logged in" do
+    it "current_user should return the user instance if logged in" do
       create_new_user
       session[:user_id] = @user.id
-      subject.logged_in_user.should == @user
+      subject.current_user.should == @user
     end
     
-    it "logged_in_user should return false if not logged in" do
+    it "current_user should return false if not logged in" do
       session[:user_id] = nil
-      subject.logged_in_user.should == false
+      subject.current_user.should == false
     end
     
-    it "should respond to 'require_user_login'" do
-      should respond_to(:require_user_login)
+    it "should respond to 'require_login'" do
+      should respond_to(:require_login)
     end
     
     it "should call the configured 'not_authenticated_action' when authenticate before_filter fails" do
       session[:user_id] = nil
-      plugin_set_controller_config_property(:not_authenticated_action, :test_not_authenticated_action)
+      sorcery_controller_property_set(:not_authenticated_action, :test_not_authenticated_action)
       get :test_logout
       response.body.should == "test_not_authenticated_action"
     end
     
-    it "require_user_login before_filter should save the url that the user originally wanted" do
+    it "require_login before_filter should save the url that the user originally wanted" do
       get :some_action
-      session[:user_wanted_url].should == "http://test.host/some_action"
+      session[:return_to_url].should == "http://test.host/application/some_action"
       response.should redirect_to("http://test.host/")
     end
     
+    it "on successful login the user should be redirected to the url he originally wanted" do
+      session[:return_to_url] = "http://test.host/some_action"
+      post :test_return_to, :username => 'gizmo', :password => 'secret'
+      response.should redirect_to("http://test.host/some_action")
+      flash[:notice].should == "haha!"
+    end
+    
   end
   
 end

data/spec/rails3/app_root/spec/spec_helper.orig.rb

@@ -0,0 +1,27 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+
+RSpec.configure do |config|
+  # == Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+  config.mock_with :rspec
+
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+end