sorcery 0.8.2 → 0.9.0

data/spec/shared_examples/user_oauth_shared_examples.rb

@@ -1,31 +1,36 @@
 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
-      User.delete_all
-      Authentication.delete_all
+      Authentication.sorcery_adapter.delete_all
+      User.sorcery_adapter.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,60 @@
 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
+
+      ts = Time.now.in_time_zone
+      Timecop.freeze(ts) do
+        user.remember_me!
+      end
+
+      expect(user.remember_me_token_expires_at.utc.to_s).to eq (ts + 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

data/spec/shared_examples/user_reset_password_shared_examples.rb

@@ -1,170 +1,191 @@
 shared_examples_for "rails_3_reset_password_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!([:reset_password], :reset_password_mailer => ::SorceryMailer)
     end
-  
+
     after(:each) do
       User.sorcery_config.reset!
     end
-    
+
     context "API" do
-      before(:all) do
-        create_new_user
-      end
-      
-      specify { @user.should respond_to(:deliver_reset_password_instructions!) }
-      
-      specify { @user.should respond_to(:change_password!) }
 
-      it "should respond to .load_from_reset_password_token" do
-        User.should respond_to(:load_from_reset_password_token)
+      specify { expect(user).to respond_to :deliver_reset_password_instructions! }
+
+      specify { expect(user).to respond_to :change_password! }
+
+      it "responds to .load_from_reset_password_token" do
+        expect(User).to respond_to :load_from_reset_password_token
       end
     end
 
-    it "should allow configuration option 'reset_password_token_attribute_name'" do
+    it "allows configuration option 'reset_password_token_attribute_name'" do
       sorcery_model_property_set(:reset_password_token_attribute_name, :my_code)
-      User.sorcery_config.reset_password_token_attribute_name.should equal(:my_code)
+
+      expect(User.sorcery_config.reset_password_token_attribute_name).to eq :my_code
     end
-    
-    it "should allow configuration option 'reset_password_mailer'" do
+
+    it "allows configuration option 'reset_password_mailer'" do
       sorcery_model_property_set(:reset_password_mailer, TestUser)
-      User.sorcery_config.reset_password_mailer.should equal(TestUser)
+
+      expect(User.sorcery_config.reset_password_mailer).to eq TestUser
     end
 
-    it "should enable configuration option 'reset_password_mailer_disabled'" do
+    it "enables 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)
+
+      expect(User.sorcery_config.reset_password_mailer_disabled).to eq :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    
+    end
 
-    it "should allow configuration option 'reset_password_email_method_name'" do
+    it "allows 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)
+
+      expect(User.sorcery_config.reset_password_email_method_name).to eq :my_mailer_method
     end
-    
-    it "should allow configuration option 'reset_password_expiration_period'" do
+
+    it "allows configuration option 'reset_password_expiration_period'" do
       sorcery_model_property_set(:reset_password_expiration_period, 16)
-      User.sorcery_config.reset_password_expiration_period.should equal(16)
+
+      expect(User.sorcery_config.reset_password_expiration_period).to eq 16
     end
-    
-    it "should allow configuration option 'reset_password_email_sent_at_attribute_name'" do
+
+    it "allows configuration option 'reset_password_email_sent_at_attribute_name'" do
       sorcery_model_property_set(:reset_password_email_sent_at_attribute_name, :blabla)
-      User.sorcery_config.reset_password_email_sent_at_attribute_name.should equal(:blabla)
+
+      expect(User.sorcery_config.reset_password_email_sent_at_attribute_name).to eq :blabla
     end
-    
-    it "should allow configuration option 'reset_password_time_between_emails'" do
+
+    it "allows configuration option 'reset_password_time_between_emails'" do
       sorcery_model_property_set(:reset_password_time_between_emails, 16)
-      User.sorcery_config.reset_password_time_between_emails.should equal(16)
+
+      expect(User.sorcery_config.reset_password_time_between_emails).to eq 16
     end
   end
 
-  # ----------------- PLUGIN ACTIVATED -----------------------
-  describe User, "when activated with sorcery" do
-  
+
+  describe "when activated with sorcery" do
+
     before(:all) do
       sorcery_reload!([:reset_password], :reset_password_mailer => ::SorceryMailer)
     end
-  
+
     before(:each) do
-      User.delete_all
+      User.sorcery_adapter.delete_all
+      user
     end
-    
+
     after(:each) do
       Timecop.return
     end
-    
-    it "load_from_reset_password_token should return user when token is found" do
-      create_new_user
-      @user.deliver_reset_password_instructions!
-      User.load_from_reset_password_token(@user.reset_password_token).should == @user
-    end
-    
-    it "load_from_reset_password_token should NOT return user when token is NOT found" do
-      create_new_user
-      @user.deliver_reset_password_instructions!
-      User.load_from_reset_password_token("a").should == nil
-    end
-    
-    it "load_from_reset_password_token should return user when token is found and not expired" do
-      create_new_user
+
+    it "load_from_reset_password_token returns user when token is found" do
+      user.generate_reset_password_token!
+      updated_user  = User.sorcery_adapter.find(user.id)
+
+      expect(User.load_from_reset_password_token user.reset_password_token).to eq updated_user
+    end
+
+    it "load_from_reset_password_token does NOT return user when token is NOT found" do
+      user.generate_reset_password_token!
+
+      expect(User.load_from_reset_password_token "a").to be_nil
+    end
+
+    it "load_from_reset_password_token returns user when token is found and not expired" do
       sorcery_model_property_set(:reset_password_expiration_period, 500)
-      @user.deliver_reset_password_instructions!
-      User.load_from_reset_password_token(@user.reset_password_token).should == @user
+      user.generate_reset_password_token!
+      updated_user  = User.sorcery_adapter.find(user.id)
+
+      expect(User.load_from_reset_password_token user.reset_password_token).to eq updated_user
     end
-    
-    it "load_from_reset_password_token should NOT return user when token is found and expired" do
-      create_new_user
+
+    it "load_from_reset_password_token does NOT return user when token is found and expired" do
       sorcery_model_property_set(:reset_password_expiration_period, 0.1)
-      @user.deliver_reset_password_instructions!
+      user.generate_reset_password_token!
       Timecop.travel(Time.now.in_time_zone+0.5)
-      User.load_from_reset_password_token(@user.reset_password_token).should == nil
+
+      expect(User.load_from_reset_password_token user.reset_password_token).to be_nil
     end
-    
-    it "load_from_reset_password_token should always be valid if expiration period is nil" do
-      create_new_user
+
+    it "load_from_reset_password_token is always valid if expiration period is nil" do
       sorcery_model_property_set(:reset_password_expiration_period, nil)
-      @user.deliver_reset_password_instructions!
-      User.load_from_reset_password_token(@user.reset_password_token).should == @user
+      user.generate_reset_password_token!
+      updated_user  = User.sorcery_adapter.find(user.id)
+
+      expect(User.load_from_reset_password_token user.reset_password_token).to eq updated_user
     end
-    
-    it "load_from_reset_password_token should return nil if token is blank" do
-      User.load_from_reset_password_token(nil).should == nil
-      User.load_from_reset_password_token("").should == nil
+
+    it "load_from_reset_password_token returns nil if token is blank" do
+      expect(User.load_from_reset_password_token nil).to be_nil
+      expect(User.load_from_reset_password_token "").to be_nil
     end
-    
-    it "'deliver_reset_password_instructions!' should generate a reset_password_token" do
-      create_new_user
-      @user.reset_password_token.should be_nil
-      @user.deliver_reset_password_instructions!
-      @user.reset_password_token.should_not be_nil
+
+    it "'deliver_reset_password_instructions!' generates a reset_password_token" do
+      expect(user.reset_password_token).to be_nil
+
+      user.deliver_reset_password_instructions!
+
+      expect(user.reset_password_token).not_to be_nil
     end
 
-    it "the reset_password_token should be random" do
-      create_new_user
+    it "the reset_password_token is random" do
       sorcery_model_property_set(:reset_password_time_between_emails, 0)
-      @user.deliver_reset_password_instructions!
-      old_password_code = @user.reset_password_token
-      @user.deliver_reset_password_instructions!
-      @user.reset_password_token.should_not == old_password_code
+      user.deliver_reset_password_instructions!
+      old_password_code = user.reset_password_token
+      user.deliver_reset_password_instructions!
+
+      expect(user.reset_password_token).not_to eq old_password_code
     end
 
     context "mailer is enabled" do
-      it "should send an email on reset" do
-        create_new_user
+      it "sends an email on reset" do
         old_size = ActionMailer::Base.deliveries.size
-        @user.deliver_reset_password_instructions!
-        ActionMailer::Base.deliveries.size.should == old_size + 1
+        user.deliver_reset_password_instructions!
+
+        expect(ActionMailer::Base.deliveries.size).to eq old_size + 1
       end
 
-      it "should not send an email if time between emails has not passed since last email" do
-        create_new_user
+      it "calls send_reset_password_email! on reset" do
+        expect(user).to receive(:send_reset_password_email!).once
+
+        user.deliver_reset_password_instructions!
+      end
+
+      it "does not send an email if time between emails has not passed since last email" do
         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
+        user.deliver_reset_password_instructions!
+
+        expect(ActionMailer::Base.deliveries.size).to eq old_size + 1
+
+        user.deliver_reset_password_instructions!
+
+        expect(ActionMailer::Base.deliveries.size).to eq old_size + 1
       end
 
-      it "should send an email if time between emails has passed since last email" do
-        create_new_user
+      it "sends an email if time between emails has passed since last email" do
         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
+        user.deliver_reset_password_instructions!
+
+        expect(ActionMailer::Base.deliveries.size).to eq 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
+        user.deliver_reset_password_instructions!
+
+        expect(ActionMailer::Base.deliveries.size).to eq old_size + 2
       end
     end
 
@@ -174,56 +195,68 @@ shared_examples_for "rails_3_reset_password_model" 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
+      it "sends an email on reset" do
         old_size = ActionMailer::Base.deliveries.size
-        @user.deliver_reset_password_instructions!
-        ActionMailer::Base.deliveries.size.should == old_size
+        user.deliver_reset_password_instructions!
+
+        expect(ActionMailer::Base.deliveries.size).to eq old_size
+      end
+
+      it "does not call send_reset_password_email! on reset" do
+        expect(user).to receive(:send_reset_password_email!).never
+
+        user.deliver_reset_password_instructions!
       end
 
-      it "should not send an email if time between emails has not passed since last email" do
-        create_new_user
+      it "does not send an email if time between emails has not passed since last email" do
         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
+        user.deliver_reset_password_instructions!
+
+        expect(ActionMailer::Base.deliveries.size).to eq old_size
+
+        user.deliver_reset_password_instructions!
+
+        expect(ActionMailer::Base.deliveries.size).to eq old_size
       end
 
-      it "should send an email if time between emails has passed since last email" do
-        create_new_user
+      it "sends an email if time between emails has passed since last email" do
         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
+        user.deliver_reset_password_instructions!
+
+        expect(ActionMailer::Base.deliveries.size).to eq old_size
+
         Timecop.travel(Time.now.in_time_zone+0.5)
-        @user.deliver_reset_password_instructions!
-        ActionMailer::Base.deliveries.size.should == old_size
+        user.deliver_reset_password_instructions!
+
+        expect(ActionMailer::Base.deliveries.size).to eq old_size
       end
     end
 
-    it "when change_password! is called, should delete reset_password_token" do
-      create_new_user
-      @user.deliver_reset_password_instructions!
-      @user.reset_password_token.should_not be_nil
-      @user.change_password!("blabulsdf")
-      @user.save!
-      @user.reset_password_token.should be_nil
+    it "when change_password! is called, deletes reset_password_token" do
+      user.deliver_reset_password_instructions!
+
+      expect(user.reset_password_token).not_to be_nil
+
+      user.change_password!("blabulsdf")
+      user.save!
+
+      expect(user.reset_password_token).to be_nil
     end
 
-    it "should return false if time between emails has not passed since last email" do
-      create_new_user
+    it "returns false if time between emails has not passed since last email" do
       sorcery_model_property_set(:reset_password_time_between_emails, 10000)
-      @user.deliver_reset_password_instructions!
-      @user.deliver_reset_password_instructions!.should == false
+      user.deliver_reset_password_instructions!
+
+      expect(user.deliver_reset_password_instructions!).to be false
     end
 
-    it "should encrypt properly on reset" do
-      create_new_user
-      @user.deliver_reset_password_instructions!
-      @user.change_password!("blagu")
-      Sorcery::CryptoProviders::BCrypt.matches?(@user.crypted_password,"blagu",@user.salt).should be_true
+    it "encrypts properly on reset" do
+      user.deliver_reset_password_instructions!
+      user.change_password!("blagu")
+
+      expect(Sorcery::CryptoProviders::BCrypt.matches? user.crypted_password, "blagu", user.salt).to be true
     end
 
   end