From 123d4832134265dd28d0c9168eb6e5ce95dcb508 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Fri, 5 Apr 2019 11:22:27 +1300
Subject: [PATCH] MemberTest and SecurityTest now set the default authenticator
 to use

---
 tests/php/Security/MemberTest.php   | 16 ++++++++++++++--
 tests/php/Security/SecurityTest.php | 12 ++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/tests/php/Security/MemberTest.php b/tests/php/Security/MemberTest.php
index 9cd7e67b1..73ad15a6a 100644
--- a/tests/php/Security/MemberTest.php
+++ b/tests/php/Security/MemberTest.php
@@ -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');
diff --git a/tests/php/Security/SecurityTest.php b/tests/php/Security/SecurityTest.php
index b75be724c..54bc84ade 100644
--- a/tests/php/Security/SecurityTest.php
+++ b/tests/php/Security/SecurityTest.php
@@ -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
          */