devise 1.0.10 → 1.1.0

data/test/rails_app/config/routes.rb

@@ -1,25 +1,47 @@
-ActionController::Routing::Routes.draw do |map|
-  map.devise_for :users
-  map.devise_for :admin, :as => 'admin_area'
-  map.devise_for :accounts, :scope => 'manager', :path_prefix => ':locale',
-    :class_name => "User", :requirements => { :extra => 'value' }, :path_names => {
-      :sign_in => 'login', :sign_out => 'logout',
-      :password => 'secret', :confirmation => 'verification',
-      :unlock => 'unblock', :sign_up => 'register'
-    }
-
-  map.resources :users, :only => [:index], :member => { :expire => :get }
-  map.resources :admins, :only => :index
-  map.root :controller => :home
-
-  map.devise_for :sign_out_via_deletes, :sign_out_via => :delete, :class_name => "User"
-  map.devise_for :sign_out_via_posts, :sign_out_via => :post, :class_name => "User"
-  map.devise_for :sign_out_via_anymethods, :sign_out_via => :any, :class_name => "User"
-
-  map.connect '/admin_area/password/new', :controller => "passwords", :action => "new"
-  map.admin_root '/admin_area/home', :controller => "admins", :action => "index"
-
-  map.connect '/sign_in', :controller => "sessions", :action => "new"
-  map.connect ':controller/:action/:id'
-  map.connect ':controller/:action/:id.:format'
-end
+Rails.application.routes.draw do
+  # Resources for testing
+  resources :users, :only => [:index] do
+    get :expire, :on => :member
+    get :accept, :on => :member
+  end
+
+  resources :admins, :only => [:index]
+
+  # Users scope
+  devise_for :users do
+    match "/devise_for/sign_in", :to => "devise/sessions#new"
+  end
+
+  as :user do
+    match "/as/sign_in", :to => "devise/sessions#new"
+  end
+
+  match "/sign_in", :to => "devise/sessions#new"
+
+  # Admin scope
+  devise_for :admin, :path => "admin_area", :controllers => { :sessions => "sessions" }, :skip => :passwords
+
+  match "/admin_area/home", :to => "admins#index", :as => :admin_root
+  match "/anywhere", :to => "foo#bar", :as => :new_admin_password
+
+  authenticate(:admin) do
+    match "/private", :to => "home#private", :as => :private
+  end
+
+  # Other routes for routing_test.rb
+  namespace :publisher, :path_names => { :sign_in => "i_don_care", :sign_out => "get_out" } do
+    devise_for :accounts, :class_name => "User", :path_names => { :sign_in => "get_in" }
+  end
+
+  scope ":locale" do
+    devise_for :accounts, :singular => "manager", :class_name => "User",
+      :path_names => {
+        :sign_in => "login", :sign_out => "logout",
+        :password => "secret", :confirmation => "verification",
+        :unlock => "unblock", :sign_up => "register",
+        :registration => "management"
+      }
+  end
+
+  root :to => "home#index"
+end

data/test/rails_app/db/migrate/20100401102949_create_tables.rb

@@ -0,0 +1,27 @@
+class CreateTables < ActiveRecord::Migration
+  def self.up
+    [:users, :admins, :accounts].each do |table|
+      create_table table do |t|
+        t.database_authenticatable :null => (table == :admins)
+
+        if table != :admin
+          t.string :username
+          t.confirmable
+          t.recoverable
+          t.rememberable
+          t.trackable
+          t.lockable
+          t.token_authenticatable
+        end
+
+        t.timestamps
+      end
+    end
+  end
+
+  def self.down
+    [:users, :admins, :accounts].each do |table|
+      drop_table table
+    end
+  end
+end

data/test/rails_app/db/schema.rb

