sorcery 0.8.4 → 0.8.5

data/spec/{rails3/spec → active_record}/controller_oauth_spec.rb

@@ -1,49 +1,52 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require File.expand_path(File.dirname(__FILE__) + '/../../shared_examples/controller_oauth_shared_examples')
+require 'spec_helper'
+
+require 'shared_examples/controller_oauth_shared_examples'
 require 'ostruct'
 
 def stub_all_oauth_requests!
   @consumer = OAuth::Consumer.new("key","secret", :site => "http://myapi.com")
-  OAuth::Consumer.stub!(:new).and_return(@consumer)
-  
+  OAuth::Consumer.stub(:new).and_return(@consumer)
+
   @req_token = OAuth::RequestToken.new(@consumer)
-  @consumer.stub!(:get_request_token).and_return(@req_token)
+  @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)
+  @req_token.stub(:get_access_token).and_return(@acc_token)
   session[:request_token] = @req_token.token
   session[:request_token_secret] = @req_token.secret
-  OAuth::RequestToken.stub!(:new).and_return(@req_token)
+  OAuth::RequestToken.stub(:new).and_return(@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)
+  @acc_token.stub(:get).and_return(response)
 end
 
-describe ApplicationController do
+describe SorceryController do
   before(:all) do
     ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
+    User.reset_column_information
+
     sorcery_reload!([:external])
     sorcery_controller_property_set(:external_providers, [:twitter])
     sorcery_controller_external_property_set(:twitter, :key, "eYVNBjBDi33aa9GkA3w")
     sorcery_controller_external_property_set(:twitter, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
     sorcery_controller_external_property_set(:twitter, :callback_url, "http://blabla.com")
   end
-  
+
   after(:all) do
     ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
   end
   # ----------------- OAuth -----------------------
-  describe ApplicationController, "'using external API to login'" do
-  
+  describe SorceryController, "'using external API to login'" do
+
     before(:each) do
       stub_all_oauth_requests!
     end
-      
+
     after(:each) do
       User.delete_all
       Authentication.delete_all
     end
-    
-    context "when callback_url begin with /" do 
+
+    context "when callback_url begin with /" do
       before do
         sorcery_controller_external_property_set(:twitter, :callback_url, "/oauth/twitter/callback")
       end
@@ -58,22 +61,22 @@ describe ApplicationController do
       end
     end
 
-    context "when callback_url begin with http://" do 
-      it "login_at redirects correctly" do
+    context "when callback_url begin with http://" do
+      it "login_at redirects correctly", pending: true do
         create_new_user
         get :login_at_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
     end
-    
+
     it "logins if user exists" do
       sorcery_model_property_set(:authentications_class, Authentication)
       create_new_external_user(:twitter)
       get :test_login_from, :oauth_verifier => "blablaRERASDFcxvSDFA"
       flash[:notice].should == "Success!"
     end
-    
+
     it "'login_from' fails if user doesn't exist" do
       sorcery_model_property_set(:authentications_class, Authentication)
       create_new_user
@@ -90,32 +93,32 @@ describe ApplicationController do
     end
 
   end
-  
-  describe ApplicationController do
+
+  describe SorceryController do
     it_behaves_like "oauth_controller"
   end
-  
-  describe ApplicationController, "using OAuth with User Activation features" do
+
+  describe SorceryController, "using OAuth with User Activation features" do
     before(:all) do
       ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/activation")
       sorcery_reload!([:user_activation,:external], :user_activation_mailer => ::SorceryMailer)
     end
-    
+
     after(:all) do
       ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/activation")
     end
-    
+
     after(:each) do
       User.delete_all
       Authentication.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)
@@ -125,16 +128,18 @@ describe ApplicationController do
     end
   end
 
-  describe ApplicationController, "OAuth with user activation features"  do
+  describe SorceryController, "OAuth with user activation features"  do
     before(:all) do
       ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
       ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/activity_logging")
