thoughtbot-clearance 0.3.7 → 0.3.8

data/lib/clearance/test/functional/sessions_controller_test.rb

@@ -13,24 +13,32 @@ module Clearance
               should_respond_with :success
               should_render_template :new
               should_not_set_the_flash
-              should_have_form :action => "session_path",
-                :fields => { "session[email]" => :text,
-                  "session[password]" => :password,
-                  "session[remember_me]" => :checkbox }
+              should 'display a "sign in" form' do
+                assert_select "form[action=#{session_path}][method=post]", 
+                  true, "There must be a form to log in" do
+                    assert_select "input[type=text][name=?]", 
+                      "session[email]", true, "There must be an email field"
+                    assert_select "input[type=password][name=?]", 
+                      "session[password]", true, "There must be a password field"
+                    assert_select "input[type=checkbox][name=?]", 
+                      "session[remember_me]", true, "There must be a 'remember me' check box"
+                    assert_select "input[type=submit]", true, 
+                      "There must be a submit button"
+                end                
+              end
             end
 
             context "Given an unconfirmed user" do
               setup do
-                @user = Factory(:user, :confirmed => false)
+                @user = Factory(:clearance_user, :confirmed => false)
               end
 
               context "a POST to #create with good credentials" do
                 setup do
                   ActionMailer::Base.deliveries.clear
                   post :create, :session => {
-                                  :email => @user.email,
-                                  :password => @user.password
-                  }
+                                  :email    => @user.email,
+                                  :password => @user.password }
                 end
 
                 should_deny_access(:flash => /confirm/i)
@@ -43,12 +51,13 @@ module Clearance
             end
 
             context "Given a confirmed user" do
-              setup { @user = Factory(:user, :confirmed => true) }
+              setup { @user = Factory(:clearance_user, :confirmed => true) }
 
               context "a POST to #create with good credentials" do
                 setup do
-                  post :create, :session => { :email => @user.email, 
-                    :password => @user.password }
+                  post :create, :session => { 
+                                  :email    => @user.email, 
+                                  :password => @user.password }
                 end
 
                 should_set_the_flash_to /success/i
@@ -58,8 +67,9 @@ module Clearance
 
               context "a POST to #create with bad credentials" do
                 setup do
-                  post :create, :session => { :email => @user.email, 
-                    :password => "bad value" }
+                  post :create, :session => { 
+                                  :email    => @user.email, 
+                                  :password => "bad value" }
                 end
 
                 should_set_the_flash_to /bad/i
@@ -69,8 +79,10 @@ module Clearance
           
               context "a POST to #create with good credentials and remember me" do
                 setup do
-                  post :create, :session => { :email => @user.email, 
-                    :password => @user.password, :remember_me => '1' }
+                  post :create, :session => { 
+                                  :email       => @user.email, 
+                                  :password    => @user.password, 
+                                  :remember_me => '1' }
                 end
 
                 should_set_the_flash_to /success/i
@@ -89,8 +101,10 @@ module Clearance
               
               context "a POST to #create with bad credentials and remember me" do
                 setup do
-                  post :create, :session => { :email => @user.email, 
-                    :password => "bad value", :remember_me => '1' }
+                  post :create, :session => { 
+                                  :email       => @user.email, 
+                                  :password    => "bad value", 
+                                  :remember_me => '1' }
                 end
 
                 should_set_the_flash_to /bad/i
@@ -106,6 +120,42 @@ module Clearance
                   assert_nil @user.reload.remember_token_expires_at
                 end
               end
