sorcery 0.8.5 → 0.8.6

data/spec/mongo_mapper/user_reset_password_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'shared_examples/user_reset_password_shared_examples'
 
-describe "User with reset_password submodule" do
+describe User, "with reset_password submodule", :mongo_mapper => true do
 
   it_behaves_like "rails_3_reset_password_model"
 

data/spec/mongo_mapper/user_spec.rb

@@ -1,16 +1,15 @@
 require 'spec_helper'
-
 require 'rails_app/app/mailers/sorcery_mailer'
 require 'shared_examples/user_shared_examples'
 
-describe "User with no submodules (core)" do
+describe User, "with no submodules (core)", :mongo_mapper => true do
   before(:all) do
     sorcery_reload!
   end
 
   describe User, "when app has plugin loaded" do
-    it "User should respond_to .authenticates_with_sorcery!" do
-      User.should respond_to(:authenticates_with_sorcery!)
+    it "User responds to .authenticates_with_sorcery!" do
+      expect(User).to respond_to :authenticates_with_sorcery!
     end
   end
 
@@ -18,21 +17,21 @@ describe "User with no submodules (core)" do
 
   it_should_behave_like "rails_3_core_model"
 
-  describe User, "external users" do
+  describe "external users" do
 
     it_should_behave_like "external_user"
 
   end
 
-  describe User, "when inherited" do
-    it "should inherit mongo_mapper keys" do
+  context "when inherited" do
+    it "inherits mongo_mapper keys" do
       User.class_eval do
         key :blabla
       end
       class SubUser < User
       end
 
-      SubUser.keys.should include("blabla")
+      expect(SubUser.keys).to include("blabla")
     end
   end
 end

data/spec/mongoid/controller_activity_logging_spec.rb

@@ -1,111 +1,16 @@
 require 'spec_helper'
+require 'shared_examples/controller_activity_logging_shared_examples'
 
-describe SorceryController do
+describe SorceryController, :mongoid => true do
 
   # ----------------- ACTIVITY LOGGING -----------------------
-  describe SorceryController, "with activity logging features" do
-    before(:all) do
-      sorcery_reload!([:activity_logging])
-    end
-
-    before(:each) do
-      create_new_user
-    end
-
+  context "with activity logging features" do
     after(:each) do
       User.delete_all
     end
 
-    specify { subject.should respond_to(:current_users) }
-
-    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.utc.to_s.should >= now.utc.to_s
-      @user.last_login_at.utc.to_s.should <= (now.utc+2).to_s
-    end
-
-    it "should log logout time on logout" do
-      login_user
-      now = Time.now.utc
-      logout_user
-      User.first.last_logout_at.utc.should_not be_nil
-      User.first.last_logout_at.utc.to_s.should >= now.utc.to_s
-      User.first.last_logout_at.utc.to_s.should <= (now.utc+2).to_s
-    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.utc.should >= now.utc
-      User.first.last_activity_at.utc.should <= (now.utc+2)
-    end
-
-    it "should log last IP address when logged in" do
-      login_user
-      get :some_action
-      User.first.last_login_from_ip_address.should == "0.0.0.0"
-    end
-
-    it "should update nothing but activity fields" do
-      original_user_name = User.first.username
-      login_user
-      get :some_action_making_a_non_persisted_change_to_the_user
-      User.first.username.should == original_user_name
-    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
-
-    it "should not register login time if configured so" do
-      sorcery_controller_property_set(:register_login_time, false)
-      now = Time.now.in_time_zone
-      login_user
-      @user.last_login_at.should be_nil
-    end
 
-    it "should not register logout time if configured so" do
-      sorcery_controller_property_set(:register_logout_time, false)
-      now = Time.now.in_time_zone
-      login_user
-      logout_user
-      @user.last_logout_at.should be_nil
-    end
+    it_behaves_like "controller_activity_logging"
 
-    it "should not register last activity time if configured so" do
-      sorcery_controller_property_set(:register_last_activity_time, false)
-      now = Time.now.in_time_zone
-      login_user
-      get :some_action
-      @user.last_activity_at.should be_nil
-    end
   end
 end

data/spec/mongoid/controller_spec.rb

