clearance 0.10.3.2 → 0.10.4

data/spec/spec_helper.rb

@@ -0,0 +1,65 @@
+ENV["RAILS_ENV"] ||= "test"
+
+PROJECT_ROOT = File.expand_path("../..", __FILE__)
+$LOAD_PATH << File.join(PROJECT_ROOT, "lib")
+
+require 'rails/all'
+Bundler.require
+
+require 'diesel/testing'
+require 'rails/test_help'
+require 'rspec/rails'
+
+require 'clearance'
+require 'clearance/shoulda_macros'
+
+Clearance.configure do |config|
+end
+
+class ApplicationController < ActionController::Base
+  include Clearance::Authentication
+end
+
+class User < ActiveRecord::Base
+  include Clearance::User
+end
+
+Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+
+RSpec.configure do |config|
+  config.mock_with :mocha
+  config.use_transactional_fixtures = true
+  config.backtrace_clean_patterns << %r{gems/}
+end
+
+# class ActiveSupport::TestCase
+#   def self.should_set_cookie(name, value, should_expire_at)
+#     description = "set a '#{name}' cookie to '#{value}'"
+#     if should_expire_at
+#       description << " expiring at #{should_expire_at}"
+#     else
+#       description << " with no expiration date (session cookie)"
+#     end
+#     should description do
+#       assert_equal value, cookies[name]
+#       # the following statement may be redundant with the preceding one, but can't hurt
+#       assert_equal value, @response.cookies[name]
+#       # cookies and @response[cookies] don't give us the expire time, so we need to fish it out 'manually'
+#       set_cookie_headers = @response.headers['Set-Cookie']
+#       assert_not_nil set_cookie_headers, "@response.headers['Set-Cookie'] must not be nil"
+#       set_cookie_headers = [set_cookie_headers] if set_cookie_headers.respond_to?(:to_str)
+#       regex = /^#{name}=#{value}(;|$)/
+#       assert_contains set_cookie_headers, regex
+#       cookie = set_cookie_headers.find {|h| h =~ regex}
+#       regex = /; expires=(.*?)(;|$)/
+#       if should_expire_at
+#         assert_contains cookie, regex, "cookie does not contain an 'expires=' attribute"
+#         cookie =~ regex
+#         expires_at = Time.parse($1)
+#         assert_in_delta should_expire_at, expires_at, 100 # number of seconds we don't expect the test suite to exceed
+#       else
+#         assert_does_not_contain cookie, regex, "cookie contains an 'expires=' attribute but it shouldn't"
+#       end
+#     end
+#   end
+# end

data/spec/support/authorization.rb

@@ -0,0 +1,18 @@
+module AuthorizationHelpers
+  def sign_in_as(user)
+    @controller.current_user = user
+    return user
+  end
+
+  def sign_in
+    sign_in_as Factory(:email_confirmed_user)
+  end
+
+  def sign_out
+    @controller.current_user = nil
+  end
+end
+
+RSpec.configure do |config|
+  config.include AuthorizationHelpers
+end

data/spec/support/clearance_redirects.rb

@@ -0,0 +1,21 @@
+module ClearanceRedirectMatchers
+  def redirect_to_url_after_create
+    redirect_to(@controller.send(:url_after_create))
+  end
+
+  def redirect_to_url_after_update
+    redirect_to(@controller.send(:url_after_update))
+  end
+
+  def redirect_to_url_after_destroy
+    redirect_to(@controller.send(:url_after_destroy))
+  end
+
+  def redirect_to_url_already_confirmed
+    redirect_to(@controller.send(:url_already_confirmed))
+  end
+end
+
+RSpec.configure do |config|
+  config.include ClearanceRedirectMatchers
+end

data/spec/support/cookies.rb

