authkit 0.0.1 → 0.2.1

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

@@ -1,13 +1,12 @@
 require 'spec_helper'
 
 describe ApplicationController do
-  let(:user_params) { { email: "test@example.com", username: "test", password: "example", password_confirmation: "example" } }
-  let(:user) { User.new(user_params) }
-  let(:logged_in_session) { { user_id: "1" } }
-  let(:unknown_session) { { user_id: "2" } }
+  let(:user) { create(:user) }
+  let(:logged_in_session) { { user_id: user.id } }
+  let(:unknown_session) { { user_id: user.id + 1000000 } }
 
   before(:each) do
-    User.stub(:find_by).with("1").and_return(user)
+    user
   end
 
   controller do
@@ -34,7 +33,9 @@ describe ApplicationController do
     end
 
     it "does not perform multiple finds" do
-      User.should_receive(:find_by)
+      where = double
+      where.stub(:first).and_return(nil)
+      User.should_receive(:where).and_return(where)
       get :new, {}, unknown_session
       controller.send(:current_user).should be_nil
     end
@@ -55,7 +56,7 @@ describe ApplicationController do
     end
 
     it "sets the time zone" do
-      user.should_receive(:time_zone).and_return("Pacific Time (US & Canada)")
+      User.any_instance.should_receive(:time_zone).and_return("Pacific Time (US & Canada)")
       get :index, {}, logged_in_session
       Time.zone.name.should == "Pacific Time (US & Canada)"
     end
@@ -167,7 +168,7 @@ describe ApplicationController do
 
     it "clears the remember token" do
       get :index, {}, logged_in_session
-      user.should_receive(:clear_remember_token).and_return(:true)
+      User.any_instance.should_receive(:clear_remember_token).and_return(:true)
       controller.send(:logout)
     end
   end

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

@@ -3,8 +3,7 @@ require 'spec_helper'
 describe EmailConfirmationController do
   render_views
 
-  let(:user_params) { { email: "test@example.com", username: "test", password: "example", password_confirmation: "example" } }
-  let(:user) { User.new(user_params) }
+  let(:user) { build(:user) }
   let(:token) { "TOKEN" }
 
   describe "GET 'show'" do

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

@@ -3,8 +3,7 @@ require 'spec_helper'
 describe PasswordChangeController do
   render_views
 
-  let(:user_params) { { email: "test@example.com", username: "test", password: "example", password_confirmation: "example" } }
-  let(:user) { User.new(user_params) }
+  let(:user) { build(:user) }
   let(:token) { "TOKEN" }
 
   describe "GET 'show'" do

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

@@ -3,8 +3,7 @@ require 'spec_helper'
 describe PasswordResetController do
   render_views
 
-  let(:user_params) { { email: "test@example.com", username: "test", password: "example", password_confirmation: "example" } }
-  let(:user) { User.new(user_params) }
+  let(:user) { create(:user, email: "test@example.com") }
 
   describe "GET 'show'" do
     it "returns http success" do
@@ -15,10 +14,7 @@ describe PasswordResetController do
 
   describe "POST 'create'" do
     before(:each) do
-      User.stub(:find_by_username_or_email).with("test@example.com").and_return(user)
-      User.stub(:find_by_username_or_email).with("unknown@example.com").and_return(nil)
-      user.stub(:persisted?).and_return(true)
-      user.stub(:id).and_return(1)
+      user
     end
 
     it "redirects the user" do
@@ -27,13 +23,8 @@ describe PasswordResetController do
     end
 
     it "finds the user by the email or user name" do
-      User.should_receive(:find_by_username_or_email).with("test@example.com").and_return(user)
       post :create, {email: "test@example.com"}
-    end
-
-    it "downcases the email or user name" do
-      User.should_receive(:find_by_username_or_email).with("test@example.com").and_return(user)
-      post :create, {email: "TEST@EXAMPLE.COM"}
+      controller.send(:user).should == user
     end
 
     it "logs any current user out if it finds the user" do
@@ -42,7 +33,7 @@ describe PasswordResetController do
     end
 
     it "resets the password if it finds the user" do
-      user.should_receive(:send_reset_password).and_return(true)
+      User.any_instance.should_receive(:send_reset_password).and_return(true)
       post :create, {email: "test@example.com"}
     end
 
