sorcery 0.8.2 → 0.8.6

data/spec/shared_examples/user_activation_shared_examples.rb

@@ -1,45 +1,53 @@
 shared_examples_for "rails_3_activation_model" do
-  # ----------------- PLUGIN CONFIGURATION -----------------------
-  describe User, "loaded plugin configuration" do
+  let(:user) { create_new_user }
+  let(:new_user) { build_new_user }
+
+  context "loaded plugin configuration" do
     before(:all) do
       sorcery_reload!([:user_activation], :user_activation_mailer => ::SorceryMailer)
     end
-  
+
     after(:each) do
       User.sorcery_config.reset!
       sorcery_reload!([:user_activation], :user_activation_mailer => ::SorceryMailer)
     end
-    
-    it "should enable configuration option 'activation_state_attribute_name'" do
+
+    it "enables configuration option 'activation_state_attribute_name'" do
       sorcery_model_property_set(:activation_state_attribute_name, :status)
-      User.sorcery_config.activation_state_attribute_name.should equal(:status)    
+
+      expect(User.sorcery_config.activation_state_attribute_name).to eq :status
     end
-    
-    it "should enable configuration option 'activation_token_attribute_name'" do
+
+    it "enables configuration option 'activation_token_attribute_name'" do
       sorcery_model_property_set(:activation_token_attribute_name, :code)
-      User.sorcery_config.activation_token_attribute_name.should equal(:code)    
+
+      expect(User.sorcery_config.activation_token_attribute_name).to eql :code
     end
-    
-    it "should enable configuration option 'user_activation_mailer'" do
+
+    it "enables configuration option 'user_activation_mailer'" do
       sorcery_model_property_set(:user_activation_mailer, TestMailer)
-      User.sorcery_config.user_activation_mailer.should equal(TestMailer)    
+
+      expect(User.sorcery_config.user_activation_mailer).to equal(TestMailer)
     end
-    
-    it "should enable configuration option 'activation_needed_email_method_name'" do
+
+    it "enables configuration option 'activation_needed_email_method_name'" do
       sorcery_model_property_set(:activation_needed_email_method_name, :my_activation_email)
-      User.sorcery_config.activation_needed_email_method_name.should equal(:my_activation_email)
+
+      expect(User.sorcery_config.activation_needed_email_method_name).to eq :my_activation_email
     end
-    
-    it "should enable configuration option 'activation_success_email_method_name'" do
+
+    it "enables configuration option 'activation_success_email_method_name'" do
       sorcery_model_property_set(:activation_success_email_method_name, :my_activation_email)
-      User.sorcery_config.activation_success_email_method_name.should equal(:my_activation_email)
+
+      expect(User.sorcery_config.activation_success_email_method_name).to eq :my_activation_email
     end
 
-    it "should enable configuration option 'activation_mailer_disabled'" do
+    it "enables configuration option 'activation_mailer_disabled'" do
       sorcery_model_property_set(:activation_mailer_disabled, :my_activation_mailer_disabled)
-      User.sorcery_config.activation_mailer_disabled.should equal(:my_activation_mailer_disabled)
+
+      expect(User.sorcery_config.activation_mailer_disabled).to eq :my_activation_mailer_disabled
     end
-    
+
     it "if mailer is nil and mailer is enabled, throw exception!" do
       expect{sorcery_reload!([:user_activation], :activation_mailer_disabled => false)}.to raise_error(ArgumentError)
     end
@@ -49,72 +57,88 @@ shared_examples_for "rails_3_activation_model" do
     end
   end
 
-  # ----------------- ACTIVATION PROCESS -----------------------
-  describe User, "activation process" do
+
+  context "activation process" do
     before(:all) do
       sorcery_reload!([:user_activation], :user_activation_mailer => ::SorceryMailer)
     end
-    
-    before(:each) do
-      create_new_user
-    end
-    
-    it "should initialize user state to 'pending'" do
-      @user.activation_state.should == "pending"
+
+    it "initializes user state to 'pending'" do
+      expect(user.activation_state).to eq "pending"
     end