+      User.reset_column_information
       sorcery_reload!([:activity_logging, :external])
     end
 
     after(:all) do
       ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
       ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/activity_logging")
+      User.reset_column_information
     end
 
     context "when twitter" do
@@ -164,9 +169,10 @@ describe ApplicationController do
     end
   end
 
-  describe ApplicationController, "OAuth with session timeout features" do
+  describe SorceryController, "OAuth with session timeout features" do
     before(:all) do
       ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
+      User.reset_column_information
       sorcery_reload!([:session_timeout, :external])
     end
 

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

@@ -1,56 +1,56 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
+
+describe SorceryController do
 
-describe ApplicationController do
-  
   # ----------------- REMEMBER ME -----------------------
-  describe ApplicationController, "with remember me features" do
-    
+  describe SorceryController, "with remember me features" do
+
     before(:all) do
       ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/remember_me")
+      User.reset_column_information
       sorcery_reload!([:remember_me])
     end
-    
+
     before(:each) do
       create_new_user
     end
-    
+
     after(:all) do
       ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/remember_me")
     end
-    
+
     after(:each) do
       session = nil
       cookies = nil
       User.delete_all
     end
-    
+
     it "should set cookie on remember_me!" do
-      post :test_login_with_remember, :username => 'gizmo', :password => 'secret'
-      @request.cookies.merge!(cookies)
-      cookies = ActionDispatch::Cookies::CookieJar.build(@request)
+      post :test_login_with_remember, :email => 'bla@bla.com', :password => 'secret'
+      # @request.cookies.merge!(cookies)
+      # cookies = ActionDispatch::Cookies::CookieJar.build(@request)
       cookies.signed["remember_me_token"].should == assigns[:current_user].remember_me_token
     end
-    
+
     it "should clear cookie on forget_me!" do
       cookies["remember_me_token"] == {:value => 'asd54234dsfsd43534', :expires => 3600}
       get :test_logout
       cookies["remember_me_token"].should be_nil
     end
-    
-    it "login(username,password,remember_me) should login and remember" do
-      post :test_login_with_remember_in_login, :username => 'gizmo', :password => 'secret', :remember => "1"
-      @request.cookies.merge!(cookies)
-      cookies = ActionDispatch::Cookies::CookieJar.build(@request)
+
+    it "login(email,password,remember_me) should login and remember" do
+      post :test_login_with_remember_in_login, :email => 'bla@bla.com', :password => 'secret', :remember => "1"
+      # cookies = ActionDispatch::Cookies::CookieJar.build(@request)
       cookies.signed["remember_me_token"].should_not be_nil
       cookies.signed["remember_me_token"].should == assigns[:user].remember_me_token
     end
-    
+
     it "logout should also forget_me!" do
       session[:user_id] = @user.id
       get :test_logout_with_remember
       cookies["remember_me_token"].should be_nil
     end
-    
+
     it "should login_from_cookie" do
       session[:user_id] = @user.id
       subject.remember_me!
@@ -61,20 +61,20 @@ describe ApplicationController do
       get :test_login_from_cookie
       assigns[:current_user].should == @user
     end
-    
+
     it "should not remember_me! when not asked to, even if third parameter is used" do
-      post :test_login_with_remember_in_login, :username => 'gizmo', :password => 'secret', :remember => "0"
+      post :test_login_with_remember_in_login, :email => 'bla@bla.com', :password => 'secret', :remember => "0"
       cookies["remember_me_token"].should be_nil
     end
-    
+
     it "should not remember_me! when not asked to" do
-      post :test_login, :username => 'gizmo', :password => 'secret'
+      post :test_login, :email => 'bla@bla.com', :password => 'secret'
       cookies["remember_me_token"].should be_nil
     end
-    
+
     # --- login_user(user) ---
     specify { should respond_to(:auto_login) }
-        
+
     it "auto_login(user) should login a user instance without remembering" do
       create_new_user
       session[:user_id] = nil
