clearance 0.11.2 → 0.12.0

data/Appraisals

@@ -8,4 +8,5 @@ appraise "3.1.0.rc4" do
   gem 'coffee-script'
   gem 'uglifier'
   gem 'jquery-rails'
+  gem 'turn'
 end

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+0.12.0
+-------------------
+
+* [#129] Denying access redirects to root_url when signed in, sign_in_url when signed out. (Dan Croak)
+* New configuration setting: denied_access_url. (Dan Croak)
+* Using flash :notice key everywhere now instead of :success and :failure. More in line with Rails conventions. (Dan Croak)
+* [#149] redirect_back_or on sign up. (Dan Croak)
+* [#147] Resetting password no longer redirects to sign in page. It displays a message telling them to look for an email. (Dan Croak)
+* Removed redundant flash messages. ("Signed in.", "Signed out.", and "You are now signed up.") (Dan Croak)
+
 0.11.2
 -------------------
 

data/README.md

@@ -62,6 +62,8 @@ the current_user method.
 Customizing
 -----------
 
+Clearance is intended to be small, simple, well-tested, and easy to extend.
+
 If you ever need to change the logic in any of the four provided controllers,
 subclass the Clearance controller. You don't need to do this by default.
 
@@ -115,17 +117,33 @@ Clearance comes with test matchers that are compatible with RSpec and Test::Unit
 
 To use them, require the test matchers. For example, in spec/support/clearance.rb:
 
-    require 'clearance/shoulda_matchers'
+    require 'clearance/testing'
 
-Extensions
-----------
+You'll then have access to methods like:
 
-Clearance is intended to be small, simple, well-tested, and easy to extend.
-Check out some of the ways people have extended Clearance:
+    sign_in
+    sign_in_as(user)
+    sign_out
+
+And matchers like:
+
+    deny_access
+
+Example:
 
-* [Clearance HTTP Auth](https://github.com/karmi/clearance_http_auth)
-* [Clearance Twitter](https://github.com/thoughtbot/clearance-twitter)
-* [Clearance Admin](https://github.com/xenda/clearance-admin)
+    context "a visitor" do
+      before { get :show }
+      it     { should deny_access }
+    end
+
+    context "a user" do
+      before do
+        sign_in
+        get :show
+      end
+
+      it { should respond_with(:success) }
+    end
 
 Credits
 -------

data/VERSION

@@ -1 +1 @@
-0.11.2
+0.12.0

data/app/controllers/clearance/passwords_controller.rb

@@ -13,8 +13,7 @@ class Clearance::PasswordsController < ApplicationController
     if user = ::User.find_by_email(params[:password][:email])
       user.forgot_password!
       ::ClearanceMailer.change_password(user).deliver
-      flash_notice_after_create
-      redirect_to(url_after_create)
+      render :template => 'passwords/create'
     else
       flash_failure_after_create
       render :template => 'passwords/new'
@@ -33,7 +32,6 @@ class Clearance::PasswordsController < ApplicationController
 
     if @user.update_password(params[:user][:password])
       sign_in(@user)
-      flash_success_after_update
       redirect_to(url_after_update)
     else
       flash_failure_after_update
@@ -59,30 +57,19 @@ class Clearance::PasswordsController < ApplicationController
   end
 
   def flash_failure_when_forbidden
-    flash.now[:failure] = translate(:forbidden,
+    flash.now[:notice] = translate(:forbidden,
       :scope   => [:clearance, :controllers, :passwords],
       :default => "Please double check the URL or try submitting the form again.")
   end
 
-  def flash_notice_after_create
-    flash[:notice] = translate(:deliver_change_password,
-      :scope   => [:clearance, :controllers, :passwords],
-      :default => "You will receive an email within the next few minutes. " <<
-                  "It contains instructions for changing your password.")
-  end
-
   def flash_failure_after_create
-    flash.now[:failure] = translate(:unknown_email,
+    flash.now[:notice] = translate(:unknown_email,
       :scope   => [:clearance, :controllers, :passwords],
       :default => "Unknown email.")
   end
 
-  def flash_success_after_update
-    flash[:success] = translate(:signed_in, :default => "Signed in.")
-  end
-
   def flash_failure_after_update
-    flash.now[:failure] = translate(:blank_password,
+    flash.now[:notice] = translate(:blank_password,
       :scope   => [:clearance, :controllers, :passwords],
       :default => "Password can't be blank.")
   end

data/app/controllers/clearance/sessions_controller.rb

@@ -15,37 +15,27 @@ class Clearance::SessionsController < ApplicationController
       render :template => 'sessions/new', :status => :unauthorized
     else
       sign_in(@user)
-      flash_success_after_create
       redirect_back_or(url_after_create)
     end
   end
 
   def destroy
     sign_out
-    flash_success_after_destroy
     redirect_to(url_after_destroy)
   end
 
   private
 
   def flash_failure_after_create
-    flash.now[:failure] = translate(:bad_email_or_password,
+    flash.now[:notice] = translate(:bad_email_or_password,
       :scope   => [:clearance, :controllers, :sessions],
       :default => "Bad email or password.")
   end
 
-  def flash_success_after_create
-    flash[:success] = translate(:signed_in, :default =>  "Signed in.")
-  end
-
   def url_after_create
     '/'
   end
 
-  def flash_success_after_destroy
-    flash[:success] = translate(:signed_out, :default =>  "Signed out.")
-  end
-
   def url_after_destroy
     sign_in_url
   end

data/app/controllers/clearance/users_controller.rb

@@ -13,8 +13,7 @@ class Clearance::UsersController < ApplicationController
     @user = ::User.new(params[:user])
     if @user.save
       sign_in(@user)
-      flash_notice_after_create
-      redirect_to(url_after_create)
+      redirect_back_or(url_after_create)
     else
       flash_failure_after_create
       render :template => 'users/new'
@@ -23,14 +22,8 @@ class Clearance::UsersController < ApplicationController
 
   private
 
-  def flash_notice_after_create
-    flash[:notice] = translate(:signed_up,
-      :scope   => [:clearance, :controllers, :users],
-      :default => "You are now signed up.")
-  end
-
   def flash_failure_after_create
-    flash.now[:failure] = translate(:bad_email_or_password,
+    flash.now[:notice] = translate(:bad_email_or_password,
       :scope   => [:clearance, :controllers, :passwords],
       :default => "Must be a valid email address. Password can't be blank.")
   end

data/app/views/passwords/create.html.erb

@@ -0,0 +1,4 @@
+<p>
+  You will receive an email within the next few minutes.
+  It contains instructions for changing your password.
+</p>

data/features/engine/visitor_signs_in.feature

@@ -25,12 +25,10 @@ Feature: Sign in
     When I go to the sign in page
     Then I should see an email field
     And I sign in as "email@example.com"
-    Then I should see "Signed in"
-    And I should be signed in
+    Then I should be signed in
 
  Scenario: Visitor signs in successfully with uppercase email
     Given I am signed up as "email@example.com"
     When I go to the sign in page
     And I sign in as "Email@example.com"
-    Then I should see "Signed in"
-    And I should be signed in
+    Then I should be signed in

data/features/engine/visitor_signs_out.feature

@@ -9,5 +9,4 @@ Feature: Sign out
     When I sign in as "email@example.com"
     Then I should be signed in
     And I sign out
-    Then I should see "Signed out"
-    And I should be signed out
+    Then I should be signed out

data/features/engine/visitor_signs_up.feature

@@ -24,5 +24,4 @@ Feature: Sign up
     When I fill in "Email" with "email@example.com"
     And I fill in "Password" with "password"
     And I press "Sign up"
-    Then I should see "signed up"
-    And I should be on the home page
+    Then I should be on the home page

data/gemfiles/3.0.9.gemfile

@@ -2,17 +2,17 @@
 
 source "http://rubygems.org"
 
-gem "rails", "3.0.9"
 gem "sqlite3"
-gem "diesel", :git=>"git://github.com/thoughtbot/diesel.git"
-gem "cucumber-rails", "1.0.0"
-gem "capybara", "1.0.0"
-gem "factory_girl_rails"
+gem "rails", "3.0.9"
 gem "shoulda-matchers", :git=>"git://github.com/thoughtbot/shoulda-matchers.git"
+gem "diesel", :git=>"git://github.com/thoughtbot/diesel.git"
 gem "database_cleaner"
 gem "rspec-rails", "~> 2.6.0"
-gem "launchy"
+gem "aruba", "~> 0.4.2"
+gem "cucumber-rails", "1.0.0"
 gem "mocha"
 gem "appraisal", :git=>"git://github.com/thoughtbot/appraisal.git"
-gem "aruba", "~> 0.4.2"
+gem "capybara", "1.0.0"
+gem "factory_girl_rails"
+gem "launchy"
 

data/gemfiles/3.1.0.rc4.gemfile

@@ -2,21 +2,22 @@
 
 source "http://rubygems.org"
 
-gem "rails", "3.1.0.rc4"
+gem "jquery-rails"
+gem "uglifier"
 gem "sqlite3"
-gem "diesel", :git=>"git://github.com/thoughtbot/diesel.git"
-gem "cucumber-rails", "1.0.0"
-gem "capybara", "1.0.0"
-gem "factory_girl_rails"
+gem "rails", "3.1.0.rc4"
+gem "sass-rails"
 gem "shoulda-matchers", :git=>"git://github.com/thoughtbot/shoulda-matchers.git"
+gem "coffee-script"
+gem "diesel", :git=>"git://github.com/thoughtbot/diesel.git"
 gem "database_cleaner"
 gem "rspec-rails", "~> 2.6.0"
-gem "launchy"
+gem "aruba", "~> 0.4.2"
+gem "cucumber-rails", "1.0.0"
 gem "mocha"
+gem "turn"
 gem "appraisal", :git=>"git://github.com/thoughtbot/appraisal.git"
-gem "aruba", "~> 0.4.2"
-gem "sass-rails"
-gem "coffee-script"
-gem "uglifier"
-gem "jquery-rails"
+gem "capybara", "1.0.0"
+gem "factory_girl_rails"
+gem "launchy"
 

data/gemfiles/3.1.0.rc4.gemfile.lock

@@ -53,6 +53,7 @@ GEM
       activesupport (= 3.1.0.rc4)
     activesupport (3.1.0.rc4)
       multi_json (~> 1.0)
+    ansi (1.2.5)
     arel (2.1.1)
     aruba (0.4.3)
       bcat (>= 0.6.1)
@@ -182,6 +183,8 @@ GEM
     tilt (1.3.2)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
+    turn (0.8.2)
+      ansi (>= 1.2.2)
     tzinfo (0.3.28)
     uglifier (0.5.4)
       execjs (>= 0.3.0)
@@ -209,4 +212,5 @@ DEPENDENCIES
   sass-rails
   shoulda-matchers!
   sqlite3
+  turn
   uglifier

data/lib/clearance/authentication.rb

@@ -7,7 +7,7 @@ module Clearance
       hide_action   :current_user, :current_user=,
                     :signed_in?,   :signed_out?,
                     :sign_in,      :sign_out,
-                    :authorize, :deny_access
+                    :authorize,    :deny_access
     end
 
     # User in the current cookie
@@ -90,8 +90,12 @@ module Clearance
     # @param [String] optional flash message to display to denied user
     def deny_access(flash_message = nil)
       store_location
-      flash[:failure] = flash_message if flash_message
-      redirect_to(sign_in_url)
+      flash[:notice] = flash_message if flash_message
+      if signed_in?
+        redirect_to(url_after_denied_access_when_signed_in)
+      else
+        redirect_to(url_after_denied_access_when_signed_out)
+      end
     end
 
     # CSRF protection in Rails >= 3.0.4
@@ -131,5 +135,13 @@ module Clearance
     def redirect_to_root
       redirect_to('/')
     end
+
+    def url_after_denied_access_when_signed_in
+      '/'
+    end
+
+    def url_after_denied_access_when_signed_out
+      sign_in_url
+    end
   end
 end

data/lib/clearance/testing.rb

@@ -0,0 +1,17 @@
+require 'clearance/testing/assertion_error'
+require 'clearance/testing/deny_access_matcher'
+require 'clearance/testing/helpers'
+
+if defined?(Test::Unit::TestCase)
+  Test::Unit::TestCase.extend Clearance::Testing::Matchers
+  class Test::Unit::TestCase
+    include Clearance::Testing::Helpers
+  end
+end
+
+if defined?(RSpec) && RSpec.respond_to?(:configure)
+  RSpec.configure do |config|
+    config.include Clearance::Testing::Matchers
+    config.include Clearance::Testing::Helpers
+  end
+end

data/lib/clearance/testing/assertion_error.rb

@@ -0,0 +1,11 @@
+module Clearance
+  module Testing
+    if RUBY_VERSION > "1.9"
+      require 'minitest/unit'
+      AssertionError = MiniTest::Assertion
+    else
+      require 'test/unit/assertionfailederror'
+      AssertionError = Test::Unit::AssertionFailedError
+    end
+  end
+end

data/lib/clearance/testing/deny_access_matcher.rb

@@ -0,0 +1,73 @@
+module Clearance
+  module Testing
+    module Matchers
+      # Ensures a controller denied access.
+      #
+      # @example
+      #   it { should deny_access  }
+      #   it { should deny_access(:flash => "Denied access.")  }
+      #   it { should deny_access(:redirect => sign_in_url)  }
+      def deny_access(opts = {})
+        DenyAccessMatcher.new(self, opts)
+      end
+
+      class DenyAccessMatcher
+        attr_reader :failure_message, :negative_failure_message
+
+        def initialize(context, opts)
+          @context = context
+          @flash   = opts[:flash]
+          @url     = opts[:redirect]
+
+          @failure_message          = ""
+          @negative_failure_message = ""
+        end
+
+        def matches?(controller)
+          @controller = controller
+          sets_the_flash? && redirects_to_url?
+        end
+
+        def description
+          "deny access"
+        end
+
+        private
+
+        def sets_the_flash?
+          if @flash.blank?
+            true
+          else
+            if @controller.flash[:notice].try(:values).try(:first) == @flash
+              @negative_failure_message << "Didn't expect to set the flash to #{@flash}"
+              true
+            else
+              @failure_message << "Expected the flash to be set to #{@flash} but was #{@controller.flash[:notice].try(:values).try(:first)}"
+              false
+            end
+          end
+        end
+
+        def redirects_to_url?
+          @url ||= denied_access_url
+          begin
+            @context.send(:assert_redirected_to, @url)
+            @negative_failure_message << "Didn't expect to redirect to #{@url}."
+            true
+          rescue Clearance::Testing::AssertionError
+            @failure_message << "Expected to redirect to #{@url} but did not."
+            false
+          end
+        end
+
+        def denied_access_url
+          if @controller.signed_in?
+            '/'
+          else
+            @controller.sign_in_url
+          end
+        end
+      end
+    end
+  end
+end

data/lib/clearance/testing/helpers.rb

@@ -0,0 +1,18 @@
+module Clearance
+  module Testing
+    module Helpers
+      def sign_in_as(user)
+        @controller.current_user = user
+        return user
+      end
+
+      def sign_in
+        sign_in_as Factory(:user)
+      end
+
+      def sign_out
+        @controller.current_user = nil
+      end
+    end
+  end
+end

data/spec/controllers/denies_controller_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+class DeniesController < ActionController::Base
+  include Clearance::Authentication
+  before_filter :authorize, :only => :show
+
+  def new
+    render :text => "New page"
+  end
+
+  def show
+    render :text => "Show page"
+  end
+
+  protected
+
+  def authorize
+    deny_access(:flash => "Access denied.")
+  end
+end
+
+describe DeniesController do
+  before do
+    Rails.application.routes.draw do
+      resource :deny, :only => [:new, :show]
+      match 'sign_in'  => 'clearance/sessions#new', :as => 'sign_in'
+    end
+  end
+
+  after do
+    Rails.application.reload_routes!
+  end
+
+  context "signed in user" do
+    before { sign_in }
+
+    it "allows access to new" do
+      get :new
+      subject.should_not deny_access
+    end
+
+    it "denies access to show" do
+      get :show
+      subject.should deny_access(:redirect => '/')
+    end
+  end
+
+  context "visitor" do
+    it "allows access to new" do
+      get :new
+      subject.should_not deny_access
+    end
+
+    it "denies access to show" do
+      get :show
+      subject.should deny_access
+      subject.should deny_access(:redirect => sign_in_url, :flash => "Access denied.")
+    end
+  end
+end

data/spec/controllers/forgeries_controller_spec.rb

@@ -36,14 +36,14 @@ describe ForgeriesController do
       subject.should redirect_to(:action => 'index')
     end
 
-    it "redirects to sign_in with invalid token" do
+    it "fails with invalid token" do
       post :create, :authenticity_token => "hax0r"
-      subject.should redirect_to(sign_in_url)
+      subject.should deny_access
     end
 
-    it "redirects to sign_in with no token" do
+    it "fails with no token" do
       post :create
-      subject.should redirect_to(sign_in_url)
+      subject.should deny_access
     end
   end
 end

data/spec/controllers/passwords_controller_spec.rb

@@ -31,8 +31,7 @@ describe Clearance::PasswordsController do
 
         it { should have_sent_email.with_subject(/change your password/i) }
 
-        it { should set_the_flash.to(/password/i) }
-        it { should redirect_to_url_after_create }
+        it { should respond_with(:success) }
       end
 
       describe "with incorrect email address" do
@@ -53,10 +52,7 @@ describe Clearance::PasswordsController do
           ActionMailer::Base.deliveries.should be_empty
         end
 
-        it "should set the failure flash to Unknown email" do
-          flash.now[:failure].should =~ /unknown email/i
-        end
-
+        it { should set_the_flash.to(/unknown email/i).now }
         it { should render_template(:new) }
       end
     end
@@ -127,7 +123,6 @@ describe Clearance::PasswordsController do
         @user.remember_token.should_not be_nil
       end
 
-      it { should set_the_flash.to(/signed in/i) }
       it { should redirect_to_url_after_update }
     end
 

data/spec/controllers/sessions_controller_spec.rb

@@ -18,7 +18,6 @@ describe Clearance::SessionsController do
                       :password => @user.password }
     end
 
-    it { should set_the_flash.to(/signed in/i) }
     it { should redirect_to_url_after_create }
 
     it "sets a remember token cookie" do
@@ -129,7 +128,6 @@ describe Clearance::SessionsController do
       sign_out
       delete :destroy
     end
-    it { should set_the_flash.to(/signed out/i) }
     it { should redirect_to_url_after_destroy }
   end
 
@@ -141,7 +139,6 @@ describe Clearance::SessionsController do
       delete :destroy
     end
 
-    it { should set_the_flash.to(/signed out/i) }
     it { should redirect_to_url_after_destroy }
 
     it "should delete the cookie token" do

data/spec/controllers/users_controller_spec.rb

@@ -36,9 +36,26 @@ describe Clearance::UsersController do
         User.count.should == @old_user_count + 1
       end
 
-      it { should set_the_flash.to(/signed up/i) }
       it { should redirect_to_url_after_create }
     end
+
+    describe "on POST to #create with valid attributes and a session return url" do
+      before do
+        user_attributes = Factory.attributes_for(:user)
+        @old_user_count = User.count
+        @return_url = '/url_in_the_session'
+        @request.session[:return_to] = @return_url
+        post :create, :user => user_attributes
+      end
+
+      it { should assign_to(:user) }
+
+      it "should create a new user" do
+        User.count.should == @old_user_count + 1
+      end
+
+      it { should redirect_to(@return_url) }
+    end
   end
 
   describe "A signed-in user" do

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ Bundler.require
 require 'diesel/testing'
 require 'rspec/rails'
 
-require 'clearance/test_matchers'
+require 'clearance/testing'
 
 Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 

data/spec/support/clearance.rb

@@ -10,3 +10,29 @@ end
 class User < ActiveRecord::Base
   include Clearance::User
 end
+
+module Clearance
+  module Test
+    module Redirects
+      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
+  end
+end
+
+RSpec.configure do |config|
+  config.include Clearance::Test::Redirects
+end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: clearance
 version: !ruby/object:Gem::Version 
+  hash: 47
   prerelease: 
-  version: 0.11.2
+  segments: 
+  - 0
+  - 12
+  - 0
+  version: 0.12.0
 platform: ruby
 authors: 
 - Dan Croak
@@ -19,7 +24,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 Z
+date: 2011-06-30 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -29,6 +35,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
         version: "3.0"
   type: :runtime
   version_requirements: *id001
@@ -40,6 +50,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 1
+        - 4
         version: 0.1.4
   type: :runtime
   version_requirements: *id002
@@ -51,6 +66,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id003
@@ -80,6 +100,7 @@ files:
 - app/mailers/clearance_mailer.rb
 - app/views/clearance_mailer/change_password.html.erb
 - app/views/layouts/application.html.erb
+- app/views/passwords/create.html.erb
 - app/views/passwords/edit.html.erb
 - app/views/passwords/new.html.erb
 - app/views/sessions/new.html.erb
@@ -113,7 +134,10 @@ files:
 - lib/clearance/authentication.rb
 - lib/clearance/configuration.rb
 - lib/clearance/engine.rb
-- lib/clearance/test_matchers.rb
+- lib/clearance/testing.rb
+- lib/clearance/testing/assertion_error.rb
+- lib/clearance/testing/deny_access_matcher.rb
+- lib/clearance/testing/helpers.rb
 - lib/clearance/user.rb
 - lib/generators/clearance/features/features_generator.rb
 - lib/generators/clearance/install/install_generator.rb
@@ -122,6 +146,7 @@ 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
+- spec/controllers/denies_controller_spec.rb
 - spec/controllers/forgeries_controller_spec.rb
 - spec/controllers/passwords_controller_spec.rb
 - spec/controllers/sessions_controller_spec.rb
@@ -132,6 +157,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/clearance.rb
 - spec/support/cookies.rb
+has_rdoc: true
 homepage: http://github.com/thoughtbot/clearance
 licenses: []
 
@@ -145,17 +171,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Rails authentication & authorization with email & password.

data/lib/clearance/test_matchers.rb

@@ -1,60 +0,0 @@
-module Clearance
-  module Test
-    module Matchers
-      def deny_access(opts = {})
-        if opts[:flash]
-          should set_the_flash.to(opts[:flash])
-        else
-          should_not set_the_flash
-        end
-
-        redirect_to(sign_in_url)
-      end
-
-      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
-
-    module Helpers
-      def sign_in_as(user)
-        @controller.current_user = user
-        return user
-      end
-
-      def sign_in
-        sign_in_as Factory(:user)
-      end
-
-      def sign_out
-        @controller.current_user = nil
-      end
-    end
-  end
-end
-
-if defined?(Test::Unit::TestCase)
-  Test::Unit::TestCase.extend  Clearance::Test::Matchers
-  class Test::Unit::TestCase
-    include Clearance::Test::Helpers
-  end
-end
-
-if defined?(RSpec) && RSpec.respond_to?(:configure)
-  RSpec.configure do |config|
-    config.include Clearance::Test::Matchers
-    config.include Clearance::Test::Helpers
-  end
-end