tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-28 23:49:26 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8900 from creative-commoners/pulls/4.3/test-state-isolation

Browse Source 
MemberTest and SecurityTest now set the default authenticator to use
This commit is contained in:
Guy Marriott 2019-04-05 11:49:14 +13:00 committed by GitHub
commit e9fe68c06c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/php/Security/MemberTest.php
View File

@ -46,6 +46,17 @@ class MemberTest extends FunctionalTest
//This is because the test relies on the yaml file being interpreted according to a particular date format
//and this setup occurs before the setUp method is run
i18n::config()->set('default_locale', 'en_US');
// Set the default authenticator to use for these tests
Injector::inst()->load([
Security::class => [
'properties' => [
'Authenticators' => [
'default' => '%$' . MemberAuthenticator::class,
],
],
],
]);
}
/**
@ -393,6 +404,7 @@ class MemberTest extends FunctionalTest
$member->PasswordExpiry = date('Y-m-d', time() + 86400);
$this->assertFalse($member->isPasswordExpired());
}
public function testInGroups()
{
/** @var Member $staffmember */
@ -844,8 +856,8 @@ class MemberTest extends FunctionalTest
$fields = $member->getCMSFields();
/**
* @skipUpgrade
*/
* @skipUpgrade
*/
$this->assertNotNull($fields->dataFieldByName('Email'), 'Scaffolded fields are retained');
$this->assertNull($fields->dataFieldByName('Salt'), 'Field modifications run correctly');
$this->assertNotNull($fields->dataFieldByName('TestMemberField'), 'Extension is applied correctly');

12
tests/php/Security/SecurityTest.php
View File

@ -10,6 +10,7 @@ use SilverStripe\Control\HTTPResponse;
use SilverStripe\Control\Session;
use SilverStripe\Core\Config\Config;
use SilverStripe\Core\Convert;
use SilverStripe\Core\Injector\Injector;
use SilverStripe\Dev\FunctionalTest;
use SilverStripe\i18n\i18n;
use SilverStripe\ORM\DataObject;
@ -47,6 +48,17 @@ class SecurityTest extends FunctionalTest
Config::modify()->set(MemberAuthenticator::class, 'authenticators', []);
Config::modify()->set(MemberAuthenticator::class, 'default_authenticator', MemberAuthenticator::class);
// Set the default authenticator to use for these tests
Injector::inst()->load([
Security::class => [
'properties' => [
'Authenticators' => [
'default' => '%$' . MemberAuthenticator::class,
],
],
],
]);
/**
* @skipUpgrade
*/