@@ -0,0 +1,86 @@
+# This file is auto-generated from the current state of the database. Instead of editing this file, 
+# please use the migrations feature of Active Record to incrementally modify your database, and
+# then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your database schema. If you need
+# to create the application database on another system, you should be using db:schema:load, not running
+# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20100401102949) do
+
+  create_table "accounts", :force => true do |t|
+    t.string   "email",                :default => "", :null => false
+    t.string   "encrypted_password",   :default => "", :null => false
+    t.string   "password_salt",        :default => "", :null => false
+    t.string   "username"
+    t.string   "confirmation_token"
+    t.datetime "confirmed_at"
+    t.datetime "confirmation_sent_at"
+    t.string   "reset_password_token"
+    t.string   "remember_token"
+    t.datetime "remember_created_at"
+    t.integer  "sign_in_count",        :default => 0
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.integer  "failed_attempts",      :default => 0
+    t.string   "unlock_token"
+    t.datetime "locked_at"
+    t.string   "authentication_token"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "admins", :force => true do |t|
+    t.string   "email",                :default => ""
+    t.string   "encrypted_password",   :default => ""
+    t.string   "password_salt",        :default => ""
+    t.string   "username"
+    t.string   "confirmation_token"
+    t.datetime "confirmed_at"
+    t.datetime "confirmation_sent_at"
+    t.string   "reset_password_token"
+    t.string   "remember_token"
+    t.datetime "remember_created_at"
+    t.integer  "sign_in_count",        :default => 0
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.integer  "failed_attempts",      :default => 0
+    t.string   "unlock_token"
+    t.datetime "locked_at"
+    t.string   "authentication_token"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "users", :force => true do |t|
+    t.string   "email",                :default => "", :null => false
+    t.string   "encrypted_password",   :default => "", :null => false
+    t.string   "password_salt",        :default => "", :null => false
+    t.string   "username"
+    t.string   "confirmation_token"
+    t.datetime "confirmed_at"
+    t.datetime "confirmation_sent_at"
+    t.string   "reset_password_token"
+    t.string   "remember_token"
+    t.datetime "remember_created_at"
+    t.integer  "sign_in_count",        :default => 0
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.integer  "failed_attempts",      :default => 0
+    t.string   "unlock_token"
+    t.datetime "locked_at"
+    t.string   "authentication_token"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+end

data/test/routes_test.rb

@@ -1,131 +1,146 @@
-require 'test/test_helper'
-
-class MapRoutingTest < ActionController::TestCase
+require 'test_helper'
 
+class DefaultRoutingTest < ActionController::TestCase
   test 'map new user session' do
-    assert_recognizes({:controller => 'sessions', :action => 'new'}, {:path => 'users/sign_in', :method => :get})
+    assert_recognizes({:controller => 'devise/sessions', :action => 'new'}, {:path => 'users/sign_in', :method => :get})
+    assert_named_route "/users/sign_in", :new_user_session_path
   end
 
   test 'map create user session' do
-    assert_recognizes({:controller => 'sessions', :action => 'create'}, {:path => 'users/sign_in', :method => :post})
+    assert_recognizes({:controller => 'devise/sessions', :action => 'create'}, {:path => 'users/sign_in', :method => :post})
+    assert_named_route "/users/sign_in", :user_session_path
   end
 
   test 'map destroy user session' do
-    assert_recognizes({:controller => 'sessions', :action => 'destroy'}, {:path => 'users/sign_out', :method => :get})
+    assert_recognizes({:controller => 'devise/sessions', :action => 'destroy'}, {:path => 'users/sign_out', :method => :get})
+    assert_named_route "/users/sign_out", :destroy_user_session_path
   end
 
   test 'map new user confirmation' do
-    assert_recognizes({:controller => 'confirmations', :action => 'new'}, 'users/confirmation/new')
+    assert_recognizes({:controller => 'devise/confirmations', :action => 'new'}, 'users/confirmation/new')
+    assert_named_route "/users/confirmation/new", :new_user_confirmation_path
   end
 
   test 'map create user confirmation' do
