From 62221a7decc1e19c665c37250ed1f59a9c7bd247 Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Thu, 23 Sep 2010 11:49:35 -0300 Subject: [PATCH] Password recovery looks after the environment to define the requestor --- app/models/change_password.rb | 2 +- test/unit/change_password_test.rb | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/models/change_password.rb b/app/models/change_password.rb index 76836a5..90b11cd 100644 --- a/app/models/change_password.rb +++ b/app/models/change_password.rb @@ -45,7 +45,7 @@ class ChangePassword < Task end before_validation_on_create do |change_password| - change_password.requestor = Person.find_by_identifier(change_password.login) + change_password.requestor = Person.find_by_identifier_and_environment_id(change_password.login, change_password.environment_id) end ################################################### diff --git a/test/unit/change_password_test.rb b/test/unit/change_password_test.rb index e858ea2..a11ffef 100644 --- a/test/unit/change_password_test.rb +++ b/test/unit/change_password_test.rb @@ -119,17 +119,17 @@ class ChangePasswordTest < Test::Unit::TestCase end should 'search for user in the correct environment' do - e1 = Environment.create!(:id => 1, :name => "environment1") - e2 = Environment.create!(:id => 2, :name => "environment2") - p1 = create_user('sample-user', :password => 'test', :password_confirmation => 'test', :email => 'sample-user@e1.com', :environment => e1).person - p2 = create_user('sample-user', :password => 'test', :password_confirmation => 'test', :email => 'sample-user@e2.com', :environment => e2).person + e1 = Environment.default + e2 = fast_create(Environment) - change = ChangePassword.new - change.login = 'sample-user' - change.email = 'sample-user@e2.com' - change.environment_id = e2.id + p1 = create_user('sample-user', :password => 'test', :password_confirmation => 'test', :email => 'sample-user@test.com', :environment => e1).person + p2 = create_user('sample-user', :password => 'test', :password_confirmation => 'test', :email => 'sample-user@test.com', :environment => e2).person - assert change.valid? + c1 = ChangePassword.create!(:login => 'sample-user', :email => 'sample-user@test.com', :environment_id => e1.id) + c2 = ChangePassword.create!(:login => 'sample-user', :email => 'sample-user@test.com', :environment_id => e2.id) + + assert_equal c1.requestor, p1 + assert_equal c2.requestor, p2 end end -- libgit2 0.21.2