sorcery 0.6.1 → 0.7.10

data/spec/shared_examples/user_reset_password_shared_examples.rb

@@ -33,7 +33,20 @@ shared_examples_for "rails_3_reset_password_model" do
       sorcery_model_property_set(:reset_password_mailer, TestUser)
       User.sorcery_config.reset_password_mailer.should equal(TestUser)
     end
+
+    it "should enable configuration option 'reset_password_mailer_disabled'" do
+      sorcery_model_property_set(:reset_password_mailer_disabled, :my_reset_password_mailer_disabled)
+      User.sorcery_config.reset_password_mailer_disabled.should equal(:my_reset_password_mailer_disabled)
+    end
     
+    it "if mailer is nil and mailer is enabled, throw exception!" do
+      expect{sorcery_reload!([:reset_password], :reset_password_mailer_disabled => false)}.to raise_error(ArgumentError)
+    end
+
+    it "if mailer is disabled and mailer is nil, do NOT throw exception" do
+      expect{sorcery_reload!([:reset_password], :reset_password_mailer_disabled => true)}.to_not raise_error
+    end    
+
     it "should allow configuration option 'reset_password_email_method_name'" do
       sorcery_model_property_set(:reset_password_email_method_name, :my_mailer_method)
       User.sorcery_config.reset_password_email_method_name.should equal(:my_mailer_method)
@@ -93,7 +106,7 @@ shared_examples_for "rails_3_reset_password_model" do
       create_new_user
       sorcery_model_property_set(:reset_password_expiration_period, 0.1)
       @user.deliver_reset_password_instructions!
-      Timecop.travel(Time.now+0.5)
+      Timecop.travel(Time.now.in_time_zone+0.5)
       User.load_from_reset_password_token(@user.reset_password_token).should == nil
     end
     
@@ -125,11 +138,69 @@ shared_examples_for "rails_3_reset_password_model" do
       @user.reset_password_token.should_not == old_password_code
     end
 
-    it "should send an email on reset" do
-      create_new_user
-      old_size = ActionMailer::Base.deliveries.size
-      @user.deliver_reset_password_instructions!
-      ActionMailer::Base.deliveries.size.should == old_size + 1
+    context "mailer is enabled" do
+      it "should send an email on reset" do
+        create_new_user
+        old_size = ActionMailer::Base.deliveries.size
+        @user.deliver_reset_password_instructions!
+        ActionMailer::Base.deliveries.size.should == old_size + 1
+      end
+
+      it "should not send an email if time between emails has not passed since last email" do
+        create_new_user
+        sorcery_model_property_set(:reset_password_time_between_emails, 10000)
+        old_size = ActionMailer::Base.deliveries.size
+        @user.deliver_reset_password_instructions!
+        ActionMailer::Base.deliveries.size.should == old_size + 1
+        @user.deliver_reset_password_instructions!
+        ActionMailer::Base.deliveries.size.should == old_size + 1
+      end
+
+      it "should send an email if time between emails has passed since last email" do
+        create_new_user
+        sorcery_model_property_set(:reset_password_time_between_emails, 0.5)
+        old_size = ActionMailer::Base.deliveries.size
+        @user.deliver_reset_password_instructions!
+        ActionMailer::Base.deliveries.size.should == old_size + 1
+        Timecop.travel(Time.now.in_time_zone+0.5)
+        @user.deliver_reset_password_instructions!
+        ActionMailer::Base.deliveries.size.should == old_size + 2
+      end
+    end
+
+    context "mailer is disabled" do
+
+      before(:all) do
+        sorcery_reload!([:reset_password], :reset_password_mailer_disabled => true, :reset_password_mailer => ::SorceryMailer)
+      end
+
+      it "should send an email on reset" do
+        create_new_user
+        old_size = ActionMailer::Base.deliveries.size
+        @user.deliver_reset_password_instructions!
+        ActionMailer::Base.deliveries.size.should == old_size
+      end
+
+      it "should not send an email if time between emails has not passed since last email" do
+        create_new_user
+        sorcery_model_property_set(:reset_password_time_between_emails, 10000)
+        old_size = ActionMailer::Base.deliveries.size
+        @user.deliver_reset_password_instructions!
+        ActionMailer::Base.deliveries.size.should == old_size
+        @user.deliver_reset_password_instructions!
+        ActionMailer::Base.deliveries.size.should == old_size
+      end
+
+      it "should send an email if time between emails has passed since last email" do
+        create_new_user
+        sorcery_model_property_set(:reset_password_time_between_emails, 0.5)
+        old_size = ActionMailer::Base.deliveries.size
+        @user.deliver_reset_password_instructions!
+        ActionMailer::Base.deliveries.size.should == old_size
+        Timecop.travel(Time.now.in_time_zone+0.5)
+        @user.deliver_reset_password_instructions!
+        ActionMailer::Base.deliveries.size.should == old_size
+      end
     end
 
     it "when change_password! is called, should delete reset_password_token" do
@@ -140,26 +211,12 @@ shared_examples_for "rails_3_reset_password_model" do
       @user.save!
       @user.reset_password_token.should be_nil
     end
-    
-    it "should not send an email if time between emails has not passed since last email" do
+
+    it "should return false if time between emails has not passed since last email" do
       create_new_user
       sorcery_model_property_set(:reset_password_time_between_emails, 10000)
-      old_size = ActionMailer::Base.deliveries.size
-      @user.deliver_reset_password_instructions!
-      ActionMailer::Base.deliveries.size.should == old_size + 1
       @user.deliver_reset_password_instructions!
