bugfix tests

Etienne Pallier
1 parent 93ab9e09
Showing 4 changed files with 33 additions and 8 deletions Show diff stats
src/Controller/UsersController.php
src/Template/Materiels/view.ctp
tests/Fixture/StatsFixture.php
tests/TestCase/Controller/General.php
@@ -265,6 +265,7 @@ class UsersController extends AppController
         $user_fullname = $this->_getCurrentUserFullNameFromSession($session_user);
         //debug($user_fullname);
         // "Pallier Etienne"
+        
         return $this->Users->find()->where(['nom'=>$user_fullname])->first();
     }
@@ -236,11 +236,12 @@ $CAN_PRINT_LABEL = $IS_VALIDATED &amp;&amp; $configuration-&gt;hasPrinter &amp;&amp; $USER_IS_ADMIN
-    <!-- QRCODE (Url) -->
+    <!-- 1) QRCODE (Url) -->
+    
     <?php
     //debug($this->request->env('HTTP_REFERER')); // 'http://labinvent.test/materiels'
     //debug($this->request);
-    // 1) Création
+    // - a) Création
     //$proto = $this->request->env('REQUEST_SCHEME');
     //$proto = $this->request->env('HTTP_REFERER');
     $proto = $this->request->getEnv('HTTP_REFERER');
@@ -256,7 +257,7 @@ $CAN_PRINT_LABEL = $IS_VALIDATED &amp;&amp; $configuration-&gt;hasPrinter &amp;&amp; $USER_IS_ADMIN
     // Il faut normalement remplacer requestAction par un view Cell
     $this->requestAction('/QrCodes/creer/');
-    // 2) Affichage
+    // - b) Affichage
 	//echo '<div id="qrcode" style="text-align: left;">';
 	?>
 	<div id="qrcode">
@@ -271,7 +272,8 @@ $CAN_PRINT_LABEL = $IS_VALIDATED &amp;&amp; $configuration-&gt;hasPrinter &amp;&amp; $USER_IS_ADMIN
     </div>
-	<!-- 0 à N IMAGE(S) -->
+	<!-- 2) IMAGE(S) -->
+	
 	<div id="materiel_images">
     <!--  <div id="materiel_images" style="text-align: center;"> -->
     	<?php
@@ -8,11 +8,17 @@ use Cake\TestSuite\Fixture\TestFixture;
  */
 class StatsFixture extends TestFixture
 {
+    
+    // (EP) pour éviter d'avoir à décrire les champs
+    public $import = ['model' => 'Stats'];
+    
     /**
      * Fields
      *
      * @var array
      */
+    
+    /* (EP)
     // @codingStandardsIgnoreStart
     public $fields = [
         'year' => ['type' => 'string', 'length' => null, 'null' => false, 'default' => null, 'collate' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
@@ -34,6 +40,8 @@ class StatsFixture extends TestFixture
             'collation' => 'latin1_swedish_ci'
         ],
     ];
+    */
+    
     // @codingStandardsIgnoreEnd
     /**
      * Init method
@@ -42,6 +50,9 @@ class StatsFixture extends TestFixture
      */
     public function init()
     {
+        // (EP)
+        $this->records = [];
+        /*
         $this->records = [
             [
                 'year' => 'a4a821dd-3174-4fa5-9672-b2d5b3d9903c',
@@ -52,6 +63,7 @@ class StatsFixture extends TestFixture
                 'connex_dur' => 1
             ],
         ];
+        */
         parent::init();
     }
 }
@@ -400,27 +400,33 @@ class General extends TestCase {
         }
     }
+    // authUser('login', 'Prenom', 'Nom');
+    // ex: $this->authUser('u1SUPER', 'user1', 'SUPER');
     // ex: $this->authUser('user5_USER', 'test9', 'test0');
-    private function authUser($cn, $givenName='test1', $sn='test2') {
+    private function authUser($login, $givenName='test1', $name='test2') {
         $user = [
             'Auth' => [
                 'User' => [
+                    // Nom
                     'sn' => [
-                        0 => $sn
+                        0 => $name
                     ],
+                    // Email (normalement prenom.nom@test.fr)
                     'mail' => [
                         0 => 'testa@test.fr'
                     ],
+                    // Prenom
                     'givenname' => [
                         0 => $givenName
                     ],
+                    // LOGIN (normalement epallier)
                     /*
                     'cn' => [
                         0 => $cn
                     ],
                     */
                     'uid' => [
-                        0 => $cn
+                        0 => $login
                     ],
                     'userpassword' => [
                         0 => 'test'
@@ -440,7 +446,11 @@ class General extends TestCase {
     }
     public function authSuperAdmin() {
-        $this->authUser('user1_SUPER', 'user1', 'SUPER');
+        
+        //$this->authUser('login', 'Prenom', 'Nom');
+        $this->authUser('u1SUPER', 'user1', 'SUPER');
+        ///$this->authUser('user1_SUPER', 'user1', 'SUPER');
+        
         //$this->authUser('user1_SUPER', 'test1', 'test2');
         //$this->authUser('testa', 'user1', 'SUPER');
     }