kotovalexarian-likes-github/heartcombo--devise
1
0
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2022-11-09 12:18:31 -05:00
Code Releases Activity

Fix failure_app failing test.

Browse source
This commit is contained in:
José Valim 2011-11-07 21:38:31 -02:00
parent 58d61c290a
commit 22136a708b
4 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/devise/mapping.rb
View file

@ -100,10 +100,6 @@ module Devise
"/#{@path_prefix}/#{@path}".squeeze("/") "/#{@path_prefix}/#{@path}".squeeze("/")
end end
def failure_app
Devise::FailureApp
end
# Create magic predicates for verifying what module is activated by this map. # Create magic predicates for verifying what module is activated by this map.
# Example: # Example:
# #

4
test/integration/authenticatable_test.rb
View file

@ -202,9 +202,7 @@ class AuthenticationSanityTest < ActionController::IntegrationTest
end end
test 'scope uses custom failure app' do test 'scope uses custom failure app' do
app = lambda { |env| [404, {"Content-Type" => "text/plain"}, ["Oops, not found"]] } put "/en/accounts/management"
Devise.mappings[:admin].expects(:failure_app).returns(app)
get admins_path
assert_equal "Oops, not found", response.body assert_equal "Oops, not found", response.body
assert_equal 404, response.status assert_equal 404, response.status
end end

1
test/rails_app/config/environments/development.rb
View file

@ -11,7 +11,6 @@ RailsApp::Application.configure do
# Show full error reports and disable caching # Show full error reports and disable caching
config.consider_all_requests_local = true config.consider_all_requests_local = true
config.action_view.debug_rjs = true
config.action_controller.perform_caching = false config.action_controller.perform_caching = false
# Don't care if the mailer can't send # Don't care if the mailer can't send

8
test/rails_app/config/routes.rb
View file

@ -46,17 +46,17 @@ Rails.application.routes.draw do
# Routes for constraints testing # Routes for constraints testing
devise_for :headquarters_admin, :class_name => "Admin", :path => "headquarters", :constraints => {:host => /192\.168\.1\.\d\d\d/} devise_for :headquarters_admin, :class_name => "Admin", :path => "headquarters", :constraints => {:host => /192\.168\.1\.\d\d\d/}
constraints(:host => /192\.168\.1\.\d\d\d/) do constraints(:host => /192\.168\.1\.\d\d\d/) do
devise_for :homebase_admin, :class_name => "Admin", :path => "homebase" devise_for :homebase_admin, :class_name => "Admin", :path => "homebase"
end end
devise_for :skip_admin, :class_name => "Admin", :skip => :all devise_for :skip_admin, :class_name => "Admin", :skip => :all
# Routes for format=false testing # Routes for format=false testing
devise_for :htmlonly_admin, :class_name => "Admin", :skip => [:confirmations, :unlocks], :path => "htmlonly_admin", :format => false, :skip_helpers => [:confirmations, :unlocks] devise_for :htmlonly_admin, :class_name => "Admin", :skip => [:confirmations, :unlocks], :path => "htmlonly_admin", :format => false, :skip_helpers => [:confirmations, :unlocks]
devise_for :htmlonly_users, :class_name => "User", :only => [:confirmations, :unlocks], :path => "htmlonly_users", :format => false, :skip_helpers => true devise_for :htmlonly_users, :class_name => "User", :only => [:confirmations, :unlocks], :path => "htmlonly_users", :format => false, :skip_helpers => true
# Other routes for routing_test.rb # Other routes for routing_test.rb
devise_for :reader, :class_name => "User", :only => :passwords devise_for :reader, :class_name => "User", :only => :passwords
@ -71,7 +71,7 @@ Rails.application.routes.draw do
:password => "secret", :confirmation => "verification", :password => "secret", :confirmation => "verification",
:unlock => "unblock", :sign_up => "register", :unlock => "unblock", :sign_up => "register",
:registration => "management", :cancel => "giveup" :registration => "management", :cancel => "giveup"
} }, :failure_app => lambda { |env| [404, {"Content-Type" => "text/plain"}, ["Oops, not found"]] }
end end
namespace :sign_out_via, :module => "devise" do namespace :sign_out_via, :module => "devise" do