mirror of
https://github.com/heartcombo/devise.git
synced 2022-11-09 12:18:31 -05:00
Fix failure_app failing test.
This commit is contained in:
parent
58d61c290a
commit
22136a708b
4 changed files with 5 additions and 12 deletions
|
@ -100,10 +100,6 @@ module Devise
|
|||
"/#{@path_prefix}/#{@path}".squeeze("/")
|
||||
end
|
||||
|
||||
def failure_app
|
||||
Devise::FailureApp
|
||||
end
|
||||
|
||||
# Create magic predicates for verifying what module is activated by this map.
|
||||
# Example:
|
||||
#
|
||||
|
|
|
@ -202,9 +202,7 @@ class AuthenticationSanityTest < ActionController::IntegrationTest
|
|||
end
|
||||
|
||||
test 'scope uses custom failure app' do
|
||||
app = lambda { |env| [404, {"Content-Type" => "text/plain"}, ["Oops, not found"]] }
|
||||
Devise.mappings[:admin].expects(:failure_app).returns(app)
|
||||
get admins_path
|
||||
put "/en/accounts/management"
|
||||
assert_equal "Oops, not found", response.body
|
||||
assert_equal 404, response.status
|
||||
end
|
||||
|
|
|
@ -11,7 +11,6 @@ RailsApp::Application.configure do
|
|||
|
||||
# Show full error reports and disable caching
|
||||
config.consider_all_requests_local = true
|
||||
config.action_view.debug_rjs = true
|
||||
config.action_controller.perform_caching = false
|
||||
|
||||
# Don't care if the mailer can't send
|
||||
|
|
|
@ -46,17 +46,17 @@ Rails.application.routes.draw do
|
|||
|
||||
# Routes for constraints testing
|
||||
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
|
||||
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]
|
||||
devise_for :htmlonly_users, :class_name => "User", :only => [:confirmations, :unlocks], :path => "htmlonly_users", :format => false, :skip_helpers => true
|
||||
|
||||
|
||||
# Other routes for routing_test.rb
|
||||
devise_for :reader, :class_name => "User", :only => :passwords
|
||||
|
||||
|
@ -71,7 +71,7 @@ Rails.application.routes.draw do
|
|||
:password => "secret", :confirmation => "verification",
|
||||
:unlock => "unblock", :sign_up => "register",
|
||||
:registration => "management", :cancel => "giveup"
|
||||
}
|
||||
}, :failure_app => lambda { |env| [404, {"Content-Type" => "text/plain"}, ["Oops, not found"]] }
|
||||
end
|
||||
|
||||
namespace :sign_out_via, :module => "devise" do
|
||||
|
|
Loading…
Reference in a new issue