@@ -0,0 +1,72 @@
+RSpec::Matchers.define :set_cookie do |name, value, expected_expires_at|
+  match do |subject|
+    @response            = subject.response
+    @name                = name
+    @value               = value
+    @expected_expires_at = expected_expires_at
+
+    extract_cookies
+    find_expected_cookie
+    parse_expiration
+
+    ensure_cookie_set
+    ensure_value_correct
+    ensure_expiration_correct
+  end
+
+  def extract_cookies
+    @cookie_headers = @response.headers['Set-Cookie'] || []
+    @cookie_headers = [@cookie_headers] if @cookie_headers.respond_to?(:to_str)
+  end
+
+  def find_expected_cookie
+    @cookie = @cookie_headers.detect do |header|
+      header =~ /^#{@name}=[^;]*(;|$)/
+    end
+  end
+
+  def parse_expiration
+    if @cookie && result = @cookie.match(/; expires=(.*?)(;|$)/)
+      @expires_at = Time.parse(result[1])
+    end
+  end
+
+  def ensure_cookie_set
+    @cookie.should_not be_nil
+  end
+
+  def ensure_value_correct
+    @response.cookies[@name].should == @value
+  end
+
+  def ensure_expiration_correct
+    if @expected_expires_at
+      @expires_at.should_not be_nil
+      @expires_at.should be_within(100).of(@expected_expires_at)
+    else
+      @expires_at.should be_nil
+    end
+  end
+
+  failure_message do
+    "Expected #{expectation} got #{result}"
+  end
+
+  def expectation
+    base = "Expected a cookie named #{@name} with value #{@value.inspect} "
+    if @expected_expires_at
+      base << "expiring at #{@expected_expires_at.inspect}"
+    else
+      base << "with no expiration"
+    end
+    base
+  end
+
+  def result
+    if @cookie
+      "value #{@value.inspect} expiring #{@expires_at.inspect}"
+    else
+      "cookies #{@response.cookies.inspect}"
+    end
+  end
+end

metadata

@@ -1,14 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: clearance
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 10
-  - 3
-  - 2
-  version: 0.10.3.2
+  - 4
+  version: 0.10.4
 platform: ruby
 authors: 
 - Dan Croak
@@ -33,7 +31,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-06 00:00:00 -05:00
+date: 2011-04-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,7 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
@@ -60,7 +57,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 0
         - 1
@@ -76,7 +72,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 1
         - 3
@@ -92,7 +87,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
         segments: 
         - 0
         - 10
@@ -112,6 +106,7 @@ extra_rdoc_files:
 files: 
 - .bundle/config
 - .gitignore
+- .rspec
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -160,13 +155,16 @@ files:
 - lib/generators/clearance/install/templates/db/migrate/upgrade_clearance_to_diesel.rb
 - lib/generators/clearance/install/templates/user.rb
 - lib/generators/clearance/views/views_generator.rb
-- test/controllers/passwords_controller_test.rb
-- test/controllers/sessions_controller_test.rb
-- test/controllers/users_controller_test.rb
-- test/factories.rb
-- test/models/clearance_mailer_test.rb
-- test/models/user_test.rb
-- test/test_helper.rb
+- spec/controllers/passwords_controller_spec.rb
+- spec/controllers/sessions_controller_spec.rb
+- spec/controllers/users_controller_spec.rb
+- spec/factories.rb
+- spec/models/clearance_mailer_spec.rb
+- spec/models/user_spec.rb
+- spec/spec_helper.rb
+- spec/support/authorization.rb
+- spec/support/clearance_redirects.rb
+- spec/support/cookies.rb
 has_rdoc: true
 homepage: http://github.com/thoughtbot/clearance
 licenses: []
@@ -181,7 +179,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -190,14 +187,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rails authentication with email & password.
@@ -212,10 +208,3 @@ test_files:
 - features/step_definitions/web_steps.rb
 - features/support/env.rb
 - features/support/paths.rb
-- test/controllers/passwords_controller_test.rb
-- test/controllers/sessions_controller_test.rb
-- test/controllers/users_controller_test.rb
-- test/factories.rb
-- test/models/clearance_mailer_test.rb
-- test/models/user_test.rb
-- test/test_helper.rb

data/test/controllers/passwords_controller_test.rb

@@ -1,198 +0,0 @@
-require 'test_helper'
-
-class PasswordsControllerTest < ActionController::TestCase
-
-  tests Clearance::PasswordsController
-
-  should route(:get, '/users/1/password/edit').
-           to(:controller => 'clearance/passwords', :action  => 'edit', :user_id => '1')
-
-  context "a signed up user" do
-    setup do
-      @user = Factory(:user)
-    end
-
-    context "on GET to #new" do
-      setup { get :new, :user_id => @user.to_param }
-
-      should respond_with(:success)
-      should render_template(:new)
-    end
-
-    context "on POST to #create" do
-      context "with correct email address" do
-        setup do
-          ActionMailer::Base.deliveries.clear
-          post :create, :password => { :email => @user.email }
-        end
-
-        should "generate a token for the change your password email" do
-          assert_not_nil @user.reload.confirmation_token
-        end
-
-        should have_sent_email.with_subject(/change your password/i)
-
-        should set_the_flash.to(/password/i)
-        should_redirect_to_url_after_create
-      end
-
-      context "with incorrect email address" do
-        setup do
-          email = "user1@example.com"
-          assert ! ::User.exists?(['email = ?', email])
-          ActionMailer::Base.deliveries.clear
-          assert_equal @user.confirmation_token,
-                       @user.reload.confirmation_token
-
-          post :create, :password => { :email => email }
-        end
-
-        should "not generate a token for the change your password email" do
-          assert_equal @user.confirmation_token,
-                       @user.reload.confirmation_token
-        end
-
-        should "not send a password reminder email" do
-          assert ActionMailer::Base.deliveries.empty?
-        end
-
-        should "set the failure flash to Unknown email" do
-          assert_match /unknown email/i, flash.now[:failure]
-        end
-
-        should render_template(:new)
-      end
-    end
-  end
-
-  context "a signed up user and forgotten password" do
-    setup do
-      @user = Factory(:user)
-      @user.forgot_password!
-    end
-
-    context "on GET to #edit with correct id and token" do
-      setup do
-        get :edit, :user_id => @user.to_param,
-                   :token   => @user.confirmation_token
-      end
-
-      should "find the user" do
-        assert_equal @user, assigns(:user)
-      end
-
-      should respond_with(:success)
-      should render_template(:edit)
-    end
-
-    # here to see deprecation warning
-    should_forbid "on GET to #edit with correct id but blank token" do
-      get :edit, :user_id => @user.to_param, :token => ""
-    end
-
-    context "on GET to #edit with correct id but blank token" do
-      setup do
-        get :edit, :user_id => @user.to_param, :token => ""
-      end
-
-      should set_the_flash.to(/double check the URL/i)
-      should render_template(:new)
-    end
-
-    should_forbid "on GET to #edit with correct id but no token" do
-      get :edit, :user_id => @user.to_param
-    end
-
-    context "on GET to #edit with correct id but no token" do
-      setup do
-        get :edit, :user_id => @user.to_param
-      end
-
-      should set_the_flash.to(/double check the URL/i)
-      should render_template(:new)
-    end
-
-    context "on PUT to #update with matching password and password confirmation" do
-      setup do
-        new_password = "new_password"
-        @encrypted_new_password = @user.send(:encrypt, new_password)
-        assert_not_equal @encrypted_new_password, @user.encrypted_password
-
-        put(:update,
-            :user_id  => @user,
-            :token    => @user.confirmation_token,
-            :user     => {
-              :password              => new_password,
-              :password_confirmation => new_password
-            })
-        @user.reload
-      end
-
-      should "update password" do
-        assert_equal @encrypted_new_password,
-                     @user.encrypted_password
-      end
-
-      should "clear confirmation token" do
-        assert_nil @user.confirmation_token
-      end
-
-      should "set remember token" do
-        assert_not_nil @user.remember_token
-      end
-
-      should set_the_flash.to(/signed in/i)
-      should_redirect_to_url_after_update
-    end
-
-    context "on PUT to #update with password but blank password confirmation" do
-      setup do
-        new_password = "new_password"
-        @encrypted_new_password = @user.send(:encrypt, new_password)
-
-        put(:update,
-            :user_id => @user.to_param,
-            :token   => @user.confirmation_token,
-            :user    => {
-              :password => new_password,
-              :password_confirmation => ''
-            })
-        @user.reload
-      end
-
-      should "not update password" do
-        assert_not_equal @encrypted_new_password,
-                         @user.encrypted_password
-      end
-
-      should "not clear token" do
-        assert_not_nil @user.confirmation_token
-      end
-
-      should "not be signed in" do
-        assert_nil cookies[:remember_token]
-      end
-
-      should_not set_the_flash
-      should respond_with(:success)
-      should render_template(:edit)
-    end
-
-    should_forbid "on PUT to #update with id but no token" do
-      put :update, :user_id => @user.to_param, :token => ""
-    end
-  end
-
-  context "given two users and user one signs in" do
-    setup do
-      @user_one = Factory(:user)
-      @user_two = Factory(:user)
-      sign_in_as @user_one
-    end
-
-    should_forbid "when user one tries to change user two's password on GET with no token" do
-      get :edit, :user_id => @user_two.to_param
-    end
-  end
-
-end