sorcery 0.8.5 → 0.8.6

data/spec/active_record/controller_oauth_spec.rb

@@ -4,22 +4,24 @@ 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)
-
-  @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.token
-  session[:request_token_secret] = @req_token.secret
-  OAuth::RequestToken.stub(:new).and_return(@req_token)
+  consumer = OAuth::Consumer.new("key","secret", :site => "http://myapi.com")
+  req_token = OAuth::RequestToken.new(consumer)
+  acc_token = OAuth::AccessToken.new(consumer)
+
   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)
+
+  session[:request_token] = req_token.token
+  session[:request_token_secret] = req_token.secret
+
+  allow(OAuth::Consumer).to receive(:new) { consumer }
+  allow(consumer).to receive(:get_request_token) { req_token }
+  allow(req_token).to receive(:get_access_token) { acc_token }
+  allow(OAuth::RequestToken).to receive(:new) { req_token }
+  allow(acc_token).to receive(:get) { response }
 end
 
-describe SorceryController do
+describe SorceryController, :active_record => true do
   before(:all) do
     ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
     User.reset_column_information
@@ -53,8 +55,8 @@ describe SorceryController do
       it "login_at redirects correctly" 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%2Ftest.host%2Foauth%2Ftwitter%2Fcallback&oauth_token=")
+        expect(response).to be_a_redirect
+        expect(response).to redirect_to("http://myapi.com/oauth/authorize?oauth_callback=http%3A%2F%2Ftest.host%2Foauth%2Ftwitter%2Fcallback&oauth_token=")
       end
       after do
         sorcery_controller_external_property_set(:twitter, :callback_url, "http://blabla.com")
@@ -65,8 +67,8 @@ describe SorceryController 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=")
+        expect(response).to be_a_redirect
+        expect(response).to redirect_to("http://myapi.com/oauth/authorize?oauth_callback=http%3A%2F%2Fblabla.com&oauth_token=")
       end
     end
 
@@ -74,22 +76,22 @@ describe SorceryController do
       sorcery_model_property_set(:authentications_class, Authentication)
       create_new_external_user(:twitter)
       get :test_login_from, :oauth_verifier => "blablaRERASDFcxvSDFA"
-      flash[:notice].should == "Success!"
+      expect(flash[:notice]).to eq "Success!"
     end
 
     it "'login_from' fails if user doesn't exist" do
       sorcery_model_property_set(:authentications_class, Authentication)
       create_new_user
       get :test_login_from, :oauth_verifier => "blablaRERASDFcxvSDFA"
-      flash[:alert].should == "Failed!"
+      expect(flash[:alert]).to eq "Failed!"
     end
 
-    it "on successful 'login_from' the user should be redirected to the url he originally wanted" do
+    it "on successful 'login_from' the user is redirected to the url he originally wanted" do
       sorcery_model_property_set(:authentications_class, Authentication)
       create_new_external_user(:twitter)
       get :test_return_to_with_external, {}, :return_to_url => "fuu"
-      response.should redirect_to("fuu")
-      flash[:notice].should == "Success!"
+      expect(response).to redirect_to("fuu")
+      expect(flash[:notice]).to eq "Success!"
     end
 
   end
@@ -113,18 +115,18 @@ describe SorceryController do
       Authentication.delete_all
     end
 
-    it "should not send activation email to external users" do
+    it "does 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
+      expect(ActionMailer::Base.deliveries.size).to eq old_size
     end
 
-    it "should not send external users an activation success email" do
+    it "does 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
+      expect(ActionMailer::Base.deliveries.size).to eq old_size
     end
   end
 
@@ -152,19 +154,19 @@ describe SorceryController do
         create_new_external_user(:twitter)
       end
 
-      it "should register login time" do
+      it "registers login time" do
         now = Time.now.in_time_zone
         get :test_login_from
