From e4dfc243b4db9de0b15976cf160f854af6f78e3b Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 25 May 2010 04:24:53 +0000 Subject: [PATCH] BUGFIX Fixed SapphireTest->loginWithPermission() and MemberAuthenticatorTest to use existing Members based on their unique_identifier_field (if existing) to accommodate recent Member->onBeforeWrite() changes (see r100705) (from r100723) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105628 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- dev/SapphireTest.php | 4 +++- tests/security/MemberAuthenticatorTest.php | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dev/SapphireTest.php b/dev/SapphireTest.php index 8dc5be97d..ba5727d0f 100755 --- a/dev/SapphireTest.php +++ b/dev/SapphireTest.php @@ -694,7 +694,9 @@ class SapphireTest extends PHPUnit_Framework_TestCase { $permission->write(); $group->Permissions()->add($permission); - $member = new Member(); + $member = DataObject::get_one('Member', sprintf('"Email" = \'%s\'', "$permCode@example.org")); + if(!$member) $member = new Member(); + $member->FirstName = $permCode; $member->Surname = "User"; $member->Email = "$permCode@example.org"; diff --git a/tests/security/MemberAuthenticatorTest.php b/tests/security/MemberAuthenticatorTest.php index 74a926e08..4816aa112 100644 --- a/tests/security/MemberAuthenticatorTest.php +++ b/tests/security/MemberAuthenticatorTest.php @@ -12,7 +12,7 @@ class MemberAuthenticatorTest extends SapphireTest { $field=Member::get_unique_identifier_field(); - $member->$field = 'test@test.com'; + $member->$field = 'test1@test.com'; $member->PasswordEncryption = "sha1"; $member->Password = "mypassword"; $member->write(); @@ -35,7 +35,7 @@ class MemberAuthenticatorTest extends SapphireTest { $field=Member::get_unique_identifier_field(); $member = new Member(); - $member->$field = 'test@test.com'; + $member->$field = 'test2@test.com'; $member->PasswordEncryption = "crc32"; $member->Password = "mypassword"; $member->write();