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

Use _ instead of .

Browse source
This commit is contained in:
José Valim 2010-02-08 17:15:12 +01:00
parent 445070f6ec
commit 54cd2cc0e8
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/registrations_controller.rb
View file

@ -7,7 +7,7 @@ class RegistrationsController < ApplicationController
self.resource = resource_class.new(params[resource_name]) self.resource = resource_class.new(params[resource_name])
if resource.save if resource.save
flash[:"#{resource_name}.signed_up"] = true flash[:"#{resource_name}_signed_up"] = true
set_flash_message :notice, :signed_up set_flash_message :notice, :signed_up
sign_in_and_redirect(resource_name, resource) sign_in_and_redirect(resource_name, resource)
else else

7
app/controllers/sessions_controller.rb
View file

@ -8,7 +8,7 @@ class SessionsController < ApplicationController
def new def new
Devise::FLASH_MESSAGES.each do |message| Devise::FLASH_MESSAGES.each do |message|
set_now_flash_message :alert, message if params.try(:[], message) == "true" set_now_flash_message :alert, message if params.try(:[], message) == "true"
end unless flash[:"#{resource_name}.signed_up"] end unless resource_just_signed_up?
super super
end end
@ -30,4 +30,9 @@ class SessionsController < ApplicationController
sign_out_and_redirect(resource_name) sign_out_and_redirect(resource_name)
end end
protected
def resource_just_signed_up?
flash[:"#{resource_name}_signed_up"]
end
end end

8
test/integration/registerable_test.rb
View file

@ -31,15 +31,15 @@ class RegistrationTest < ActionController::IntegrationTest
fill_in 'password confirmation', :with => 'new_user123' fill_in 'password confirmation', :with => 'new_user123'
click_button 'Sign up' click_button 'Sign up'
assert_equal true, @controller.send(:flash)[:"user.signed_up"] assert_equal true, @controller.send(:flash)[:"user_signed_up"]
assert_equal "You have signed up successfully.", @controller.send(:flash)[:notice] assert_equal "You have signed up successfully.", @controller.send(:flash)[:notice]
# For some reason flash is not being set correctly, so instead of getting the # For some reason flash is not being set correctly, so instead of getting the
# "signed_up" message we get the unconfirmed one. Seems to be an issue with # "signed_up" message we get the unconfirmed one. Seems to be an issue with
# the internal redirect by the hook and the tests. # the internal redirect by the hook and the tests.
# follow_redirect! # follow_redirect!
# assert_contain 'You have signed up successfully.' # assert_contain 'You have signed up successfully.'
# assert_not_contain 'confirm your account' # assert_not_contain 'confirm your account'
assert_not warden.authenticated?(:user) assert_not warden.authenticated?(:user)