@@ -51,6 +42,11 @@ describe PasswordResetController do
       post :create, {email: "unknown@example.com"}
     end
 
+    it "downcases the email or user name" do
+      User.any_instance.should_receive(:send_reset_password).and_return(true)
+      post :create, {email: "TEST@EXAMPLE.COM"}
+    end
+
     describe "from json" do
       it "returns http success" do
         post :create, {email: "test@example.com", format: "json"}

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

@@ -3,13 +3,8 @@ require 'spec_helper'
 describe SessionsController do
   render_views
 
-  let(:user_params) { { email: "test@example.com", username: "test", password: "example", password_confirmation: "example" } }
-  let(:user) { User.new(user_params) }
-  let(:logged_in_session) { { user_id: "1" } }
-
-  before(:each) do
-    User.stub(:find_by).with("1").and_return(user)
-  end
+  let(:user) { create(:user, email: "test@example.com") }
+  let(:logged_in_session) { { user_id: user.id } }
 
   describe "GET 'new'" do
     it "returns http success" do
@@ -20,8 +15,7 @@ describe SessionsController do
 
   describe "POST 'create'" do
     before(:each) do
-      User.stub(:find_by_username_or_email).with("test@example.com").and_return(user)
-      User.stub(:find_by_username_or_email).with("unknown@example.com").and_return(nil)
+      user
     end
 
     it "redirects the user" do
@@ -29,18 +23,8 @@ describe SessionsController do
       response.should be_redirect
     end
 
-    it "finds the user by the email or user name" do
-      User.should_receive(:find_by_username_or_email).with("test@example.com").and_return(user)
-      post :create, {email: "test@example.com", password: "example"}
-    end
-
-    it "downcases the email or user name" do
-      User.should_receive(:find_by_username_or_email).with("test@example.com").and_return(user)
-      post :create, {email: "TEST@EXAMPLE.COM", password: "example"}
-    end
-
     it "authenticates if it finds the user" do
-      user.should_receive(:authenticate).and_return(true)
+      User.any_instance.should_receive(:authenticate).and_return(true)
       post :create, {email: "test@example.com", password: "example"}
     end
 
@@ -49,6 +33,11 @@ describe SessionsController do
       post :create, {email: "unknown@example.com", password: "example"}
     end
 
+    it "downcases the email or user name" do
+      User.any_instance.should_receive(:authenticate).and_return(true)
+      post :create, {email: "TEST@EXAMPLE.COM", password: "example"}
+    end
+
     it "signs the user in" do
       post :create, {email: "test@example.com", password: "example"}
       controller.send(:current_user).should == user

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

@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+describe SignupController do
+  render_views
+
+  let(:signup_params) { attributes_for(:user) }
+  let(:invalid_params) { signup_params.merge(password: 'newpassword', password_confirmation: 'wrongpassword') }
+
+  describe "GET 'new'" do
+    it "returns http success" do
+      get :new
+      response.should be_success
+      assigns(:signup).should_not be_nil
+    end
+  end
+
+  describe "POST 'create'" do
+    describe "with valid params" do
+      describe "from html" do
+        it "creates a new user" do
+          expect {
+            post :create, {signup: signup_params}, {}
+          }.to change(User, :count).by(1)
+        end
+
+        it "confirms the email" do
+          User.any_instance.should_receive(:send_confirmation)
+          post :create, {signup: signup_params}, {}
+        end
+
+        it "signs the user in" do
+          post :create, {signup: signup_params}, {}
+          controller.send(:current_user).should == assigns(:signup).user
+        end
+
+        it "redirects to the root" do
+          post :create, {signup: signup_params}
+          response.should be_redirect
+        end
+      end
+
+      describe "from json" do
+        it "creates the user" do
+          expect {
+            post :create, {signup: signup_params, format: 'json'}, {}
+          }.to change(User, :count).by(1)
+        end
+
+        it "signs the user in" do
+          post :create, {signup: signup_params, format: 'json'}, {}
+          controller.send(:current_user).should == assigns(:signup).user
+        end
+
+        it "returns http success" do
+          post :create, {signup: signup_params, format: 'json'}
+          response.should be_success
+        end
+      end
+    end
+
+    describe "with invalid params" do
+      describe "from html" do
+        it "renders the new page" do
+          post :create, {signup: invalid_params}, {}
+          response.should render_template("new")
+        end
+
+        it "does not create a user" do
+          expect {
+            post :create, {signup: invalid_params}, {}
+          }.to_not change(User, :count)
+        end
+
+        it "sets the errors" do
+          post :create, {signup: invalid_params}, {}
+          assigns(:signup).should have(2).errors_on(:password_confirmation)
+        end
+      end
+
+      describe "from json" do
+        it "returns a 422" do
+          post :create, {signup: invalid_params, format: 'json'}, {}
+          response.code.should == '422'
+        end
+
+        it "includes the errors in the json" do
+          post :create, {signup: invalid_params, format: 'json'}, {}
+          assigns(:signup).should have(2).errors_on(:password_confirmation)
+          response.body.should =~ /doesn't match Password/i
+        end
+      end
+    end
+  end
+end
+

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