@@ -83,7 +83,7 @@ describe ApplicationController do
       assigns[:current_user].should == @user
       cookies["remember_me_token"].should be_nil
     end
-    
+
     it "auto_login(user, true) should login a user instance with remembering" do
       create_new_user
       session[:user_id] = nil
@@ -91,6 +91,6 @@ describe ApplicationController do
       get :test_login_from_cookie
       assigns[:current_user].should == @user
       cookies["remember_me_token"].should_not be_nil
-    end       
+    end
   end
 end

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

@@ -1,26 +1,26 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
+
+describe SorceryController do
 
-describe ApplicationController do
-  
   # ----------------- SESSION TIMEOUT -----------------------
-  describe ApplicationController, "with session timeout features" do
+  describe SorceryController, "with session timeout features" do
     before(:all) do
       sorcery_reload!([:session_timeout])
       sorcery_controller_property_set(:session_timeout,0.5)
       create_new_user
     end
-    
+
     after(:each) do
       Timecop.return
     end
-    
+
     it "should not reset session before session timeout" do
       login_user
       get :test_should_be_logged_in
       session[:user_id].should_not be_nil
       response.should be_a_success
     end
-    
+
     it "should reset session after session timeout" do
       login_user
       Timecop.travel(Time.now.in_time_zone+0.6)
@@ -28,11 +28,11 @@ describe ApplicationController do
       session[:user_id].should be_nil
       response.should be_a_redirect
     end
-    
+
     context "with 'session_timeout_from_last_action'" do
       it "should not logout if there was activity" do
         sorcery_controller_property_set(:session_timeout_from_last_action, true)
-        get :test_login, :username => 'gizmo', :password => 'secret'
+        get :test_login, :email => 'bla@bla.com', :password => 'secret'
         Timecop.travel(Time.now.in_time_zone+0.3)
         get :test_should_be_logged_in
         session[:user_id].should_not be_nil
@@ -41,10 +41,10 @@ describe ApplicationController do
         session[:user_id].should_not be_nil
         response.should be_a_success
       end
-    
+
       it "with 'session_timeout_from_last_action' should logout if there was no activity" do
         sorcery_controller_property_set(:session_timeout_from_last_action, true)
-        get :test_login, :username => 'gizmo', :password => 'secret'
+        get :test_login, :email => 'bla@bla.com', :password => 'secret'
         Timecop.travel(Time.now.in_time_zone+0.6)
         get :test_should_be_logged_in
         session[:user_id].should be_nil

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

@@ -1,9 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
-describe ApplicationController do
+describe SorceryController do
 
   # ----------------- PLUGIN CONFIGURATION -----------------------
-  describe ApplicationController, "plugin configuration" do
+  describe SorceryController, "plugin configuration" do
     before(:all) do
       sorcery_reload!
     end
@@ -26,7 +26,7 @@ describe ApplicationController do
   end
 
   # ----------------- PLUGIN ACTIVATED -----------------------
-  describe ApplicationController, "when activated with sorcery" do
+  describe SorceryController, "when activated with sorcery" do
     before(:all) do
       sorcery_reload!
       User.delete_all
@@ -41,7 +41,7 @@ describe ApplicationController do
       sorcery_reload!
       User.delete_all
       sorcery_controller_property_set(:user_class, User)
-      sorcery_model_property_set(:username_attribute_names, [:username, :email])
+      sorcery_model_property_set(:username_attribute_names, [:email])
     end
 
     specify { should respond_to(:login) }
@@ -53,52 +53,52 @@ describe ApplicationController do
     specify { should respond_to(:current_user) }
 
     it "login(username,password) should return the user when success and set the session with user.id" do
-      get :test_login, :username => 'gizmo', :password => 'secret'
+      get :test_login, :email => 'bla@bla.com', :password => 'secret'
       assigns[:user].should == @user
       session[:user_id].should == @user.id
     end
 
     it "login(email,password) should return the user when success and set the session with user.id" do