-    
-    specify { @user.should respond_to(:activate!) }
-    
-    it "should clear activation code and change state to 'active' on activation" do
-      activation_token = @user.activation_token
-      @user.activate!
-      @user2 = User.find(@user.id) # go to db to make sure it was saved and not just in memory
-      @user2.activation_token.should be_nil
-      @user2.activation_state.should == "active"
-      User.find_by_activation_token(activation_token).should be_nil
+
+    specify { expect(user).to respond_to :activate! }
+
+    it "clears activation code and change state to 'active' on activation" do
+      activation_token = user.activation_token
+      user.activate!
+      user2 = User.find(user.id) # go to db to make sure it was saved and not just in memory
+
+      expect(user2.activation_token).to be_nil
+      expect(user2.activation_state).to eq "active"
+      expect(User.find_by_activation_token activation_token).to be_nil
     end
 
 
     context "mailer is enabled" do
-      it "should send the user an activation email" do
+      it "sends the user an activation email" do
         old_size = ActionMailer::Base.deliveries.size
         create_new_user
-        ActionMailer::Base.deliveries.size.should == old_size + 1
+
+        expect(ActionMailer::Base.deliveries.size).to eq old_size + 1
+      end
+
+      it "calls send_activation_needed_email! method of user" do
+        expect(new_user).to receive(:send_activation_needed_email!).once
+
+        new_user.sorcery_save(:raise_on_failure => true)
       end
 
       it "subsequent saves do not send activation email" do
+        user
         old_size = ActionMailer::Base.deliveries.size
-        @user.username = "Shauli"
-        @user.save!
-        ActionMailer::Base.deliveries.size.should == old_size
+        user.email = "Shauli"
+        user.sorcery_save(:raise_on_failure => true)
+
+        expect(ActionMailer::Base.deliveries.size).to eq old_size
       end
 
-      it "should send the user an activation success email on successful activation" do
+      it "sends the user an activation success email on successful activation" do
+        user
         old_size = ActionMailer::Base.deliveries.size
-        @user.activate!
-        ActionMailer::Base.deliveries.size.should == old_size + 1
+        user.activate!
+
+        expect(ActionMailer::Base.deliveries.size).to eq old_size + 1
+      end
+
+      it "calls send_activation_success_email! method of user on activation" do
+        expect(user).to receive(:send_activation_success_email!).once
+
+        user.activate!
       end
 
       it "subsequent saves do not send activation success email" do
-        @user.activate!
+        user.activate!
         old_size = ActionMailer::Base.deliveries.size
-        @user.username = "Shauli"
-        @user.save!
-        ActionMailer::Base.deliveries.size.should == old_size
+        user.email = "Shauli"
+        user.sorcery_save(:raise_on_failure => true)
+
+        expect(ActionMailer::Base.deliveries.size).to eq old_size
       end
 
       it "activation needed email is optional" do
         sorcery_model_property_set(:activation_needed_email_method_name, nil)
         old_size = ActionMailer::Base.deliveries.size
-        create_new_user
-        ActionMailer::Base.deliveries.size.should == old_size
+
+        expect(ActionMailer::Base.deliveries.size).to eq old_size
       end
 
       it "activation success email is optional" do
         sorcery_model_property_set(:activation_success_email_method_name, nil)
         old_size = ActionMailer::Base.deliveries.size
-        @user.activate!
-        ActionMailer::Base.deliveries.size.should == old_size
+        user.activate!
+
+        expect(ActionMailer::Base.deliveries.size).to eq old_size
       end
     end
 
@@ -123,81 +147,96 @@ shared_examples_for "rails_3_activation_model" do
         sorcery_reload!([:user_activation], :activation_mailer_disabled => true, :user_activation_mailer => ::SorceryMailer)
       end
 
-      it "should not send the user an activation email" do
+      it "does not send the user an activation email" do
         old_size = ActionMailer::Base.deliveries.size
-        create_new_user
-        ActionMailer::Base.deliveries.size.should == old_size
+
+        expect(ActionMailer::Base.deliveries.size).to eq old_size
       end
 
-      it "should not send the user an activation success email on successful activation" do
+      it "does not call send_activation_needed_email! method of user" do
+        user = build_new_user
+
+        expect(user).to receive(:send_activation_needed_email!).never
+
+        user.sorcery_save(:raise_on_failure => true)
+      end
+
+      it "does not send the user an activation success email on successful activation" do
         old_size = ActionMailer::Base.deliveries.size
-        @user.activate!
-        ActionMailer::Base.deliveries.size.should == old_size
+        user.activate!
+
+        expect(ActionMailer::Base.deliveries.size).to eq old_size
+      end
+
+      it "calls send_activation_success_email! method of user on activation" do
+        expect(user).to receive(:send_activation_success_email!).never
+
+        user.activate!
       end
     end
   end
 
-  describe User, "prevent non-active login feature" do
+  describe "prevent non-active login feature" do
     before(:all) do
       sorcery_reload!([:user_activation], :user_activation_mailer => ::SorceryMailer)
     end
 
     before(:each) do
       User.delete_all
-      create_new_user
     end
 
-    it "should not allow a non-active user to authenticate" do
-      User.authenticate(@user.username,'secret').should be_false
+    it "does not allow a non-active user to authenticate" do
+      expect(User.authenticate user.email, 'secret').to be_falsy
     end
-    
-    it "should allow a non-active user to authenticate if configured so" do
+
+    it "allows a non-active user to authenticate if configured so" do
       sorcery_model_property_set(:prevent_non_active_users_to_login, false)
-      User.authenticate(@user.username,'secret').should be_true
+
+      expect(User.authenticate user.email, 'secret').to be_truthy
     end
   end
-  
-  describe User, "load_from_activation_token" do
+
+  describe "load_from_activation_token" do
     before(:all) do
       sorcery_reload!([:user_activation], :user_activation_mailer => ::SorceryMailer)
     end
-    
+
     after(:each) do
       Timecop.return
     end
-    
-    it "load_from_activation_token should return user when token is found" do
-      create_new_user
-      User.load_from_activation_token(@user.activation_token).should == @user
+
+    it "load_from_activation_token returns user when token is found" do
+      expect(User.load_from_activation_token user.activation_token).to eq user
     end
-    
-    it "load_from_activation_token should NOT return user when token is NOT found" do
-      create_new_user
-      User.load_from_activation_token("a").should == nil
+
+    it "load_from_activation_token does NOT return user when token is NOT found" do
+      expect(User.load_from_activation_token "a").to be_nil
     end
-    
-    it "load_from_activation_token should return user when token is found and not expired" do
+
+    it "load_from_activation_token returas user when token is found and not expired" do
       sorcery_model_property_set(:activation_token_expiration_period, 500)
-      create_new_user
-      User.load_from_activation_token(@user.activation_token).should == @user
+
+      expect(User.load_from_activation_token user.activation_token).to eq user
     end
-    
-    it "load_from_activation_token should NOT return user when token is found and expired" do
+
+    it "load_from_activation_token does NOT return user when token is found and expired" do
       sorcery_model_property_set(:activation_token_expiration_period, 0.1)
-      create_new_user
+      user
+
       Timecop.travel(Time.now.in_time_zone+0.5)
-      User.load_from_activation_token(@user.activation_token).should == nil
+
+      expect(User.load_from_activation_token user.activation_token).to be_nil
     end
-    
-    it "load_from_activation_token should return nil if token is blank" do
-      User.load_from_activation_token(nil).should == nil
-      User.load_from_activation_token("").should == nil
+
+    it "load_from_activation_token returns nil if token is blank" do
+      expect(User.load_from_activation_token nil).to be_nil
+      expect(User.load_from_activation_token "").to be_nil
     end
-    
-    it "load_from_activation_token should always be valid if expiration period is nil" do
+
+    it "load_from_activation_token is always valid if expiration period is nil" do
       sorcery_model_property_set(:activation_token_expiration_period, nil)
-      create_new_user
-      User.load_from_activation_token(@user.activation_token).should == @user
+
+      expect(User.load_from_activation_token user.activation_token).to eq user
     end
   end
-end
+end

data/spec/shared_examples/user_activity_logging_shared_examples.rb

@@ -1,6 +1,5 @@
 shared_examples_for "rails_3_activity_logging_model" do
-  # ----------------- PLUGIN CONFIGURATION -----------------------
-  describe User, "loaded plugin configuration" do
+  context "loaded plugin configuration" do
     before(:all) do
       sorcery_reload!([:activity_logging])
     end
@@ -9,24 +8,25 @@ shared_examples_for "rails_3_activity_logging_model" do
       User.sorcery_config.reset!
     end
     
-    it "should allow configuration option 'last_login_at_attribute_name'" do
+    it "allows configuration option 'last_login_at_attribute_name'" do
       sorcery_model_property_set(:last_login_at_attribute_name, :login_time)
-      User.sorcery_config.last_login_at_attribute_name.should equal(:login_time)
+
+      expect(User.sorcery_config.last_login_at_attribute_name).to eq :login_time
     end
     
-    it "should allow configuration option 'last_logout_at_attribute_name'" do
+    it "allows configuration option 'last_logout_at_attribute_name'" do
       sorcery_model_property_set(:last_logout_at_attribute_name, :logout_time)
-      User.sorcery_config.last_logout_at_attribute_name.should equal(:logout_time)
+      expect(User.sorcery_config.last_logout_at_attribute_name).to eq :logout_time
     end
     
-    it "should allow configuration option 'last_activity_at_attribute_name'" do
+    it "allows configuration option 'last_activity_at_attribute_name'" do
       sorcery_model_property_set(:last_activity_at_attribute_name, :activity_time)
-      User.sorcery_config.last_activity_at_attribute_name.should equal(:activity_time)
+      expect(User.sorcery_config.last_activity_at_attribute_name).to eq :activity_time
     end
 
-    it "should allow configuration option 'last_login_from_ip_adress'" do
+    it "allows configuration option 'last_login_from_ip_adress'" do
       sorcery_model_property_set(:last_login_from_ip_address_name, :ip_address)
-      User.sorcery_config.last_login_from_ip_address_name.should equal(:ip_address)
+      expect(User.sorcery_config.last_login_from_ip_address_name).to eq :ip_address
     end
   end
 end

data/spec/shared_examples/user_brute_force_protection_shared_examples.rb

@@ -1,37 +1,38 @@
 shared_examples_for "rails_3_brute_force_protection_model" do
-  # ----------------- PLUGIN CONFIGURATION -----------------------
-  describe User, "loaded plugin configuration" do
+  context "loaded plugin configuration" do
+
+    let(:config) { User.sorcery_config }
+    let(:user) { create_new_user }
   
     before(:all) do
       sorcery_reload!([:brute_force_protection])
-      create_new_user
     end
   
     after(:each) do
       User.sorcery_config.reset!
     end
     
-    specify { @user.should respond_to(:failed_logins_count) }
-    specify { @user.should respond_to(:lock_expires_at) }
+    specify { expect(user).to respond_to(:failed_logins_count) }
+    specify { expect(user).to respond_to(:lock_expires_at) }
  
-    it "should enable configuration option 'failed_logins_count_attribute_name'" do
+    it "enables configuration option 'failed_logins_count_attribute_name'" do
       sorcery_model_property_set(:failed_logins_count_attribute_name, :my_count)
-      User.sorcery_config.failed_logins_count_attribute_name.should equal(:my_count)    
+      expect(config.failed_logins_count_attribute_name).to eq :my_count
     end
     
-    it "should enable configuration option 'lock_expires_at_attribute_name'" do
+    it "enables configuration option 'lock_expires_at_attribute_name'" do
       sorcery_model_property_set(:lock_expires_at_attribute_name, :expires)
-      User.sorcery_config.lock_expires_at_attribute_name.should equal(:expires)    
+      expect(config.lock_expires_at_attribute_name).to eq :expires
     end
     
-    it "should enable configuration option 'consecutive_login_retries_amount_allowed'" do
+    it "enables configuration option 'consecutive_login_retries_amount_allowed'" do
       sorcery_model_property_set(:consecutive_login_retries_amount_limit, 34)
-      User.sorcery_config.consecutive_login_retries_amount_limit.should equal(34)    
+      expect(config.consecutive_login_retries_amount_limit).to eq 34
     end
     
-    it "should enable configuration option 'login_lock_time_period'" do
+    it "enables configuration option 'login_lock_time_period'" do
       sorcery_model_property_set(:login_lock_time_period, 2.hours)
-      User.sorcery_config.login_lock_time_period.should == 2.hours    
+      expect(config.login_lock_time_period).to eq 2.hours
     end
   end
 end

data/spec/shared_examples/user_oauth_shared_examples.rb

@@ -1,31 +1,39 @@
 shared_examples_for "rails_3_oauth_model" do
   # ----------------- PLUGIN CONFIGURATION -----------------------
-  describe User, "loaded plugin configuration" do
-  
+
+  let(:external_user) { create_new_external_user :twitter }
+
+  describe "loaded plugin configuration" do
+
     before(:all) do
+      if defined?(DataMapper) && User.ancestors.include?(DataMapper::Resource)
+        Authentication.all.destroy
+      else
+        Authentication.delete_all
+      end
       User.delete_all
-      Authentication.delete_all
       sorcery_reload!([:external])
       sorcery_controller_property_set(:external_providers, [:twitter])
       sorcery_model_property_set(:authentications_class, Authentication)
       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")
-      create_new_external_user(:twitter)
     end
 
-    it "should respond to 'load_from_provider'" do
-      User.should respond_to(:load_from_provider)
+    it "responds to 'load_from_provider'" do
+      expect(User).to respond_to(:load_from_provider)
     end
-    
-    it "'load_from_provider' should load user if exists" do
-      User.load_from_provider(:twitter,123).should == @user
+
+    it "'load_from_provider' loads user if exists" do
+      external_user
+      expect(User.load_from_provider :twitter, 123).to eq external_user
     end
-    
-    it "'load_from_provider' should return nil if user doesn't exist" do
-      User.load_from_provider(:twitter,980342).should be_nil
+
+    it "'load_from_provider' returns nil if user doesn't exist" do
+      external_user
+      expect(User.load_from_provider :twitter, 980342).to be_nil
     end
-    
+
   end
-  
-end
+
+end

data/spec/shared_examples/user_remember_me_shared_examples.rb

@@ -1,48 +1,57 @@
 shared_examples_for "rails_3_remember_me_model" do
-  # ----------------- PLUGIN CONFIGURATION -----------------------
-  describe User, "loaded plugin configuration" do
+  let(:user) { create_new_user }
+
+  describe "loaded plugin configuration" do
+
     before(:all) do
       sorcery_reload!([:remember_me])
-      create_new_user
     end
   
     after(:each) do
       User.sorcery_config.reset!
     end
     
-    it "should allow configuration option 'remember_me_token_attribute_name'" do
+    it "allows configuration option 'remember_me_token_attribute_name'" do
       sorcery_model_property_set(:remember_me_token_attribute_name, :my_token)
-      User.sorcery_config.remember_me_token_attribute_name.should equal(:my_token)
+
+      expect(User.sorcery_config.remember_me_token_attribute_name).to eq :my_token
     end
 
-    it "should allow configuration option 'remember_me_token_expires_at_attribute_name'" do
+    it "allows configuration option 'remember_me_token_expires_at_attribute_name'" do
       sorcery_model_property_set(:remember_me_token_expires_at_attribute_name, :my_expires)
-      User.sorcery_config.remember_me_token_expires_at_attribute_name.should equal(:my_expires)
+
+      expect(User.sorcery_config.remember_me_token_expires_at_attribute_name).to eq :my_expires
     end
     
-    specify { @user.should respond_to(:remember_me!) }
-    
-    specify { @user.should respond_to(:forget_me!) }
+    specify { expect(user).to respond_to :remember_me! }
+
+    specify { expect(user).to respond_to :forget_me! }
     
-    it "should generate a new token on 'remember_me!'" do
-      @user.remember_me_token.should be_nil
-      @user.remember_me!
-      @user.remember_me_token.should_not be_nil
+    it "generates a new token on 'remember_me!'" do
+      expect(user.remember_me_token).to be_nil
+
+      user.remember_me!
+
+      expect(user.remember_me_token).not_to be_nil
     end
     
     # FIXME: assert on line 37 sometimes fails by a second
-    it "should set an expiration based on 'remember_me_for' attribute" do
+    it "sets an expiration based on 'remember_me_for' attribute" do
       sorcery_model_property_set(:remember_me_for, 2 * 60 * 60 * 24)
-      @user.remember_me!
-      @user.remember_me_token_expires_at.utc.to_s.should == (Time.now.in_time_zone + 2 * 60 * 60 * 24).utc.to_s
+      user.remember_me!
+
+      expect(user.remember_me_token_expires_at.utc.to_s).to eq (Time.now.in_time_zone + 2 * 60 * 60 * 24).utc.to_s
     end
     
-    it "should delete the token and expiration on 'forget_me!'" do
-      @user.remember_me!
-      @user.remember_me_token.should_not be_nil
-      @user.forget_me!
-      @user.remember_me_token.should be_nil
-      @user.remember_me_token_expires_at.should be_nil
+    it "deletes the token and expiration on 'forget_me!'" do
+      user.remember_me!
+
+      expect(user.remember_me_token).not_to be_nil
+
+      user.forget_me!
+
+      expect(user.remember_me_token).to be_nil
+      expect(user.remember_me_token_expires_at).to be_nil
     end
   end
 end