challah 0.5.2 → 0.5.3

data/test/sessions_controller_test.rb

@@ -2,39 +2,39 @@ require 'helper'
 
 class SessionsControllerTest < ActionController::TestCase
   tests SessionsController
-  
+
   context "The sessions controller" do
     setup do
-      @user = Factory(:user, :username => 'sessions-user-test')
+      @user = create(:user, :username => 'sessions-user-test')
     end
-    
+
     should "have a login page" do
       get :new
       assert_response :success
     end
-    
+
     should "be able to login" do
       Challah::Session.any_instance.stubs(:save).returns(true)
-      
+
       post :create, :username => 'sessions-user-test', :password => 'abc123'
       assert_redirected_to '/'
-      
+
       Challah::Session.any_instance.unstub(:save)
     end
-    
+
     should "send you back to the sign in page if you can't sign in" do
       Challah::Session.any_instance.stubs(:save).returns(false)
-      
+
       post :create, :username => 'sessions-user-test', :password => 'abc123'
       assert_redirected_to '/login'
-      
+
       Challah::Session.any_instance.unstub(:save)
-    end 
-    
+    end
+
     should "be able to sign out" do
       get :destroy
-      
+
       assert_redirected_to '/login'
-    end 
+    end
   end
 end

data/test/simple_cookie_store_test.rb

@@ -2,93 +2,93 @@ require 'helper'
 
 class SimpleCookieStoreTest < ActiveSupport::TestCase
   include Challah
-  
+
   context "The SimpleCookieStore class" do
     setup do
-      @user = Factory(:user)
+      @user = create(:user)
       @request = MockRequest.new
     end
-    
+
     should "save session in a request cookie store" do
       assert_equal [], @request.cookies.keys
-      
+
       session = Session.new(@request)
       session.store = SimpleCookieStore.new(session)
       session.persist = true
       session.user = @user
       session.save
-            
+
       assert_equal %w( challah-s challah-v ), @request.cookies.keys.sort
       assert_equal "#{@user.persistence_token}@#{@user.id}", @request.cookies['challah-s'][:value]
       assert_equal "test.dev", @request.cookies['challah-s'][:domain]
-      
+
       assert_equal Encrypter.md5("#{@user.persistence_token}@#{@user.id}"), @request.cookies['challah-v'][:value]
       assert_equal "test.dev", @request.cookies['challah-v'][:domain]
     end
-    
+
     should "be able to inspect the store" do
       session = Session.new(@request)
       session.store = SimpleCookieStore.new(session)
       session.persist = true
       session.user = @user
       session.save
-      
+
       assert session.store.inspect =~ /<SimpleCookieStore:(.*?)>/, 'Does not match'
-    end 
-    
+    end
+
     should "read cookies and detect tampered verification cookies" do
       assert_equal [], @request.cookies.keys
-      
+
       session = Session.new(@request)
       session.store = SimpleCookieStore.new(session)
       session.persist = true
       session.user = @user
       session.save
-      
+
       validation_cookie_val = Encrypter.md5("#{@user.persistence_token}@#{@user.id}")
       session_cookie_val = "#{@user.persistence_token}@#{@user.id}"
-      
+
       assert_equal session_cookie_val, @request.cookies['challah-s'][:value]
       assert_equal session_cookie_val, session.store.send(:session_cookie)[:value]
       assert_equal validation_cookie_val, @request.cookies['challah-v'][:value]
       assert_equal validation_cookie_val, session.store.send(:validation_cookie)[:value]
-      
+
       session.store.stubs(:validation_cookie).returns(validation_cookie_val)
       session.store.stubs(:session_cookie).returns(session_cookie_val)
-      
+
       session2 = Session.new(@request)
       session2.persist = true
-      session2.store = session.store      
+      session2.store = session.store
       session2.read
-      
+
       assert_equal true, session2.store.send(:existing?)
       assert_equal true, session2.valid?
       assert_equal @user.id, session2.user_id
-      
+
       session.store.stubs(:validation_cookie).returns('bad-value')
-      
+
       session3 = Session.new(@request)
       session3.store = session.store
       session3.read
-      
+
       assert_equal false, session3.store.send(:existing?)
       assert_equal false, session3.valid?
     end