+              
+              context "a POST to #create with good credentials and A URL to return back" do
+                context "in the session" do
+                  setup do
+                    @request.session[:return_to] = '/url_in_the_session'
+                    post :create, :session => { 
+                                    :email    => @user.email, 
+                                    :password => @user.password }                    
+                  end
+                  
+                  should_redirect_to "'/url_in_the_session'"
+                end
+                
+                context "in the request" do
+                  setup do
+                    post :create, :session => { 
+                                    :email => @user.email, 
+                                    :password => @user.password },
+                                   :return_to => '/url_in_the_request'                    
+                  end
+                  
+                  should_redirect_to "'/url_in_the_request'"
+                end   
+                             
+                context "in the request and in the session" do
+                  setup do
+                    @request.session[:return_to] = '/url_in_the_session'
+                    post :create, :session => { 
+                                    :email    => @user.email, 
+                                    :password => @user.password },
+                                  :return_to => '/url_in_the_request'                    
+                  end
+                  
+                  should_redirect_to "'/url_in_the_session'"
+                end
+              end              
             end
 
             public_context do

data/lib/clearance/test/functional/users_controller_test.rb

@@ -12,12 +12,20 @@ module Clearance
                 should_respond_with :success
                 should_render_template :new
                 should_not_set_the_flash
-                should_have_form :action => "users_path",
-                  :method => :post,
-                  :fields => { :email => :text,
-                    :password => :password,
-                    :password_confirmation => :password }
-
+                should "display a form to register" do
+                 assert_select "form[action=#{users_path}][method=post]", 
+                  true, "There must be a form to register" do
+                    assert_select "input[type=text][name=?]", 
+                      "user[email]", true, "There must be an email field"
+                    assert_select "input[type=password][name=?]", 
+                      "user[password]", true, "There must be a password field"
+                    assert_select "input[type=password][name=?]", 
+                      "user[password_confirmation]", true, "There must be a password confirmation field"                      
+                    assert_select "input[type=submit]", true, 
+                      "There must be a submit button"
+                 end
+                end
+                
                 context "with params" do
                   setup do
                     @email = 'a@example.com'
@@ -33,7 +41,7 @@ module Clearance
 
               context "on POST to /users" do
                 setup do