-    assert_recognizes({:controller => 'confirmations', :action => 'create'}, {:path => 'users/confirmation', :method => :post})
+    assert_recognizes({:controller => 'devise/confirmations', :action => 'create'}, {:path => 'users/confirmation', :method => :post})
+    assert_named_route "/users/confirmation", :user_confirmation_path
   end
 
   test 'map show user confirmation' do
-    assert_recognizes({:controller => 'confirmations', :action => 'show'}, {:path => 'users/confirmation', :method => :get})
+    assert_recognizes({:controller => 'devise/confirmations', :action => 'show'}, {:path => 'users/confirmation', :method => :get})
   end
 
   test 'map new user password' do
-    assert_recognizes({:controller => 'passwords', :action => 'new'}, 'users/password/new')
+    assert_recognizes({:controller => 'devise/passwords', :action => 'new'}, 'users/password/new')
+    assert_named_route "/users/password/new", :new_user_password_path
   end
 
   test 'map create user password' do
-    assert_recognizes({:controller => 'passwords', :action => 'create'}, {:path => 'users/password', :method => :post})
+    assert_recognizes({:controller => 'devise/passwords', :action => 'create'}, {:path => 'users/password', :method => :post})
+    assert_named_route "/users/password", :user_password_path
   end
 
   test 'map edit user password' do
-    assert_recognizes({:controller => 'passwords', :action => 'edit'}, 'users/password/edit')
+    assert_recognizes({:controller => 'devise/passwords', :action => 'edit'}, 'users/password/edit')
+    assert_named_route "/users/password/edit", :edit_user_password_path
   end
 
   test 'map update user password' do
-    assert_recognizes({:controller => 'passwords', :action => 'update'}, {:path => 'users/password', :method => :put})
+    assert_recognizes({:controller => 'devise/passwords', :action => 'update'}, {:path => 'users/password', :method => :put})
   end
 
   test 'map new user unlock' do
-    assert_recognizes({:controller => 'unlocks', :action => 'new'}, 'users/unlock/new')
+    assert_recognizes({:controller => 'devise/unlocks', :action => 'new'}, 'users/unlock/new')
+    assert_named_route "/users/unlock/new", :new_user_unlock_path
   end
 
   test 'map create user unlock' do
-    assert_recognizes({:controller => 'unlocks', :action => 'create'}, {:path => 'users/unlock', :method => :post})
+    assert_recognizes({:controller => 'devise/unlocks', :action => 'create'}, {:path => 'users/unlock', :method => :post})
+    assert_named_route "/users/unlock", :user_unlock_path
   end
 
   test 'map show user unlock' do
-    assert_recognizes({:controller => 'unlocks', :action => 'show'}, {:path => 'users/unlock', :method => :get})
+    assert_recognizes({:controller => 'devise/unlocks', :action => 'show'}, {:path => 'users/unlock', :method => :get})
   end
 
   test 'map new user registration' do
-    assert_recognizes({:controller => 'registrations', :action => 'new'}, 'users/sign_up')
+    assert_recognizes({:controller => 'devise/registrations', :action => 'new'}, 'users/sign_up')
+    assert_named_route "/users/sign_up", :new_user_registration_path
   end
 
   test 'map create user registration' do
-    assert_recognizes({:controller => 'registrations', :action => 'create'}, {:path => 'users', :method => :post})
+    assert_recognizes({:controller => 'devise/registrations', :action => 'create'}, {:path => 'users', :method => :post})
+    assert_named_route "/users", :user_registration_path
   end
 
   test 'map edit user registration' do
-    assert_recognizes({:controller => 'registrations', :action => 'edit'}, {:path => 'users/edit', :method => :get})
+    assert_recognizes({:controller => 'devise/registrations', :action => 'edit'}, {:path => 'users/edit', :method => :get})
+    assert_named_route "/users/edit", :edit_user_registration_path
   end
 
   test 'map update user registration' do