-        User.last.last_login_at.should_not be_nil
-        User.last.last_login_at.to_s(:db).should >= now.to_s(:db)
-        User.last.last_login_at.to_s(:db).should <= (now+2).to_s(:db)
+        expect(User.last.last_login_at).not_to be_nil
+        expect(User.last.last_login_at.to_s(:db)).to be >= now.to_s(:db)
+        expect(User.last.last_login_at.to_s(:db)).to be <= (now+2).to_s(:db)
       end
 
-      it "should not register login time if configured so" do
+      it "does not register login time if configured so" do
         sorcery_controller_property_set(:register_login_time, false)
         now = Time.now.in_time_zone
         get :test_login_from
-        User.last.last_login_at.should be_nil
+        expect(User.last.last_login_at).to be_nil
       end
     end
   end
@@ -194,18 +196,20 @@ describe SorceryController do
         Timecop.return
       end
 
-      it "should not reset session before session timeout" do
+      it "does not reset session before session timeout" do
         get :test_login_from
-        session[:user_id].should_not be_nil
-        flash[:notice].should == "Success!"
+
+        expect(session[:user_id]).not_to be_nil
+        expect(flash[:notice]).to eq "Success!"
       end
 
-      it "should reset session after session timeout" do
+      it "resets session after session timeout" do
         get :test_login_from
         Timecop.travel(Time.now.in_time_zone+0.6)
         get :test_should_be_logged_in
-        session[:user_id].should be_nil
-        response.should be_a_redirect
+
+        expect(session[:user_id]).to be_nil
+        expect(response).to be_a_redirect
       end
     end
   end

data/spec/active_record/controller_remember_me_spec.rb

@@ -1,9 +1,11 @@
 require 'spec_helper'
 
-describe SorceryController do
+describe SorceryController, :active_record => true do
+
+  let!(:user) { create_new_user }
 
   # ----------------- REMEMBER ME -----------------------
-  describe SorceryController, "with remember me features" do
+  context "with remember me features" do
 
     before(:all) do
       ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/remember_me")
@@ -11,10 +13,6 @@ describe SorceryController do
       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
@@ -25,72 +23,75 @@ describe SorceryController do
       User.delete_all
     end
 
-    it "should set cookie on remember_me!" do
+    it "sets cookie on remember_me!" do
       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
+
+      expect(cookies.signed["remember_me_token"]).to eq assigns[:current_user].remember_me_token
     end
 
-    it "should clear cookie on forget_me!" do
+    it "clears cookie on forget_me!" do
       cookies["remember_me_token"] == {:value => 'asd54234dsfsd43534', :expires => 3600}
       get :test_logout
-      cookies["remember_me_token"].should be_nil
+
+      expect(cookies["remember_me_token"]).to be_nil
     end
 
-    it "login(email,password,remember_me) should login and remember" do
+    it "login(email,password,remember_me) logs user in and remembers" 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
+
+      expect(cookies.signed["remember_me_token"]).not_to be_nil
+      expect(cookies.signed["remember_me_token"]).to eq assigns[:user].remember_me_token
     end
 
-    it "logout should also forget_me!" do
-      session[:user_id] = @user.id
+    it "logout also calls forget_me!" do
+      session[:user_id] = user.id
       get :test_logout_with_remember
-      cookies["remember_me_token"].should be_nil
+
+      expect(cookies["remember_me_token"]).to be_nil
     end
 
-    it "should login_from_cookie" do
-      session[:user_id] = @user.id
+    it "logs user in from cookie" do
+      session[:user_id] = user.id
       subject.remember_me!
       subject.instance_eval do
-        @current_user = nil
+        remove_instance_variable :@current_user
       end
       session[:user_id] = nil
       get :test_login_from_cookie
-      assigns[:current_user].should == @user
+
+      expect(assigns[:current_user]).to eq user
     end
 
-    it "should not remember_me! when not asked to, even if third parameter is used" do
+    it "doest not remember_me! when not asked to, even if third parameter is used" do
       post :test_login_with_remember_in_login, :email => 'bla@bla.com', :password => 'secret', :remember => "0"