-      get :test_login, :username => 'bla@bla.com', :password => 'secret'
+      get :test_login, :email => 'bla@bla.com', :password => 'secret'
       assigns[:user].should == @user
       session[:user_id].should == @user.id
     end
 
     it "login(username,password) should return nil and not set the session when failure" do
-      get :test_login, :username => 'gizmo', :password => 'opensesame!'
+      get :test_login, :email => 'bla@bla.com', :password => 'opensesame!'
       assigns[:user].should be_nil
       session[:user_id].should be_nil
     end
 
     it "login(email,password) should return the user when success and set the session with the _csrf_token" do
-      get :test_login, :username => 'gizmo', :password => 'secret'
+      get :test_login, :email => 'bla@bla.com', :password => 'secret'
       session[:_csrf_token].should_not be_nil
     end
 
     it "login(username,password) should return nil and not set the session when upper case username" do
-      get :test_login, :username => 'GIZMO', :password => 'secret'
+      get :test_login, :email => 'BLA@BLA.COM', :password => 'secret'
       assigns[:user].should be_nil
       session[:user_id].should be_nil
     end
 
     it "login(username,password) should return the user and set the session with user.id when upper case username and config is downcase before authenticating" do
       sorcery_model_property_set(:downcase_username_before_authenticating, true)
-      get :test_login, :username => 'GIZMO', :password => 'secret'
+      get :test_login, :email => 'BLA@BLA.COM', :password => 'secret'
       assigns[:user].should == @user
       session[:user_id].should == @user.id
     end
 
     it "login(username,password) should return nil and not set the session when user was created with upper case username, config is default, and log in username is lower case" do
-      create_new_user({:username => 'GIZMO1', :email => "bla1@bla.com", :password => 'secret1'})
-      get :test_login, :username => 'gizmo1', :password => 'secret1'
+      create_new_user({:username => "", :email => "BLA1@BLA.COM", :password => 'secret1'})
+      get :test_login, :email => 'bla1@bla.com', :password => 'secret1'
       assigns[:user].should be_nil
       session[:user_id].should be_nil
     end
 
     it "login(username,password) should return the user and set the session with user.id when user was created with upper case username and config is downcase before authenticating" do
       sorcery_model_property_set(:downcase_username_before_authenticating, true)
-      create_new_user({:username => 'GIZMO1', :email => "bla1@bla.com", :password => 'secret1'})
-      get :test_login, :username => 'gizmo1', :password => 'secret1'
+      create_new_user({:username => "", :email => "BLA1@BLA.COM", :password => 'secret1'})
+      get :test_login, :email => 'bla1@bla.com', :password => 'secret1'
       assigns[:user].should == @user
       session[:user_id].should == @user.id
     end
@@ -123,12 +123,12 @@ describe ApplicationController do
     it "current_user should return the user instance if logged in" do
       create_new_user
       session[:user_id] = @user.id
-      subject.current_user.should == @user
+      2.times { subject.current_user.should == @user } # memoized!
     end
 
     it "current_user should return false if not logged in" do
       session[:user_id] = nil
-      subject.current_user.should == false
+      2.times { subject.current_user.should == false } # memoized!
     end
 
     specify { should respond_to(:require_login) }
@@ -142,7 +142,7 @@ describe ApplicationController do
 
     it "require_login before_filter should save the url that the user originally wanted" do
       get :some_action
-      session[:return_to_url].should == "http://test.host/application/some_action"
+      session[:return_to_url].should == "http://test.host/some_action"
       response.should redirect_to("http://test.host/")
     end
 
@@ -155,7 +155,7 @@ describe ApplicationController do
 
     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'
+      post :test_return_to, :email => 'bla@bla.com', :password => 'secret'
       response.should redirect_to("http://test.host/some_action")
       flash[:notice].should == "haha!"
     end