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

Release 2.1.4

Browse source
This commit is contained in:
José Valim 2013-08-18 10:37:31 +02:00
parent d9513e3bea
commit 8563f106a1
6 changed files with 15 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.rdoc
View file

@ -1,3 +1,8 @@
== 2.1.4
* bug fix
* Do not confirm account after reset password
== 2.1.3 == 2.1.3
* bug fix * bug fix

6
Gemfile.lock
View file

@ -1,7 +1,7 @@
PATH PATH
remote: . remote: .
specs: specs:
devise (2.1.3) devise (2.1.4)
bcrypt-ruby (~> 3.0) bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (~> 3.1) railties (~> 3.1)
@ -39,7 +39,7 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
addressable (2.2.6) addressable (2.2.6)
arel (3.0.2) arel (3.0.2)
bcrypt-ruby (3.0.1) bcrypt-ruby (3.1.1)
bson (1.5.1) bson (1.5.1)
bson_ext (1.3.1) bson_ext (1.3.1)
builder (3.0.0) builder (3.0.0)
@ -135,7 +135,7 @@ GEM
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (0.3.33) tzinfo (0.3.33)
warden (1.2.1) warden (1.2.3)
rack (>= 1.0) rack (>= 1.0)
webrat (0.7.2) webrat (0.7.2)
nokogiri (>= 1.2.0) nokogiri (>= 1.2.0)

12
gemfiles/Gemfile.rails-3.1.x.lock
View file

@ -1,11 +1,11 @@
PATH PATH
remote: .. remote: ..
specs: specs:
devise (2.1.0.rc2) devise (2.1.4)
bcrypt-ruby (~> 3.0) bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.7) orm_adapter (~> 0.1)
railties (~> 3.1) railties (~> 3.1)
warden (~> 1.1.1) warden (~> 1.2.1)
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
@ -40,7 +40,7 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
addressable (2.2.7) addressable (2.2.7)
arel (2.2.3) arel (2.2.3)
bcrypt-ruby (3.0.1) bcrypt-ruby (3.1.1)
bson (1.5.2) bson (1.5.2)
bson_ext (1.3.1) bson_ext (1.3.1)
builder (3.0.0) builder (3.0.0)
@ -87,7 +87,7 @@ GEM
omniauth-openid (1.0.1) omniauth-openid (1.0.1)
omniauth (~> 1.0) omniauth (~> 1.0)
rack-openid (~> 1.3.1) rack-openid (~> 1.3.1)
orm_adapter (0.0.7) orm_adapter (0.4.0)
polyglot (0.3.3) polyglot (0.3.3)
rack (1.3.6) rack (1.3.6)
rack-cache (1.2) rack-cache (1.2)
@ -137,7 +137,7 @@ GEM
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (0.3.33) tzinfo (0.3.33)
warden (1.1.1) warden (1.2.3)
rack (>= 1.0) rack (>= 1.0)
webrat (0.7.2) webrat (0.7.2)
nokogiri (>= 1.2.0) nokogiri (>= 1.2.0)

5
lib/devise/models/confirmable.rb
View file

@ -177,11 +177,6 @@ module Devise
generate_confirmation_token && save(:validate => false) generate_confirmation_token && save(:validate => false)
end end
def after_password_reset
super
confirm! unless confirmed?
end
def postpone_email_change_until_confirmation def postpone_email_change_until_confirmation
@reconfirmation_required = true @reconfirmation_required = true
self.unconfirmed_email = self.email self.unconfirmed_email = self.email

2
lib/devise/version.rb
View file

@ -1,3 +1,3 @@
module Devise module Devise
VERSION = "2.1.3".freeze VERSION = "2.1.4".freeze
end end

9
test/integration/recoverable_test.rb
View file

@ -201,15 +201,6 @@ class PasswordTest < ActionController::IntegrationTest
assert !warden.authenticated?(:user) assert !warden.authenticated?(:user)
end end
test 'sign in user automatically and confirm after changing its password if it\'s not confirmed' do
user = create_user(:confirm => false)
request_forgot_password
reset_password :reset_password_token => user.reload.reset_password_token
assert warden.authenticated?(:user)
assert user.reload.confirmed?
end
test 'reset password request with valid E-Mail in XML format should return valid response' do test 'reset password request with valid E-Mail in XML format should return valid response' do
create_user create_user
post user_password_path(:format => 'xml'), :user => {:email => "user@test.com"} post user_password_path(:format => 'xml'), :user => {:email => "user@test.com"}