-      cookies["remember_me_token"].should be_nil
+
+      expect(cookies["remember_me_token"]).to be_nil
     end
 
-    it "should not remember_me! when not asked to" do
+    it "doest not remember_me! when not asked to" do
       post :test_login, :email => 'bla@bla.com', :password => 'secret'
-      cookies["remember_me_token"].should be_nil
+      expect(cookies["remember_me_token"]).to be_nil
     end
 
     # --- login_user(user) ---
-    specify { should respond_to(:auto_login) }
+    specify { expect(@controller).to respond_to :auto_login }
 
-    it "auto_login(user) should login a user instance without remembering" do
-      create_new_user
+    it "auto_login(user) logs in an user instance without remembering" do
       session[:user_id] = nil
-      subject.auto_login(@user)
+      subject.auto_login(user)
       get :test_login_from_cookie
-      assigns[:current_user].should == @user
-      cookies["remember_me_token"].should be_nil
+
+      expect(assigns[:current_user]).to eq user
+      expect(cookies["remember_me_token"]).to be_nil
     end
 
-    it "auto_login(user, true) should login a user instance with remembering" do
-      create_new_user
+    it "auto_login(user, true) logs in an user instance with remembering" do
       session[:user_id] = nil
-      subject.auto_login(@user, true)
+      subject.auto_login(user, true)
       get :test_login_from_cookie
-      assigns[:current_user].should == @user
-      cookies["remember_me_token"].should_not be_nil
+
+      expect(assigns[:current_user]).to eq user
+      expect(cookies["remember_me_token"]).not_to be_nil
     end
   end
 end

data/spec/active_record/controller_session_timeout_spec.rb

@@ -1,54 +1,69 @@
 require 'spec_helper'
 
-describe SorceryController do
+describe SorceryController, :active_record => true do
+
+  let!(:user) { create_new_user }
 
   # ----------------- SESSION TIMEOUT -----------------------
-  describe SorceryController, "with session timeout features" do
+  context "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
+    it "does 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
+
+      expect(session[:user_id]).not_to be_nil
+      expect(response).to be_a_success
     end
 
-    it "should reset session after session timeout" do
+    it "resets session after session timeout" do
       login_user
       Timecop.travel(Time.now.in_time_zone+0.6)
       get :test_should_be_logged_in
-      session[:user_id].should be_nil
-      response.should be_a_redirect
+
+      expect(session[:user_id]).to be_nil
+      expect(response).to be_a_redirect
+    end
+
+    it "works if the session is stored as a string or a Time" do
+      session[:login_time] = Time.now.to_s
+      get :test_login, :email => 'bla@bla.com', :password => 'secret'
+
+      expect(session[:user_id]).not_to be_nil
+      expect(response).to be_a_success
     end
 
     context "with 'session_timeout_from_last_action'" do
-      it "should not logout if there was activity" do
+      it "does not logout if there was activity" do
         sorcery_controller_property_set(:session_timeout_from_last_action, true)
         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
+
+        expect(session[:user_id]).not_to be_nil
+
         Timecop.travel(Time.now.in_time_zone+0.3)
         get :test_should_be_logged_in
-        session[:user_id].should_not be_nil
-        response.should be_a_success
+
+        expect(session[:user_id]).not_to be_nil
+        expect(response).to be_a_success
       end
 
-      it "with 'session_timeout_from_last_action' should logout if there was no activity" do
+      it "with 'session_timeout_from_last_action' logs out if there was no activity" do
         sorcery_controller_property_set(:session_timeout_from_last_action, true)
         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
-        response.should be_a_redirect
+
+        expect(session[:user_id]).to be_nil
+        expect(response).to be_a_redirect
       end
     end
   end

data/spec/active_record/controller_spec.rb

@@ -1,182 +1,8 @@
 require 'spec_helper'
+require 'shared_examples/controller_shared_examples'
 
-describe SorceryController do
-
-  # ----------------- PLUGIN CONFIGURATION -----------------------
-  describe SorceryController, "plugin configuration" do
-    before(:all) do
-      sorcery_reload!
-    end
-
-    after(:each) do
-      Sorcery::Controller::Config.reset!
-      sorcery_reload!
-    end
-
-    it "should enable configuration option 'user_class'" do
-      sorcery_controller_property_set(:user_class, "TestUser")
-      Sorcery::Controller::Config.user_class.should == "TestUser"
-    end
-
-    it "should enable configuration option 'not_authenticated_action'" do
-      sorcery_controller_property_set(:not_authenticated_action, :my_action)
-      Sorcery::Controller::Config.not_authenticated_action.should equal(:my_action)
-    end
-
-  end
-
-  # ----------------- PLUGIN ACTIVATED -----------------------
-  describe SorceryController, "when activated with sorcery" do
-    before(:all) do
-      sorcery_reload!
-      User.delete_all
-    end
-
-    before(:each) do
-      create_new_user
-    end
-
-    after(:each) do
-      Sorcery::Controller::Config.reset!
-      sorcery_reload!
-      User.delete_all
-      sorcery_controller_property_set(:user_class, User)
-      sorcery_model_property_set(:username_attribute_names, [:email])
-    end
-
-    specify { should respond_to(:login) }
-
-    specify { should respond_to(:logout) }
-
-    specify { should respond_to(:logged_in?) }
-
-    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, :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, :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, :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, :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, :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, :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 => "", :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 => "", :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
-
-    it "logout should clear the session" do
-      cookies[:remember_me_token] = nil
-      session[:user_id] = @user.id
-      get :test_logout
-      session[:user_id].should be_nil
-    end
-
-    it "logged_in? should return true if logged in" do
-      session[:user_id] = @user.id
-      subject.logged_in?.should be_true
-    end
-
-    it "logged_in? should return false if not logged in" do
-      session[:user_id] = nil
-      subject.logged_in?.should be_false
-    end
-
-    it "current_user should return the user instance if logged in" do
-      create_new_user
-      session[:user_id] = @user.id
-      2.times { subject.current_user.should == @user } # memoized!
-    end
-
-    it "current_user should return false if not logged in" do
-      session[:user_id] = nil
-      2.times { subject.current_user.should == false } # memoized!
-    end
-
-    specify { should respond_to(:require_login) }
-
-    it "should call the configured 'not_authenticated_action' when authenticate before_filter fails" do
-      session[:user_id] = nil
-      sorcery_controller_property_set(:not_authenticated_action, :test_not_authenticated_action)
-      get :test_logout
-      response.body.should == "test_not_authenticated_action"
-    end
-
-    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/some_action"
-      response.should redirect_to("http://test.host/")
-    end
-
-    it "require_login before_filter should not save the url that the user originally wanted upon all non-get http methods" do
-      [:post, :put, :delete].each do |m|
-        self.send(m, :some_action)
-        session[:return_to_url].should be_nil
-      end
-    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, :email => 'bla@bla.com', :password => 'secret'
-      response.should redirect_to("http://test.host/some_action")
-      flash[:notice].should == "haha!"
-    end
-
-
-    # --- auto_login(user) ---
-    specify { should respond_to(:auto_login) }
-
-    it "auto_login(user) should login a user instance" do
-      session[:user_id] = nil
-      subject.auto_login(@user)
-      subject.logged_in?.should be_true
-    end
-
-    it "auto_login(user) should work even if current_user was already set to false" do
-      get :test_logout
-      session[:user_id].should be_nil
-      subject.current_user.should be_false
-      get :test_auto_login
-      assigns[:result].should == User.find(:first)
-    end
-  end
+describe SorceryController, :active_record => true do
 
+  it_should_behave_like "sorcery_controller"
+  
 end