Download as
Browse Code »

Commit 62221a7decc1e19c665c37250ed1f59a9c7bd247

Authored by Rodrigo Souto
Committed by Antonio Terceiro
1 parent b041998d
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Password recovery looks after the environment to define the requestor 

(ActionItem1700)
Showing 2 changed files with 10 additions and 10 deletions   Show diff stats
app/models/change_password.rb
  Diff comments   View file @62221a7
... ... @@ -45,7 +45,7 @@ class ChangePassword < Task
45 45 end
46 46  
47 47 before_validation_on_create do |change_password|
48   - change_password.requestor = Person.find_by_identifier(change_password.login)
  48 + change_password.requestor = Person.find_by_identifier_and_environment_id(change_password.login, change_password.environment_id)
49 49 end
50 50  
51 51 ###################################################
... ...
test/unit/change_password_test.rb
  Diff comments   View file @62221a7
... ... @@ -119,17 +119,17 @@ class ChangePasswordTest < Test::Unit::TestCase
119 119 end
120 120  
121 121 should 'search for user in the correct environment' do
122   - e1 = Environment.create!(:id => 1, :name => "environment1")
123   - e2 = Environment.create!(:id => 2, :name => "environment2")
124   - p1 = create_user('sample-user', :password => 'test', :password_confirmation => 'test', :email => 'sample-user@e1.com', :environment => e1).person
125   - p2 = create_user('sample-user', :password => 'test', :password_confirmation => 'test', :email => 'sample-user@e2.com', :environment => e2).person
  122 + e1 = Environment.default
  123 + e2 = fast_create(Environment)
126 124  
127   - change = ChangePassword.new
128   - change.login = 'sample-user'
129   - change.email = 'sample-user@e2.com'
130   - change.environment_id = e2.id
  125 + p1 = create_user('sample-user', :password => 'test', :password_confirmation => 'test', :email => 'sample-user@test.com', :environment => e1).person
  126 + p2 = create_user('sample-user', :password => 'test', :password_confirmation => 'test', :email => 'sample-user@test.com', :environment => e2).person
131 127  
132   - assert change.valid?
  128 + c1 = ChangePassword.create!(:login => 'sample-user', :email => 'sample-user@test.com', :environment_id => e1.id)
  129 + c2 = ChangePassword.create!(:login => 'sample-user', :email => 'sample-user@test.com', :environment_id => e2.id)
  130 +
  131 + assert_equal c1.requestor, p1
  132 + assert_equal c2.requestor, p2
133 133 end
134 134  
135 135 end
... ...