authkit 0.2.1 → 0.4.0

data/lib/generators/authkit/templates/spec/controllers/sessions_controller_spec.rb

@@ -43,6 +43,20 @@ describe SessionsController do
       controller.send(:current_user).should == user
     end
 
+    it "remembers the user if remember me is chosen" do
+      User.any_instance.should_receive(:set_remember_token)
+      controller.should_receive(:set_remember_cookie)
+      post :create, {email: "test@example.com", password: "example", remember_me: "1"}
+      controller.send(:current_user).should == user
+    end
+
+    it "does not remember the user if remember me is not chosen" do
+      User.any_instance.should_not_receive(:set_remember_token)
+      controller.should_not_receive(:set_remember_cookie)
+      post :create, {email: "test@example.com", password: "example", remember_me: ""}
+      controller.send(:current_user).should == user
+    end
+
     describe "from json" do
       it "returns http success" do
         post :create, {email: "test@example.com", password: "example", format: "json"}

data/lib/generators/authkit/templates/spec/controllers/signup_controller_spec.rb

@@ -33,6 +33,20 @@ describe SignupController do
           controller.send(:current_user).should == assigns(:signup).user
         end
 
+        it "remembers the user if remember me is chosen" do
+          User.any_instance.should_receive(:set_remember_token)
+          controller.should_receive(:set_remember_cookie)
+          post :create, {signup: signup_params, remember_me: "1"}, {}
+          controller.send(:current_user).should == assigns(:signup).user
+        end
+
+        it "does not remember the user if remember me is not chosen" do
+          User.any_instance.should_not_receive(:set_remember_token)
+          controller.should_not_receive(:set_remember_cookie)
+          post :create, {signup: signup_params, remember_me: ""}, {}
+          controller.send(:current_user).should == assigns(:signup).user
+        end
+
         it "redirects to the root" do
           post :create, {signup: signup_params}
           response.should be_redirect

data/lib/generators/authkit/templates/spec/forms/signup_spec.rb

@@ -38,6 +38,7 @@ describe Signup do
         signup.user = User.new
         signup.should_receive(:valid?).and_return(true)
         signup.user.should_receive(:save!)
+        signup.user.should_receive(:send_confirmation)
         signup.save
       end
 
@@ -45,6 +46,7 @@ describe Signup do
         signup.user = User.new
         signup.should_receive(:valid?).and_return(true)
         signup.stub(:persist!)
+        signup.user.should_receive(:send_confirmation)
         signup.user.should_receive(:send_welcome)
         signup.save
       end
@@ -84,6 +86,7 @@ describe Signup do
     User.should_receive(:new).and_return(user)
     user.stub(:valid?).and_return(true)
     user.should_receive(:save!)
+    user.should_receive(:send_confirmation)
     signup.stub(:valid?).and_return(true)
     signup.save
   end

data/lib/generators/authkit/templates/spec/models/user_spec.rb

@@ -52,72 +52,51 @@ describe User do
   end
 
   describe "tokens" do
-    it "finds a user from a token" do
-      user = create(:user)
-      verifier = ActiveSupport::MessageVerifier.new(Rails.application.config.secret_key_base)
-      token = verifier.generate(user.id)
-      User.user_from_token(token).id.should == user.id
-    end
-
-    it "does not find a user from an invalid token" do
-      User.user_from_token("INVALID").should be_nil
-    end
-
-    describe "for fields" do
-      before(:each) do
-        User.should_receive(:user_from_token).with("TOKEN").and_return("USER")
-      end
-
-      it "finds a user from the remember token" do
-        User.user_from_remember_token("TOKEN").should == "USER"
-      end
-
-      it "finds a user from the reset password token" do
-        User.user_from_reset_password_token("TOKEN").should == "USER"
-      end
-
-      it "finds a user from the confirm token" do
-        User.user_from_confirmation_token("TOKEN").should == "USER"
-      end
-
-      it "finds a user from the unlock token" do
-        User.user_from_unlock_token("TOKEN").should == "USER"
-      end
+    it "sets the remember token" do
+      user = User.new
+      user.should_receive(:save!).and_return(true)
+      user.set_remember_token
+      user.remember_token.should_not be_blank
+      user.remember_token_created_at.should_not be_blank
     end
 
-    it "sets a token" do
+    it "clears the remember token" do
       user = User.new
-      user.should_receive(:persisted?).and_return(true)
-      user.should_receive(:id).and_return(1)
-      user.should_receive(:save).and_return(true)
-      user.set_token(:remember_token)
-      user.remember_token.should_not be_nil
+      user.should_receive(:save!).and_return(true)
+      user.remember_token = "TOKEN"
+      user.remember_token_created_at = Time.now
+      user.clear_remember_token
+      user.remember_token.should be_nil
+      user.remember_token_created_at.should be_nil
     end