@@ -3,100 +3,10 @@ require 'spec_helper'
 describe UsersController do
   render_views
 
-  let(:user_params) { { email: "test@example.com", username: "test", password: "example", password_confirmation: "example" } }
+  let(:user) { create(:user, email: "test@example.com") }
+  let(:user_params) { attributes_for(:user) }
   let(:invalid_params) { user_params.merge(password: 'newpassword', password_confirmation: 'wrongpassword') }
-  let(:user) { User.new(user_params) }
-  let(:logged_in_session) { { user_id: "1" } }
-
-  before(:each) do
-    User.stub(:find_by).with("1").and_return(user)
-  end
-
-  describe "GET 'new'" do
-    it "returns http success" do
-      get :new
-      response.should be_success
-      assigns(:user).should be_a_new(User)
-    end
-  end
-
-  describe "POST 'create'" do
-    describe "with valid params" do
-      describe "from html" do
-        it "creates a new user" do
-          expect {
-            post :create, {user: user_params}, {}
-          }.to change(User, :count).by(1)
-        end
-
-        it "confirms the email" do
-          User.any_instance.should_receive(:send_confirmation)
-          post :create, {user: user_params}, {}
-        end
-
-        it "signs the user in" do
-          post :create, {user: user_params}, {}
-          controller.send(:current_user).should == assigns(:user)
-        end
-
-        it "redirects to the root" do
-          post :create, {user: user_params}
-          response.should be_redirect
-        end
-      end
-
-      describe "from json" do
-        it "creates the user" do
-          expect {
-            post :create, {user: user_params, format: 'json'}, {}
-          }.to change(User, :count).by(1)
-        end
-
-        it "signs the user in" do
-          post :create, {user: user_params, format: 'json'}, {}
-          controller.send(:current_user).should == assigns(:user)
-        end
-
-        it "returns http success" do
-          post :create, {user: user_params, format: 'json'}
-          response.should be_success
-        end
-      end
-    end
-
-    describe "with invalid params" do
-      describe "from html" do
-        it "renders the new page" do
-          post :create, {user: invalid_params}, {}
-          response.should render_template("new")
-        end
-
-        it "does not create a user" do
-          expect {
-            post :create, {user: invalid_params}, {}
-          }.to_not change(User, :count)
-        end
-
-        it "sets the errors" do
-          post :create, {user: invalid_params}, {}
-          assigns(:user).should have(2).errors_on(:password_confirmation)
-        end
-      end
-
-      describe "from json" do
-        it "returns a 422" do
-          post :create, {user: invalid_params, format: 'json'}, {}
-          response.code.should == '422'
-        end
-
-        it "includes the errors in the json" do
-          post :create, {user: invalid_params, format: 'json'}, {}
-          assigns(:user).should have(2).errors_on(:password_confirmation)
-          response.body.should =~ /doesn't match Password/i
-        end
-      end
-    end
-  end
+  let(:logged_in_session) { { user_id: user.id } }
 
   describe "GET 'edit'" do
     it "redirects if there is no current user" do
@@ -118,6 +28,10 @@ describe UsersController do
 
     describe "with valid params" do
       describe "when changing the email" do
+        before(:each) do
+          controller.stub(:current_user).and_return(user)
+        end
+
         it "doesn't send the confirmation the email if unchanged" do
           user.email = user.confirmation_email
           user.confirmation_email = nil
@@ -138,6 +52,10 @@ describe UsersController do
       end
 
       describe "from html" do
+        before(:each) do
+          controller.stub(:current_user).and_return(user)
+        end
+
         it "updates the user" do
           expect {
             put :update, {user: user_params.merge(first_name: "Alvarez")}, logged_in_session
@@ -151,6 +69,10 @@ describe UsersController do
       end
 
       describe "from json" do
+        before(:each) do
+          controller.stub(:current_user).and_return(user)
+        end
+
         it "updates the user" do
           expect {
             put :update, {user: user_params.merge(first_name: "Alvarez"), format: 'json'}, logged_in_session
@@ -160,6 +82,10 @@ describe UsersController do
     end
 
     describe "with invalid params" do
+      before(:each) do
+        controller.stub(:current_user).and_return(user)
+      end
+
       describe "from html" do
         before(:each) do
           put :update, {user: invalid_params}, logged_in_session

data/lib/generators/authkit/templates/spec/factories/user.rb

@@ -0,0 +1,11 @@
+FactoryGirl.define do
+  factory :user do
+    email "test@example.com"
+    username "test"
+    password "example"
+    password_confirmation "example"
+    first_name "John"
+    last_name "Example"
+  end
+end
+

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

@@ -0,0 +1,91 @@
+require 'spec_helper'
+
+describe Signup do
+  let(:signup) { Signup.new }
+
+  it "should not be persisted" do
+    signup.should_not be_persisted
+  end
+
+  describe "validation" do
+    it "should validate terms of service acceptance" do
+      signup.terms_of_service = "1"
+      signup.valid?
+      signup.should_not have(1).errors_on(:terms_of_service)
+    end
+
+    it "should validate models" do
+      signup.user = User.new
+      signup.user.should_receive(:valid?).and_return(true)
+      signup.valid?
+    end
+
+    it "should copy errors from the user to the signup" do
+      signup.user = User.new
+      signup.valid?
+      signup.should have(1).errors_on(:password)
+    end
+  end
+
+  describe "saving" do
+    it "should validate" do
+      signup.should_receive(:valid?)
+      signup.save
+    end
+
+    describe "when valid" do
+      it "should persist" do
+        signup.user = User.new
+        signup.should_receive(:valid?).and_return(true)
+        signup.user.should_receive(:save!)
+        signup.save
+      end
+
+      it "should send the welcome" do
+        signup.user = User.new
+        signup.should_receive(:valid?).and_return(true)
+        signup.stub(:persist!)
+        signup.user.should_receive(:send_welcome)
+        signup.save
+      end
+
+      it "should send the confirmation" do
+        signup.user = User.new
+        signup.should_receive(:valid?).and_return(true)
+        signup.stub(:persist!)
+        signup.user.should_receive(:send_confirmation)
+        signup.save
+      end
+    end
+
+    describe "when invalid" do
+      it "should not persist" do
+        signup.should_receive(:valid?).and_return(false)
+        signup.should_not_receive(:persist!)
+        signup.save
+      end
+
+      it "should not send the welcome" do
+        signup.should_receive(:valid?).and_return(false)
+        signup.should_not_receive(:send_welcome)
+        signup.save
+      end
+
+      it "should not send the confirmation" do
+        signup.should_receive(:valid?).and_return(false)
+        signup.should_not_receive(:send_confirmation)
+        signup.save
+      end
+    end
+  end
+
+  it "should create a new user" do
+    user = User.new
+    User.should_receive(:new).and_return(user)
+    user.stub(:valid?).and_return(true)
+    user.should_receive(:save!)
+    signup.stub(:valid?).and_return(true)
+    signup.save
+  end
+
+end

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe User do
-  let(:user_params) { { email: "test@example.com", username: "test", password: "example", password_confirmation: "example" } }
+  let(:user_params) { attributes_for(:user) }
 
   it "has secure password support" do
     User.new.should respond_to(:authenticate)
@@ -32,7 +32,7 @@ describe User do
   describe "validations" do
     describe "unique" do
       before(:each) do
-        User.create!(user_params)
+        create(:user)
       end
       it { should validate_uniqueness_of(:username) }
       it { should validate_uniqueness_of(:email) }
@@ -53,11 +53,10 @@ describe User do
 
   describe "tokens" do
     it "finds a user from a token" do
-      verifier = ActiveSupport::MessageVerifier.new("SECRET")
-      token = verifier.generate(1)
-      user = User.new
-      User.should_receive(:find_by_id).with(1).and_return(user)
-      User.user_from_token(token).should == user
+      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
@@ -171,7 +170,7 @@ describe User do
   end
 
   describe "emails" do
-    let(:user) { User.new(user_params) }
+    let(:user) { build(:user) }
 
     describe "with valid params" do
       it "confirms the email" do
@@ -219,7 +218,7 @@ describe User do
     end
 
     it "does not confirm emails if they are already used" do
-      User.create(user_params.merge(email: "new@example.com", username: "newuser"))
+      create(:user, email: "new@example.com", username: "newuser")
       user.confirmation_email = "new@example.com"
       user.confirmation_token = "TOKEN"
       user.email_confirmed.should == false
@@ -229,7 +228,7 @@ describe User do
 
   describe "passwords" do
     it "changes the password if it matches" do
-      user = User.new(user_params)
+      user = build(:user)
       user.should_receive(:save).and_return(true)
       user.change_password("password", "password")
       user.password_digest.should_not be_blank

data/lib/generators/authkit/templates/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+
+  # FactoryGirl allows you to quickly create template based objects
+  # The syntax methods give you inline `create` and a `build` commands
+  config.include FactoryGirl::Syntax::Methods

data/spec/spec_helper.rb

@@ -11,6 +11,8 @@ RSpec.configure do |config|
   config.use_transactional_fixtures = true
   config.infer_base_class_for_anonymous_controllers = false
   config.order = "random"
+  config.include FactoryGirl::Syntax::Methods
+
   # Because we are not running things in Rails we need to stub some secrets
   config.before(:each) { Rails.application.config.stub(:secret_token).and_return("SECRET") }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authkit
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Jeff Rafter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-27 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,20 +66,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: active_model_otp
   requirement: !ruby/object:Gem::Requirement
@@ -119,13 +105,16 @@ files:
 - lib/generators/authkit/templates/app/controllers/password_change_controller.rb
 - lib/generators/authkit/templates/app/controllers/password_reset_controller.rb
 - lib/generators/authkit/templates/app/controllers/sessions_controller.rb
+- lib/generators/authkit/templates/app/controllers/signup_controller.rb
 - lib/generators/authkit/templates/app/controllers/users_controller.rb
+- lib/generators/authkit/templates/app/forms/signup.rb
 - lib/generators/authkit/templates/app/models/user.rb
 - lib/generators/authkit/templates/app/views/password_change/show.html.erb
 - lib/generators/authkit/templates/app/views/password_reset/show.html.erb
 - lib/generators/authkit/templates/app/views/sessions/new.html.erb
+- lib/generators/authkit/templates/app/views/signup/new.html.erb
 - lib/generators/authkit/templates/app/views/users/edit.html.erb
-- lib/generators/authkit/templates/app/views/users/new.html.erb
+- lib/generators/authkit/templates/config/initializers/filter_parameter_logging.rb
 - lib/generators/authkit/templates/db/migrate/add_authkit_fields_to_users.rb
 - lib/generators/authkit/templates/db/migrate/create_users.rb
 - lib/generators/authkit/templates/lib/email_format_validator.rb
@@ -134,8 +123,12 @@ files:
 - lib/generators/authkit/templates/spec/controllers/password_change_controller_spec.rb
 - lib/generators/authkit/templates/spec/controllers/password_reset_controller_spec.rb
 - lib/generators/authkit/templates/spec/controllers/sessions_controller_spec.rb
+- lib/generators/authkit/templates/spec/controllers/signup_controller_spec.rb
 - lib/generators/authkit/templates/spec/controllers/users_controller_spec.rb
+- lib/generators/authkit/templates/spec/factories/user.rb
+- lib/generators/authkit/templates/spec/forms/signup_spec.rb
 - lib/generators/authkit/templates/spec/models/user_spec.rb
+- lib/generators/authkit/templates/spec/spec_helper.rb
 - spec/spec_helper.rb
 homepage: https://github.com/jeffrafter/authkit
 licenses: