1 files changed, 52 insertions, 38 deletions

diff --git a/plugins/UsersManager/tests/Fixtures/ManyUsers.php b/plugins/UsersManager/tests/Fixtures/ManyUsers.php
index 2fa2607f4a..66da0384a4 100644
--- a/plugins/UsersManager/tests/Fixtures/ManyUsers.php
+++ b/plugins/UsersManager/tests/Fixtures/ManyUsers.php
@@ -1,10 +1,12 @@
 <?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\UsersManager\tests\Fixtures;
 
 use Piwik\Date;
@@ -28,48 +30,56 @@ class ManyUsers extends Fixture
     public $siteCopyCount;
     public $userCopyCount;
     public $addTextSuffixes;
-    public $users = array();
-
-    public $baseUsers = array(
-        'login1' => array('superuser' => 1),
-        'login2' => array('view' => array(3,5),   'admin' => array(1,2,6)),
-        'login3' => array('view' => array(),        'admin' => array()), // no access to any site
-        'login4' => array('view' => array(6),       'admin' => array()), // only access to one with view
-        'login5' => array('view' => array(),        'admin' => array(3)), // only access to one with admin
-        'login6' => array('view' => array(),        'admin' => array(6,3)), // access to a couple of sites with admin
-        'login7' => array('view' => array(2,1,6,3), 'admin' => array()), // access to a couple of sites with view
-        'login8' => array('view' => array(4,7),     'admin' => array(2,5)), // access to a couple of sites with admin and view
-        'login9' => array('view' => array(5,6),     'admin' => array(8,9)),
-        'login10' => array('superuser' => 1)
-    );
-
-    public $pendingUser = array(
-      'login'=>'000pendingUser1',
-      'email'=>'pendinguser1light@example.com'
-    );
+    public $users = [];
+
+    public $baseUsers = [
+        'login1' => ['superuser' => 1],
+        'login2' => ['view' => [3, 5], 'admin' => [1, 2, 6]],
+        'login3' => ['view' => [], 'admin' => []], // no access to any site
+        'login4' => ['view' => [6], 'admin' => []], // only access to one with view
+        'login5' => ['view' => [], 'admin' => [3]], // only access to one with admin
+        'login6' => ['view' => [], 'admin' => [6, 3]], // access to a couple of sites with admin
+        'login7' => ['view' => [2, 1, 6, 3], 'admin' => []], // access to a couple of sites with view
+        'login8' => ['view' => [4, 7], 'admin' => [2, 5]], // access to a couple of sites with admin and view
+        'login9' => ['view' => [5, 6], 'admin' => [8, 9]],
+        'login10' => ['superuser' => 1]
+    ];
+
+    public $pendingUser = [
+      'login' => '000pendingUser1',
+      'email' => 'pendinguser1light@example.com'
+    ];
+
+    public $pendingUser2 = [
+      'login' => 'zzzpendingUser2',
+      'email' => 'zpendinguser2light@example.com'
+    ];
 
     public $baseSites = [
-        'sleep',
-        'escapesequence',
-        'hunter',
-        'transistor',
-        'wicket',
-        'relentless',
-        'scarecrow',
-        'nova',
-        'resilience',
-        'tricks',
+      'sleep',
+      'escapesequence',
+      'hunter',
+      'transistor',
+      'wicket',
+      'relentless',
+      'scarecrow',
+      'nova',
+      'resilience',
+      'tricks',
     ];
 
     public $textAdditions = [
-        'life',
-        'light',
-        'flight',
-        'conchords',
+      'life',
+      'light',
+      'flight',
+      'conchords',
     ];
 
-    public function __construct($userCopyCount = self::USER_COUNT, $siteCopyCount = self::SITE_COUNT, $addTextSuffixes = true)
-    {
+    public function __construct(
+        $userCopyCount = self::USER_COUNT,
+        $siteCopyCount = self::SITE_COUNT,
+        $addTextSuffixes = true
+    ) {
         $this->userCopyCount = $userCopyCount;
         $this->siteCopyCount = $siteCopyCount;
         $this->addTextSuffixes = $addTextSuffixes;
@@ -105,7 +115,7 @@ class ManyUsers extends Fixture
         $api = API::getInstance();
 
         // add a pending invite user
-        $api->inviteUser($this->pendingUser['login'],  $this->pendingUser['email'],1);
+        $api->inviteUser($this->pendingUser['login'], $this->pendingUser['email'], 1);
 
         for ($i = 0; $i != $this->userCopyCount; ++$i) {
             $addToEmail = $i % 2 == 0;
@@ -121,7 +131,7 @@ class ManyUsers extends Fixture
                 }
 
                 $email = $login . '@example.com';
-                if ($this->addTextSuffixes &&$addToEmail) {
+                if ($this->addTextSuffixes && $addToEmail) {
                     $email = $login . $textAddition . '@example.com';
                 }
 
@@ -147,5 +157,9 @@ class ManyUsers extends Fixture
                 $this->users[$login]['token'] = $tokenAuth;
             }
         }
+
+        //add admin view pending user
+        $api->inviteUser($this->pendingUser2['login'], $this->pendingUser2['email'], 1);
+        $model->updateUserFields($this->pendingUser2['login'], ['invited_by' => 'login2']);
     }
-}
\ No newline at end of file
+}