+  end
 
-    it "does not set a token for a new record" do
+  describe "token expiry" do
+    it "should expire reset password tokens" do
       user = User.new
-      user.set_token(:remember_token)
-      user.remember_token.should be_nil
+      user.reset_password_token_expired?.should == true
+      user.reset_password_token_created_at = 10.minutes.ago
+      user.reset_password_token_expired?.should == false
+      user.reset_password_token_created_at = 1.day.ago
+      user.reset_password_token_expired?.should == true
     end
 
-    it "sets the created at for the token" do
-      Time.stub(:now).and_return(time = Time.now)
+    it "should expire confirmation tokens" do
       user = User.new
-      user.should_receive(:persisted?).and_return(true)
-      user.should_receive(:id).and_return(1)
-      user.should_receive(:save).and_return(true)
-      user.set_token(:remember_token)
-      user.remember_token_created_at.should == time
+      user.confirmation_token_expired?.should == true
+      user.confirmation_token_created_at = 2.days.ago
+      user.confirmation_token_expired?.should == false
+      user.confirmation_token_created_at = 3.days.ago
+      user.confirmation_token_expired?.should == true
     end
 
-    it "clears the remember token" do
+    it "should expire remember tokens" do
       user = User.new
-      user.should_receive(:save).and_return(true)
-      user.remember_token = "TOKEN"
-      user.remember_token_created_at = Time.now
-      user.clear_remember_token
-      user.remember_token.should be_nil
-      user.remember_token_created_at.should be_nil
+      user.remember_token_expired?.should == true
+      user.remember_token_created_at = 30.days.ago
+      user.remember_token_expired?.should == false
+      user.remember_token_created_at = 1.years.ago
+      user.remember_token_expired?.should == true
     end
   end
 
@@ -175,9 +154,7 @@ describe User do
     describe "with valid params" do
       it "confirms the email" do
         user = User.new
-        user.should_receive(:persisted?).and_return(true)
-        user.should_receive(:id).and_return(1)
-        user.should_receive(:save).and_return(true)
+        user.should_receive(:save!).and_return(true)
         Time.stub(:now).and_return(time = Time.now)
 
         user.send_confirmation
@@ -185,11 +162,17 @@ describe User do
         user.confirmation_token.should_not be_blank
       end
 
+      it "generates a token before it sends confirmation email instructions" do
+        user = User.new
+        user.should_receive(:save!).and_return(true)
+        user.send_confirmation
+        user.confirmation_token.should_not be_blank
+        user.confirmation_token_created_at.should_not be_blank
+      end
+
       it "sends confirmation email instructions" do
         user = User.new
-        user.should_receive(:persisted?).and_return(true)
-        user.should_receive(:id).and_return(1)
-        user.should_receive(:save).and_return(true)
+        user.should_receive(:save!).and_return(true)
         user.send_confirmation
       end
 
@@ -224,6 +207,16 @@ describe User do
       user.email_confirmed.should == false
       user.should have(1).errors_on(:email)
     end
+
+    it "is pending confirmation if there is a confirmation token" do
+      user = build(:user, confirmation_token: "TOKEN")
+      user.should be_pending_confirmation
+    end
+
+    it "there is no pending confirmation if there is not a confirmation token" do
+      user = build(:user, confirmation_token: nil)
+      user.should_not be_pending_confirmation
+    end
   end
 
   describe "passwords" do
@@ -246,9 +239,7 @@ describe User do
 
     it "resets the password" do
       user = User.new
-      user.should_receive(:persisted?).and_return(true)
-      user.should_receive(:id).and_return(1)
-      user.should_receive(:save).and_return(true)
+      user.should_receive(:save!).and_return(true)
       Time.stub(:now).and_return(time = Time.now)
 
       user.send_reset_password
@@ -256,11 +247,17 @@ describe User do
       user.reset_password_token.should_not be_blank
     end
 
+    it "generates a token before it sends reset password instructions" do
+      user = User.new
+      user.should_receive(:save!).and_return(true)
+      user.send_reset_password
+      user.reset_password_token.should_not be_blank
+      user.reset_password_token_created_at.should_not be_blank
+    end
+
     it "sends reset password instructions" do
       user = User.new
-      user.should_receive(:persisted?).and_return(true)
-      user.should_receive(:id).and_return(1)
-      user.should_receive(:save).and_return(true)
+      user.should_receive(:save!).and_return(true)
       user.send_reset_password
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authkit
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Jeff Rafter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler