1 files changed, 26 insertions, 12 deletions

diff --git a/plugins/Login/tests/Fixtures/PendingUsers.php b/plugins/Login/tests/Fixtures/PendingUsers.php
index 4be64378ac..fea4f24000 100644
--- a/plugins/Login/tests/Fixtures/PendingUsers.php
+++ b/plugins/Login/tests/Fixtures/PendingUsers.php
@@ -1,39 +1,40 @@
 <?php
+
 /**
  * Matomo - free/libre analytics platform
  *
  * @link    https://matomo.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
 namespace Piwik\Plugins\Login\tests\Fixtures;
 
-use Piwik\Date;
+use Piwik\Plugins\PrivacyManager\SystemSettings;
 use Piwik\Plugins\UsersManager\Model;
 use Piwik\Tests\Framework\Fixture;
 
 /**
- * Generates tracker testing data for our APITest
- *
- * This Simple fixture adds one website and tracks one visit with couple pageviews and an ecommerce conversion
+ * Simple fixture that creates a user with pending invitation
  */
 class PendingUsers extends Fixture
 {
-
     public $dateTime = '2013-01-23 01:23:45';
     public $idSite = 1;
-    public $users = array();
+    public $users = [];
 
 
-    public $pendingUser = array(
+    public $pendingUser = [
       'login' => '000pendingUser',
       'email' => 'pendinguser2light@example.com'
-    );
+    ];
 
     public $token = "13cb9dcef6cc70b02a640cee30dc8ce9";
 
     public function setUp(): void
     {
+        $this->setUpWebsite();
         $this->setUpUser();
+        $this->setUpTermsAndPrivacy();
     }
 
     public function tearDown(): void
@@ -45,10 +46,23 @@ class PendingUsers extends Fixture
     {
         $model = new Model();
         $model->addUser($this->pendingUser['login'], '', $this->pendingUser['email'], $this->dateTime, 1);
+        $model->attachInviteToken($this->pendingUser['login'], $this->token, 7);
+    }
 
-        $model->addTokenAuth($this->pendingUser['login'], $this->token, "Invite Token",
-          Date::now()->getDatetime(),
-          Date::now()->addDay(7)->getDatetime());
 
+    private function setUpWebsite()
+    {
+        if (!self::siteCreated($this->idSite)) {
+            $idSite = self::createWebsite($this->dateTime, $ecommerce = 1);
+            $this->assertSame($this->idSite, $idSite);
+        }
+    }
+
+    private function setUpTermsAndPrivacy()
+    {
+        $settings = new SystemSettings();
+        $settings->termsAndConditionUrl->setValue('matomo.org');
+        $settings->privacyPolicyUrl->setValue('matomo.org');
+        $settings->save();
     }
-}
\ No newline at end of file
+}