-                  post :create, :user => Factory.build(:user).attributes.merge(
+                  post :create, :user => Factory.build(:clearance_user).attributes.merge(
                                             {:password => 'skerit',
                                               :password_confirmation => 'skerit'})
                 end

data/lib/clearance/test/test_helper.rb

@@ -2,90 +2,19 @@ module Clearance
   module Test
     module TestHelper
     
-      def self.included(base)
-        base.class_eval do
-          include InstanceMethods
-          extend ClassMethods
-        end
-      end
-
-      module InstanceMethods
-        def login_as(user = nil)
-          user ||= Factory(:user)
-          @request.session[:user_id] = user.id
-          return user
-        end
-
-        def logout 
-          @request.session[:user_id] = nil
-        end
-      end
-    
-      module ClassMethods
-        def should_deny_access_on(command, opts = {})
-
-          context "on #{command}" do
-            setup { eval command }
-            should_deny_access(opts)
+      def self.included(test_helper)
+        test_helper.class_eval do
+          
+          def login_as(user = nil)
+            user ||= Factory(:clearance_user)
+            @request.session[:user_id] = user.id
+            return user
           end
-        end
 
-        def should_deny_access(opts = {})
-          opts[:redirect] ||= "new_session_path"
-          should_redirect_to opts[:redirect]
-          if opts[:flash]
-            should_set_the_flash_to opts[:flash]
-          else
-            should_not_set_the_flash
-          end
-        end
-      
-        # should_have_form :action => 'admin_users_path',
-        #   :method => :get, 
-        #   :fields => { 'email' => :text }
-        # TODO: http_method should be pulled out
-        def should_have_form(opts)
-          model = self.name.gsub(/ControllerTest$/, '').singularize.downcase
-          model = model[model.rindex('::')+2..model.size] if model.include?('::')
-          http_method, hidden_http_method = form_http_method opts[:method]
-          should "have a #{model} form" do
-            assert_select "form[action=?][method=#{http_method}]", eval(opts[:action]) do
-              if hidden_http_method
-                assert_select "input[type=hidden][name=_method][value=#{hidden_http_method}]"
-              end
-              opts[:fields].each do |attribute, type|
-                attribute = attribute.is_a?(Symbol) ? "#{model}[#{attribute.to_s}]" : attribute
-                assert_select "input[type=#{type.to_s}][name=?]", attribute
-              end
-              assert_select "input[type=submit]"
-            end
-          end
-        end
-      
-        def form_http_method(http_method)
-          http_method = http_method.nil? ? 'post' : http_method.to_s
-          if http_method == "post" || http_method == "get"
-            return http_method, nil
-          else
-            return "post", http_method
-          end
-        end
-      
-        def logged_in_user_context(&blk)
-          context "A logged in user" do
-            setup do
-              @user = Factory :user
-              login_as @user
-            end
-            merge_block(&blk)
-          end
-        end
-      
-        def public_context(&blk)
-          context "The public" do
-            setup { logout }
-            merge_block(&blk)
+          def logout 
+            @request.session[:user_id] = nil
           end
+          
         end
       end
  

data/lib/clearance/test/unit/clearance_mailer_test.rb

@@ -7,7 +7,7 @@ module Clearance
           base.class_eval do
             context "A change password email" do
               setup do
-                @user = Factory :user
+                @user = Factory :clearance_user
                 @email = ClearanceMailer.create_change_password @user
               end
 
@@ -25,14 +25,14 @@ module Clearance
                 assert_equal [@user.email], @email.to
               end
 
-              should "have a subject of '[PROJECT_NAME] Change your password'" do
-                assert_equal @email.subject, "[#{PROJECT_NAME.humanize}] Change your password"
+              should "set its subject" do
+                assert_match /Change your password/, @email.subject
               end
             end
             
             context "A confirmation email" do
               setup do
-                @user = Factory :user
+                @user = Factory :clearance_user
                 @email = ClearanceMailer.create_confirmation @user
               end
 
@@ -41,7 +41,7 @@ module Clearance
               end
 
               should 'set its subject' do
-                assert_equal "[#{PROJECT_NAME.humanize}] Account confirmation", @email.subject
+                assert_match /Account confirmation/, @email.subject
               end
 
               should 'set its from address to DO_NOT_REPLY' do

data/lib/clearance/test/unit/user_test.rb

@@ -5,24 +5,24 @@ module Clearance
     
         def self.included(base)
           base.class_eval do
-            should_require_attributes :email, :password
-            should_allow_values_for :email, 'foo@example.com'
+            should_require_attributes   :email, :password
+            should_allow_values_for     :email, 'foo@example.com'
             should_not_allow_values_for :email, 'foo'
             should_not_allow_values_for :email, 'example.com'
 
             should "require password validation on create" do
-              user = Factory.build(:user, :password => 'blah', :password_confirmation => 'boogidy')
+              user = Factory.build(:clearance_user, :password => 'blah', :password_confirmation => 'boogidy')
               assert !user.save
               assert_match(/confirmation/i, user.errors.on(:password))
             end
 
             should "create a crypted_password on save" do
-              assert_not_nil Factory(:user, :crypted_password => nil).crypted_password
+              assert_not_nil Factory(:clearance_user, :crypted_password => nil).crypted_password
             end
 
             context 'updating a password' do
               setup do
-                @user = Factory(:user)
+                @user = Factory(:clearance_user)
                 assert_not_nil @user.crypted_password
                 @crypt = @user.crypted_password
                 assert_not_nil @user.salt
@@ -42,69 +42,52 @@ module Clearance
               setup do
                 @salt = 'salt'
                 User.any_instance.stubs(:initialize_salt)
-                @user = Factory :user, :salt => @salt
+                
+                @user     = Factory(:clearance_user, :salt => @salt)
                 @password = @user.password
               end
           
               should "require password validation on update" do
-                @user.update_attributes(:password => "blah", :password_confirmation => "boogidy")
+                @user.update_attributes :password => "blah", 
+                  :password_confirmation => "boogidy"
                 assert !@user.save
                 assert_match(/confirmation/i, @user.errors.on(:password))
               end
           
               should_require_unique_attributes :email
-          
-              context 'authenticating a user' do
-                context 'with good credentials' do
-                  setup do
-                    @result = User.authenticate @user.email, @password
-                  end
-
-                  should 'return true' do
-                    assert @result
-                  end
-                end
-
-                context 'with bad credentials' do
-                  setup do
-                    @result = User.authenticate @user.email, 'horribly_wrong_password'
-                  end
-
-                  should 'return false' do
-                    assert !@result
-                  end
-                end
+              
+              should 'store email in lower case' do
+                @user.update_attributes(:email => 'John.Doe@example.com')
+                assert_equal 'john.doe@example.com', @user.email
               end
-          
-              context 'authenticated?' do
-                context 'with good credentials' do
-                  setup do
-                    @result = @user.authenticated? @password
-                  end
-
-                  should 'return true' do
-                    assert @result
-                  end
-                end
-
-                context 'with bad credentials' do
-                  setup do
-                    @result = @user.authenticated? 'horribly_wrong_password'
-                  end
-
-                  should 'return false' do
-                    assert !@result
-                  end
-                end
+              
+              should "authenticate with good credentials" do
+                assert User.authenticate(@user.email, @password)
+              end
+              
+              should "authenticate with good credentials, email in uppercase" do
+                assert User.authenticate(@user.email.upcase, @password)
+              end
+              
+              should "not authenticate with bad credentials" do
+                assert ! User.authenticate(@user.email, 'horribly_wrong_password')
+              end
+              
+              should "be authenticated with a good password" do
+                assert @user.authenticated?(@password)
+              end
+              
+              should "not be authenticated with a bad password" do
+                assert ! @user.authenticated?('horribly_wrong_password')
               end
 
               context 'encrypt' do
                 setup do
                   @crypted  = @user.encrypt(@password)
-                  @expected = Digest::SHA1.hexdigest("--#{@salt}--#{@password}--")
+                  @expected = Digest::SHA512.hexdigest("--#{@salt}--#{@password}--")
                 end
 
-                should 'create a Hash using SHA1 encryption' do
+                should 'create a Hash using SHA512 encryption' do
                   assert_equal @expected, @crypted
                   assert_not_equal @password, @crypted
                 end
@@ -127,9 +110,7 @@ module Clearance
                 end
 
                 context 'forget_me!' do
-                  setup do
-                    @user.forget_me!
-                  end
+                  setup { @user.forget_me! }
 
                   should 'unset the remember token and expiration date' do
                     assert_nil @user.remember_token
@@ -145,7 +126,8 @@ module Clearance
               context 'remember_token?' do
                 context 'when token expires in the future' do
                   setup do
-                    @user.update_attribute :remember_token_expires_at, 2.weeks.from_now.utc
+                    @user.update_attribute :remember_token_expires_at, 
+                      2.weeks.from_now.utc
                   end
 
                   should 'be true' do
@@ -155,7 +137,8 @@ module Clearance
 
                 context 'when token expired' do
                   setup do
-                    @user.update_attribute :remember_token_expires_at, 2.weeks.ago.utc
+                    @user.update_attribute :remember_token_expires_at, 
+                      2.weeks.ago.utc
                   end
 
                   should 'be false' do
@@ -166,7 +149,7 @@ module Clearance
 
               context "User.authenticate with a valid email and password" do
                 setup do
-                  @found_user = User.authenticate @user.email, @user.password
+                  @found_user = User.authenticate(@user.email, @user.password)
                 end
 
                 should "find that user" do
@@ -176,7 +159,7 @@ module Clearance
 
               context "When sent authenticate with an invalid email and password" do
                 setup do
-                  @found_user = User.authenticate "not", "valid" 
+                  @found_user = User.authenticate("not", "valid")
                 end
 
                 should "find nothing" do
@@ -187,7 +170,7 @@ module Clearance
 
             context "A user" do
               setup do
-                @user = Factory :user
+                @user = Factory(:clearance_user)
               end
 
               context 'when sent #confirm!' do