@@ -1,186 +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, [:username, :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(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(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 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 => 'GIZMO1', :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, :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
-      subject.current_user.should == @user
-    end
-
-    it "current_user should return false if not logged in" do
-      session[:user_id] = nil
-      subject.current_user.should == false
-    end
-
-    specify { should respond_to(:require_login) }
-
-    it "should call the configured 'not_authenticated_action' when session[:user_id] isn't found" do
-      # If someone passes in a bogus user_id than no big deal, but if a user is deleted
-      # and there is still an active session out there for him this causes problems.
-      user              = User.create(:email => 'test@example.com', :password => 'password')
-      session[:user_id] = user.id
-      user.destroy
-      sorcery_controller_property_set(:not_authenticated_action, :test_not_authenticated_action)
-      get :test_logout
-      response.body.should == "test_not_authenticated_action"
-    end
-
-    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, :username => 'gizmo', :password => 'secret'
-      response.should redirect_to("http://test.host/some_action")
-      flash[:notice].should == "haha!"
-    end
-
-
-    # --- login_user(user) ---
-    specify { should respond_to(:auto_login) }
-
-    it "auto_login(user) should login a user instance" do
-      create_new_user
-      session[:user_id] = nil
-      subject.auto_login(@user)
-      subject.logged_in?.should be_true
-    end
-  end
+describe SorceryController, :mongoid => true do
 
+  it_should_behave_like "sorcery_controller"
+  
 end

data/spec/mongoid/user_activation_spec.rb

@@ -1,9 +1,8 @@
 require 'spec_helper'
-
 require 'rails_app/app/mailers/sorcery_mailer'
 require 'shared_examples/user_activation_shared_examples'
 
-describe "User with activation submodule" do
+describe User, "with activation submodule", :mongoid => true do
 
   it_behaves_like "rails_3_activation_model"
 

data/spec/mongoid/user_activity_logging_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
-
 require 'shared_examples/user_activity_logging_shared_examples'
 
-describe "User with activity logging submodule" do
+describe User, "with activity logging submodule", :mongoid => true do
 
   it_behaves_like "rails_3_activity_logging_model"
 

data/spec/mongoid/user_brute_force_protection_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
-
 require 'shared_examples/user_brute_force_protection_shared_examples'
 
-describe "User with brute_force_protection submodule" do
+describe User, "with brute_force_protection submodule", :mongoid => true do
 
   it_behaves_like "rails_3_brute_force_protection_model"
 

data/spec/mongoid/user_oauth_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
-
 require 'shared_examples/user_oauth_shared_examples'
 
-describe "User with oauth submodule" do
+describe User, "with oauth submodule", :mongoid => true do
 
   it_behaves_like "rails_3_oauth_model"
 

data/spec/mongoid/user_remember_me_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
-
 require 'shared_examples/user_remember_me_shared_examples'
 
-describe "User with remember_me submodule" do
+describe User, "with remember_me submodule", :mongoid => true do
 
   it_behaves_like "rails_3_remember_me_model"
 

data/spec/mongoid/user_reset_password_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
-
 require 'shared_examples/user_reset_password_shared_examples'
 
-describe "User with reset_password submodule" do
+describe User, "with reset_password submodule", :mongoid => true do
 
   it_behaves_like "rails_3_reset_password_model"
 

data/spec/mongoid/user_spec.rb

@@ -1,16 +1,15 @@
 require 'spec_helper'
-
 require 'rails_app/app/mailers/sorcery_mailer'
 require 'shared_examples/user_shared_examples'
 
-describe "User with no submodules (core)" do
+describe User, "with no submodules (core)", :mongoid => true do
   before(:all) do
     sorcery_reload!
   end
 
-  describe User, "when app has plugin loaded" do
-    it "User should respond_to .authenticates_with_sorcery!" do
-      User.should respond_to(:authenticates_with_sorcery!)
+  context "when app has plugin loaded" do
+    it "User responds to .authenticates_with_sorcery!" do
+      expect(User).to respond_to :authenticates_with_sorcery!
     end
   end
 
@@ -18,21 +17,21 @@ describe "User with no submodules (core)" do
 
   it_should_behave_like "rails_3_core_model"
 
-  describe User, "external users" do
+  describe "external users" do
 
     it_should_behave_like "external_user"
 
   end
 
-  describe User, "when inherited" do
-    it "should inherit mongoid fields" do
+  context "when inherited" do
+    it "inherits mongoid fields" do
       User.class_eval do
         field :blabla
       end
       class SubUser < User
       end
 
-      SubUser.fields.should include("blabla")
+      expect(SubUser.fields).to include("blabla")
     end
   end