Allow :skip => :all

This commit is contained in:
José Valim 2011-09-14 16:50:13 -07:00
parent ea7f15917f
commit 261c01dfa3
3 changed files with 8 additions and 0 deletions

View File

@ -78,6 +78,8 @@ module Devise
if options.has_key?(:only)
@used_routes = self.routes & Array(options[:only]).map(&singularizer)
elsif options[:skip] == :all
@used_routes = []
else
@used_routes = self.routes - Array(options[:skip]).map(&singularizer)
end

View File

@ -31,6 +31,10 @@ class MappingTest < ActiveSupport::TestCase
assert_equal "admin_area", Devise.mappings[:admin].path
end
test 'allows to skip all routes' do
assert_equal [], Devise.mappings[:skip_admin].used_routes
end
test 'sign_out_via defaults to :get' do
assert_equal :get, Devise.mappings[:user].sign_out_via
end

View File

@ -50,6 +50,8 @@ Rails.application.routes.draw do
constraints(:host => /192\.168\.1\.\d\d\d/) do
devise_for :homebase_admin, :class_name => "Admin", :path => "homebase"
end
devise_for :skip_admin, :class_name => "Admin", :skip => :all
# Routes for format=false testing
devise_for :htmlonly_admin, :class_name => "Admin", :skip => [:confirmations, :unlocks], :path => "htmlonly_admin", :format => false, :skip_helpers => [:confirmations, :unlocks]