-    
+
     should "delete sessions from cookies" do
       session = Session.new(@request)
       session.store = SimpleCookieStore.new(session)
       session.user = @user
       session.persist = true
-      
+
       session.save
-      
+
       assert_equal true, session.valid?
       assert_equal @user, session.user
       assert_equal %w( challah-s challah-v ), @request.cookies.keys.sort
-      
+
       session.destroy
-      
+
       assert_equal false, session.valid?
       assert_equal nil, session.user
       assert_equal [], @request.cookies.keys.sort

data/test/user_test.rb

@@ -6,224 +6,224 @@ class UserTest < ActiveSupport::TestCase
   should validate_presence_of :last_name
   should validate_presence_of :role_id
   should validate_presence_of :username
-  
+
   should belong_to :role
   should have_many :permission_users
   should have_many :permissions
-  
+
   context "With an existing user" do
     setup do
-      Factory(:normal_user)
+      create(:normal_user)
     end
-    
+
     should validate_uniqueness_of :email
     should validate_uniqueness_of :username
   end
-  
+
   context "A User class" do
     should "find a user by username or email" do
-      user_one = Factory(:normal_user, :username => 'test-user', :email => 'tester@example.com')
-      user_two = Factory(:normal_user, :username => 'test-user-2', :email => 'tester2@example.com')
-      
+      user_one = create(:normal_user, :username => 'test-user', :email => 'tester@example.com')
+      user_two = create(:normal_user, :username => 'test-user-2', :email => 'tester2@example.com')
+
       assert_equal user_one, User.find_for_session('test-user')
       assert_equal user_one, User.find_for_session('tester@example.com')
-      
+
       assert_equal user_two, User.find_for_session('test-user-2')
       assert_equal user_two, User.find_for_session('tester2@example.com')
-      
+
       assert_equal nil, User.find_for_session(' ')
       assert_equal nil, User.find_for_session('not-existing')
     end
-    
+
     should "have protected attributes" do
       assert Array === User.protected_attributes
-      
+
       assert_difference 'User.protected_attributes.size', 1 do
         User.protect_attributes :blah
       end
-    end    
+    end
   end
-  
+
   context "A user instance" do
     should "have a name attribute that returns the full name" do
       user = User.new
-      
+
       user.stubs(:first_name).returns('Cal')
       user.stubs(:last_name).returns('Ripken')
 
       assert_equal "Cal Ripken", user.name
       assert_equal "Cal R.", user.small_name
     end
-    
+
     should "have a default_path where this user will be sent upon login" do
-      role = Role.new      
+      role = Role.new
       role.stubs(:default_path).returns('/role-path')
-      
+
       user = User.new
-      
+
       user.stubs(:role).returns(role)
       assert_equal '/role-path', user.default_path
-      
+
       user.stubs(:role).returns(nil)
       assert_equal '/', user.default_path
     end
-    
+
     should "have an active? user flag" do
       user = User.new
-      
-      user.active = true      
+
+      user.active = true
       assert_equal true, user.active
       assert_equal true, user.active?
       assert_equal true, user.valid_session?
-      
+
       user.active = false
       assert_equal false, user.active
       assert_equal false, user.active?
       assert_equal false, user.valid_session?
     end
-    
+
     should "not allow updating of certain protected attributes" do
-      user = Factory(:user, :first_name => 'Old', :last_name => 'Nombre')
-      
+      user = create(:user, :first_name => 'Old', :last_name => 'Nombre')
+
       assert_equal false, user.new_record?
-      
+
       assert_equal 0, user.created_by
       assert_equal 1, user.role_id
       assert_equal 'Old Nombre', user.name
-      
+
       user.update_account_attributes({
         :created_by => 1,
         :first_name => 'New',
         :last_name => 'Name',
         :role_id => 5
       })
-      
+
       assert_equal 0, user.created_by
       assert_equal 1, user.role_id
       assert_equal 'New Name', user.name
-    end 
-    
+    end
+
     should "create a user with password and authenticate them" do
-      user = Factory.build(:user)
-      
+      user = build(:user)
+
       user.password = 'abc123'
-      user.password_confirmation = 'abc123'      
+      user.password_confirmation = 'abc123'
       assert_equal 'abc123', user.password
-      
+
       assert user.save
-      
+
       assert_equal true, user.authenticate('abc123')
       assert_equal true, user.authenticate(:password, 'abc123')
       assert_equal false, user.authenticate('test123')
-    end 
-    
+    end
+
     should "be able to update a user without changing their password" do
-      user = Factory(:user)
-      
+      user = create(:user)
+
       assert_equal true, user.authenticate('abc123')
-      
+
       assert user.update_attributes(:first_name => 'New', :password => '', :password_confirmation => '')
-      
+
       assert_equal 'New', user.first_name
       assert_equal true, user.authenticate('abc123')
     end
-    
+
     should "validate a password" do
-      user = Factory.build(:user)
+      user = build(:user)
       assert_equal true, user.valid?
-      
+
       user.password = ''
-      user.password_confirmation = ''      
+      user.password_confirmation = ''
       assert_equal false, user.valid?
       assert user.errors.full_messages.include?("Password can't be blank")
-      
+
       user.password = 'abc'
       user.password_confirmation = 'abc'
       assert_equal false, user.valid?
       assert user.errors.full_messages.include?("Password is not a valid password. Please enter at least 4 letters or numbers.")
-      
+
       user.password = 'abc456'
       user.password_confirmation = 'abc123'
       assert_equal false, user.valid?
       assert user.errors.full_messages.include?("Password does not match the confirmation password.")
     end
-    
+
     should "get and set permission keys" do
-      %w( run pass throw block ).each { |p| Factory(:permission, :key => p) }
-      
-      user = Factory.build(:user)
-      
+      %w( run pass throw block ).each { |p| create(:permission, :key => p) }
+
+      user = build(:user)
+
       user.stubs(:role).returns(Role.new)
       user.role.stubs(:permission_keys).returns([])
-      
+
       user.save
-      
+
       assert_equal [], user.permission_keys
-      
-      user.permission_keys = %w( pass throw run )      
-      
+
+      user.permission_keys = %w( pass throw run )
+
       assert_difference 'PermissionUser.count', 3 do
         user.save
       end
-      
+
       assert_equal true, user.pass?
       assert_equal true, user.has(:pass)
       assert_equal true, user.permission?(:pass)
-      
+
       assert_equal true, user.run?
       assert_equal true, user.has(:run)
       assert_equal true, user.permission?(:run)
-      
+
       assert_equal false, user.fake?
       assert_equal false, user.has(:fake)
       assert_equal false, user.permission?(:fake)
-      
+
       assert_raises NoMethodError do
         user.does_not_exist
       end
-    end    
-    
+    end
+
     should "authenticate through various means by default" do
-      user = Factory(:user)
-      
+      user = create(:user)
+
       # By password
       assert_equal false, user.authenticate_with_password('test123')
       assert_equal false, user.authenticate(:password, 'test123')
       assert_equal false, user.authenticate('test123')
-      
+
       assert_equal true, user.authenticate_with_password('abc123')
       assert_equal true, user.authenticate(:password, 'abc123')
       assert_equal true, user.authenticate('abc123')
-      
+
       # By api key
       user.stubs(:api_key).returns('this-is-my-api-key')
-      
+
       assert_equal true, user.authenticate_with_api_key('this-is-my-api-key')
       assert_equal true, user.authenticate_with_api_key('this-is-my-api-key')
-      
+
       assert_equal false, user.authenticate_with_api_key('this-is-not-my-api-key')
       assert_equal false, user.authenticate_with_api_key('this-is-not-my-api-key')
-      
+
       # With an unknown authentication method
       assert_equal false, user.authenticate(:blah, 'sdsd', 'sdlsk')
     end
-    
+
     should "have successful and failed authentication methods" do
-      user = Factory(:user)
-      
+      user = create(:user)
+
       assert_nil user.last_session_ip
       assert_nil user.last_session_at
-      
+
       assert_difference 'user.session_count', 1 do
         user.successful_authentication!('192.168.0.1')
       end
-      
+
       assert_not_nil user.last_session_ip
       assert_not_nil user.last_session_at
-      
+
       assert_difference 'user.failed_auth_count', 1 do
         user.failed_authentication!
       end
-    end       
+    end
   end
 end