mirror of
https://github.com/heartcombo/devise.git
synced 2022-11-09 12:18:31 -05:00
Work around AR that does not call serializable_hash on to_xml.
This commit is contained in:
parent
6a8ee475fd
commit
07db04e773
3 changed files with 14 additions and 8 deletions
|
@ -6,6 +6,7 @@
|
||||||
* Better localization for devise_error_messages! (by github.com/zedtux)
|
* Better localization for devise_error_messages! (by github.com/zedtux)
|
||||||
|
|
||||||
* bug fix
|
* bug fix
|
||||||
|
* Ensure to_xml is properly white listened
|
||||||
* Ensure handle_unverified_request clean up any cached signed-in user
|
* Ensure handle_unverified_request clean up any cached signed-in user
|
||||||
|
|
||||||
== 1.4.0
|
== 1.4.0
|
||||||
|
|
|
@ -76,13 +76,18 @@ module Devise
|
||||||
def authenticatable_salt
|
def authenticatable_salt
|
||||||
end
|
end
|
||||||
|
|
||||||
def serializable_hash(options={})
|
# TODO: to_xml does not call serializable_hash. Hopefully someone will fix this in AR.
|
||||||
if self.class.respond_to?(:accessible_attributes)
|
%w(to_xml serializable_hash).each do |method|
|
||||||
options = { :only => self.class.accessible_attributes.to_a }.merge(options || {})
|
class_eval <<-RUBY, __FILE__, __LINE__
|
||||||
super(options)
|
def #{method}(options={})
|
||||||
else
|
if self.class.respond_to?(:accessible_attributes)
|
||||||
super
|
options = { :only => self.class.accessible_attributes.to_a }.merge(options || {})
|
||||||
end
|
super(options)
|
||||||
|
else
|
||||||
|
super
|
||||||
|
end
|
||||||
|
end
|
||||||
|
RUBY
|
||||||
end
|
end
|
||||||
|
|
||||||
module ClassMethods
|
module ClassMethods
|
||||||
|
|
|
@ -211,7 +211,7 @@ class RegistrationTest < ActionController::IntegrationTest
|
||||||
get new_user_registration_path(:format => 'xml')
|
get new_user_registration_path(:format => 'xml')
|
||||||
assert_response :success
|
assert_response :success
|
||||||
assert_match %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>), response.body
|
assert_match %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>), response.body
|
||||||
assert_no_match(/<confirmation_token>/, response.body) if DEVISE_ORM == :active_record
|
assert_no_match(/<confirmation-token/, response.body) if DEVISE_ORM == :active_record
|
||||||
end
|
end
|
||||||
|
|
||||||
test 'a user with JSON sign up stub' do
|
test 'a user with JSON sign up stub' do
|
||||||
|
|
Loading…
Reference in a new issue