-      ActionMailer::Base.deliveries.size.should == old_size + 1
-    end
-    
-    it "should send an email if time between emails has passed since last email" do
-      create_new_user
-      sorcery_model_property_set(:reset_password_time_between_emails, 0.5)
-      old_size = ActionMailer::Base.deliveries.size
-      @user.deliver_reset_password_instructions!
-      ActionMailer::Base.deliveries.size.should == old_size + 1
-      Timecop.travel(Time.now+0.5)
-      @user.deliver_reset_password_instructions!
-      ActionMailer::Base.deliveries.size.should == old_size + 2
+      @user.deliver_reset_password_instructions!.should == false
     end
 
     it "should encrypt properly on reset" do
@@ -169,9 +226,5 @@ shared_examples_for "rails_3_reset_password_model" do
       Sorcery::CryptoProviders::BCrypt.matches?(@user.crypted_password,"blagu",@user.salt).should be_true
     end
 
-    it "if mailer is nil on activation, throw exception!" do
-      expect{sorcery_reload!([:reset_password])}.to raise_error(ArgumentError)
-    end
-
   end
-end
+end

data/spec/shared_examples/user_shared_examples.rb

@@ -4,9 +4,9 @@ shared_examples_for "rails_3_core_model" do
       User.sorcery_config.reset!
     end
     
-    it "should enable configuration option 'username_attribute_name'" do
-      sorcery_model_property_set(:username_attribute_name, :email)
-      User.sorcery_config.username_attribute_name.should equal(:email)
+    it "should enable configuration option 'username_attribute_names'" do
+      sorcery_model_property_set(:username_attribute_names, :email)
+      User.sorcery_config.username_attribute_names.should == [:email]
     end
       
     it "should enable configuration option 'password_attribute_name'" do
@@ -56,7 +56,6 @@ shared_examples_for "rails_3_core_model" do
       sorcery_model_property_set(:stretches, stretches)
       User.sorcery_config.stretches.should equal(stretches)
     end
-  
   end
   
   # ----------------- PLUGIN ACTIVATED -----------------------
@@ -76,12 +75,12 @@ shared_examples_for "rails_3_core_model" do
   
     it "authenticate should return true if credentials are good" do
       create_new_user
-      User.authenticate(@user.send(User.sorcery_config.username_attribute_name), 'secret').should be_true
+      User.authenticate(@user.send(User.sorcery_config.username_attribute_names.first), 'secret').should be_true
     end
   
     it "authenticate should return false if credentials are bad" do
       create_new_user
-      User.authenticate(@user.send(User.sorcery_config.username_attribute_name), 'wrong!').should be_false
+      User.authenticate(@user.send(User.sorcery_config.username_attribute_names.first), 'wrong!').should be_false
     end
   
     specify { User.should respond_to(:encrypt) }
@@ -186,7 +185,7 @@ shared_examples_for "rails_3_core_model" do
     it "should work with no password encryption" do
       sorcery_model_property_set(:encryption_algorithm, :none)
       create_new_user
-      User.authenticate(@user.send(User.sorcery_config.username_attribute_name), 'secret').should be_true
+      User.authenticate(@user.send(User.sorcery_config.username_attribute_names.first), 'secret').should be_true
     end
   
     it "should work with custom password encryption" do
@@ -202,7 +201,7 @@ shared_examples_for "rails_3_core_model" do
       sorcery_model_property_set(:encryption_algorithm, :custom)
       sorcery_model_property_set(:custom_encryption_provider, MyCrypto)
       create_new_user
-      User.authenticate(@user.send(User.sorcery_config.username_attribute_name), 'secret').should be_true
+      User.authenticate(@user.send(User.sorcery_config.username_attribute_names.first), 'secret').should be_true
     end
   
     it "if encryption algo is aes256, it should set key to crypto provider" do
@@ -268,6 +267,35 @@ shared_examples_for "rails_3_core_model" do
     end
     
   end
+  
+  describe User, "ORM adapter" do
+    before(:all) do
+      sorcery_reload!()
+      User.delete_all
+    end
+    
+    before(:each) do
+      create_new_user
+    end
+
+    after(:each) do
+      User.delete_all
+      User.sorcery_config.reset!
+    end
+
+    it "find_by_username should work as expected" do
+      User.find_by_username("gizmo").should == @user
+    end
+
+    it "find_by_username should work as expected with multiple username attributes" do
+      sorcery_model_property_set(:username_attribute_names, [:username, :email])
+      User.find_by_username("gizmo").should == @user
+    end
+
+    it "find_by_email should work as expected" do
+      User.find_by_email("bla@bla.com").should == @user
+    end
+  end
 end
 
 shared_examples_for "external_user" do

data/spec/sorcery_crypto_providers_spec.rb

@@ -54,7 +54,11 @@ describe "Crypto Providers wrappers" do
     it "matches? returns false when no match" do
       Sorcery::CryptoProviders::SHA1.matches?(@digest, 'Some Dude').should be_false
     end
-    
+
+    it "matches password encrypted using salt and join token from upstream" do
+      Sorcery::CryptoProviders::SHA1.join_token = "test"
+      Sorcery::CryptoProviders::SHA1.encrypt(['password', 'gq18WBnJYNh2arkC1kgH']).should == '894b5bf1643b8d0e1b2eaddb22426be7036dab70'
+    end
   end
 
   describe Sorcery::CryptoProviders::SHA256 do