-    assert_recognizes({:controller => 'registrations', :action => 'update'}, {:path => 'users', :method => :put})
+    assert_recognizes({:controller => 'devise/registrations', :action => 'update'}, {:path => 'users', :method => :put})
   end
 
   test 'map destroy user registration' do
-    assert_recognizes({:controller => 'registrations', :action => 'destroy'}, {:path => 'users', :method => :delete})
+    assert_recognizes({:controller => 'devise/registrations', :action => 'destroy'}, {:path => 'users', :method => :delete})
+  end
+
+  protected
+
+  def assert_named_route(result, name)
+    assert_equal result, @routes.url_helpers.send(name)
+  end
+end
+
+class CustomizedRoutingTest < ActionController::TestCase
+  test 'map admin with :path option' do
+    assert_recognizes({:controller => 'devise/registrations', :action => 'new'}, {:path => 'admin_area/sign_up', :method => :get})
   end
 
-  test 'map admin session with :as option' do
+  test 'map admin with :controllers option' do
     assert_recognizes({:controller => 'sessions', :action => 'new'}, {:path => 'admin_area/sign_in', :method => :get})
   end
 
-  test 'does not map admin confirmation' do
+  test 'does not map admin password' do
     assert_raise ActionController::RoutingError do
-      assert_recognizes({:controller => 'confirmations', :action => 'new'}, 'admin_area/confirmation/new')
+      assert_recognizes({:controller => 'devise/passwords', :action => 'new'}, 'admin_area/password/new')
     end
   end
 
   test 'map account with custom path name for session sign in' do
-    assert_recognizes({:controller => 'sessions', :action => 'new', :locale => 'en', :extra => 'value'}, '/en/accounts/login')
+    assert_recognizes({:controller => 'devise/sessions', :action => 'new', :locale => 'en'}, '/en/accounts/login')
   end
 
   test 'map account with custom path name for session sign out' do
-    assert_recognizes({:controller => 'sessions', :action => 'destroy', :locale => 'en', :extra => 'value'}, '/en/accounts/logout')
+    assert_recognizes({:controller => 'devise/sessions', :action => 'destroy', :locale => 'en'}, '/en/accounts/logout')
   end
 
   test 'map account with custom path name for password' do
-    assert_recognizes({:controller => 'passwords', :action => 'new', :locale => 'en', :extra => 'value'}, '/en/accounts/secret/new')
+    assert_recognizes({:controller => 'devise/passwords', :action => 'new', :locale => 'en'}, '/en/accounts/secret/new')
   end
 
   test 'map account with custom path name for confirmation' do
-    assert_recognizes({:controller => 'confirmations', :action => 'new', :locale => 'en', :extra => 'value'}, '/en/accounts/verification/new')
+    assert_recognizes({:controller => 'devise/confirmations', :action => 'new', :locale => 'en'}, '/en/accounts/verification/new')
   end
 
   test 'map account with custom path name for unlock' do
-    assert_recognizes({:controller => 'unlocks', :action => 'new', :locale => 'en', :extra => 'value'}, '/en/accounts/unblock/new')
+    assert_recognizes({:controller => 'devise/unlocks', :action => 'new', :locale => 'en'}, '/en/accounts/unblock/new')
   end
 
   test 'map account with custom path name for registration' do
-    assert_recognizes({:controller => 'registrations', :action => 'new', :locale => 'en', :extra => 'value'}, '/en/accounts/register')
-  end
-
-  test 'map deletes with :sign_out_via option' do
-    assert_recognizes({:controller => 'sessions', :action => 'destroy'}, {:path => '/sign_out_via_deletes/sign_out', :method => :delete})
-    assert_raise ActionController::MethodNotAllowed do
-      assert_recognizes({:controller => 'sessions', :action => 'destroy'}, {:path => '/sign_out_via_deletes/sign_out', :method => :get})
-    end
+    assert_recognizes({:controller => 'devise/registrations', :action => 'new', :locale => 'en'}, '/en/accounts/management/register')
   end
+end
 
-  test 'map posts with :sign_out_via option' do
-    assert_recognizes({:controller => 'sessions', :action => 'destroy'}, {:path => '/sign_out_via_posts/sign_out', :method => :post})
-    assert_raise ActionController::MethodNotAllowed do
-      assert_recognizes({:controller => 'sessions', :action => 'destroy'}, {:path => '/sign_out_via_posts/sign_out', :method => :get})
-    end
+class ScopedRoutingTest < ActionController::TestCase
+  test 'map publisher account' do
+    assert_recognizes({:controller => 'publisher/registrations', :action => 'new'}, {:path => '/publisher/accounts/sign_up', :method => :get})
+    assert_equal '/publisher/accounts/sign_up', @routes.url_helpers.new_publisher_account_registration_path
   end
 
-  test 'map any methods with :sign_out_via option' do
-    assert_recognizes({:controller => 'sessions', :action => 'destroy'}, {:path => '/sign_out_via_anymethods/sign_out', :method => :get})
-    assert_recognizes({:controller => 'sessions', :action => 'destroy'}, {:path => '/sign_out_via_anymethods/sign_out', :method => :post})
-    assert_recognizes({:controller => 'sessions', :action => 'destroy'}, {:path => '/sign_out_via_anymethods/sign_out', :method => :delete})
-    assert_recognizes({:controller => 'sessions', :action => 'destroy'}, {:path => '/sign_out_via_anymethods/sign_out', :method => :put})
+  test 'map publisher account merges path names' do
+    assert_recognizes({:controller => 'publisher/sessions', :action => 'new'}, {:path => '/publisher/accounts/get_in', :method => :get})
+    assert_equal '/publisher/accounts/get_in', @routes.url_helpers.new_publisher_account_session_path
   end
 end

data/test/support/{assertions_helper.rb → assertions.rb}

@@ -1,3 +1,5 @@
+require 'active_support/test_case'
+
 class ActiveSupport::TestCase
   def assert_not(assertion)
     assert !assertion
@@ -19,19 +21,4 @@ class ActiveSupport::TestCase
   def assert_email_not_sent(&block)
     assert_no_difference('ActionMailer::Base.deliveries.size') { yield }
   end
-
-  # Execute the block setting the given values and restoring old values after
-  # the block is executed.
-  def swap(object, new_values)
-    old_values = {}
-    new_values.each do |key, value|
-      old_values[key] = object.send key
-      object.send :"#{key}=", value
-    end
-    yield
-  ensure
-    old_values.each do |key, value|
-      object.send :"#{key}=", value
-    end
-  end
 end

data/test/support/{tests_helper.rb → helpers.rb}

@@ -1,3 +1,5 @@
+require 'active_support/test_case'
+
 class ActiveSupport::TestCase
   VALID_AUTHENTICATION_TOKEN = 'AbCdEfGhIjKlMnOpQrSt'.freeze
 
@@ -7,15 +9,13 @@ class ActiveSupport::TestCase
 
   def store_translations(locale, translations, &block)
     begin
-      I18n.backend.store_translations locale, translations
+      I18n.backend.store_translations(locale, translations)
       yield
     ensure
       I18n.reload!
     end
   end
 
-  # Helpers for creating new users
-  #
   def generate_unique_email
     @@email_count ||= 0
     @@email_count += 1
@@ -36,4 +36,19 @@ class ActiveSupport::TestCase
   def create_user(attributes={})
     User.create!(valid_attributes(attributes))
   end
+
+  # Execute the block setting the given values and restoring old values after
+  # the block is executed.
+  def swap(object, new_values)
+    old_values = {}
+    new_values.each do |key, value|
+      old_values[key] = object.send key
+      object.send :"#{key}=", value
+    end
+    yield
+  ensure
+    old_values.each do |key, value|
+      object.send :"#{key}=", value
+    end
+  end
 end

data/test/support/{integration_tests_helper.rb → integration.rb}

@@ -1,5 +1,6 @@
-class ActionController::IntegrationTest
+require 'action_dispatch/testing/integration'
 
+class ActionDispatch::IntegrationTest
   def warden
     request.env['warden']
   end
@@ -30,7 +31,7 @@ class ActionController::IntegrationTest
 
   def sign_in_as_user(options={}, &block)
     user = create_user(options)
-    visit new_user_session_path unless options[:visit] == false
+    visit_with_option options[:visit], new_user_session_path
     fill_in 'email', :with => 'user@test.com'
     fill_in 'password', :with => options[:password] || '123456'
     check 'remember me' if options[:remember_me] == true
@@ -41,7 +42,7 @@ class ActionController::IntegrationTest
 
   def sign_in_as_admin(options={}, &block)
     admin = create_admin(options)
-    visit new_admin_session_path unless options[:visit] == false
+    visit_with_option options[:visit], new_admin_session_path
     fill_in 'email', :with => 'admin@test.com'
     fill_in 'password', :with => '123456'
     yield if block_given?
@@ -56,16 +57,32 @@ class ActionController::IntegrationTest
     assert [301, 302].include?(@integration_session.status),
            "Expected status to be 301 or 302, got #{@integration_session.status}"
 
-    url = prepend_host(url)
-    location = prepend_host(@integration_session.headers["Location"])
-    assert_equal url, location
+    assert_url url, @integration_session.headers["Location"]
+  end
+
+  def assert_current_url(expected)
+    assert_url expected, current_url
+  end
+
+  def assert_url(expected, actual)
+    assert_equal prepend_host(expected), prepend_host(actual)
   end
 
   protected
 
+    def visit_with_option(given, default)
+      case given
+      when String
+        visit given
+      when FalseClass
+        # Do nothing
+      else
+        visit default
+      end
+    end
+
     def prepend_host(url)
       url = "http://#{request.host}#{url}" if url[0] == ?/
       url
     end
-
 end

data/test/support/webrat/integrations/rails.rb

@@ -0,0 +1,32 @@
+require 'webrat/core/elements/field'
+require 'action_dispatch/testing/integration'
+
+module Webrat
+  Field.class_eval do
+    def parse_rails_request_params(params)
+      Rack::Utils.parse_nested_query(params)
+    end
+  end
+end
+
+module ActionDispatch #:nodoc:
+  IntegrationTest.class_eval do
+    include Webrat::Methods
+    include Webrat::Matchers
+ 
+    # The Rails version of within supports passing in a model and Webrat
+    # will apply a scope based on Rails' dom_id for that model.
+    #
+    # Example:
+    #   within User.last do
+    #     click_link "Delete"
+    #   end
+    def within(selector_or_object, &block)
+      if selector_or_object.is_a?(String)
+        super
+      else
+        super('#' + RecordIdentifier.dom_id(selector_or_object), &block)
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,21 +1,21 @@
-require 'rubygems'
-
 ENV["RAILS_ENV"] = "test"
 DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym
 
+$:.unshift File.dirname(__FILE__)
 puts "\n==> Devise.orm = #{DEVISE_ORM.inspect}"
-require File.join(File.dirname(__FILE__), 'orm', DEVISE_ORM.to_s)
-
-require 'webrat'
-require 'mocha'
 
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+require "rails_app/config/environment"
+require "rails/test_help"
+require "orm/#{DEVISE_ORM}"
 
-ActionMailer::Base.delivery_method = :test
-ActionMailer::Base.perform_deliveries = true
-ActionMailer::Base.default_url_options[:host] = 'test.com'
+I18n.load_path << File.expand_path("../support/locale/en.yml", __FILE__)
+require 'mocha'
 
 Webrat.configure do |config|
   config.mode = :rails
   config.open_error_files = false
-end
+end
+
+# Add support to load paths so we can overwrite broken webrat setup
+$:.unshift File.expand_path('../support', __FILE__)
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }