Commit 937909364875eb0f649e71264507eb75b82e8c88

Authored by Etienne Pallier
1 parent d97add88
Exists in master and in 1 other branch dev

Tests Fixtures => toutes simplifiées

pour utiliser le format de la table de prod par défaut

v4.102.0-3.7.9
CHANGES.txt
... ... @@ -94,6 +94,10 @@ Outre ces changements, voici d'autres changements importants :
94 94 ======= CHANGES =======
95 95  
96 96 -------
  97 +17/09/2020 v4.102.0-3.7.9 (EP)
  98 + - (i) Tests Fixtures => toutes simplifiées pour utiliser le format de la table de prod par défaut
  99 +
  100 +-------
97 101 17/09/2020 v4.101.13-3.7.9 (EP)
98 102 - (i) updated tests ok
99 103 - (e) date réception => "date livraison", et ne doit pas être future
... ...
README.md
... ... @@ -43,7 +43,7 @@ Logiciel testé et validé sur les configurations suivantes :
43 43 --------------------------------------------------------------------------------------------
44 44  
45 45 Date: 15/09/2020
46   -Version: 4.101.13-3.7.9
  46 +Version: 4.102.0-3.7.9
47 47  
48 48  
49 49 HISTORIQUE DES CHANGEMENTS DE VERSION : voir le fichier CHANGES.txt (ou la page web /pages/changes)
... ...
src/Controller/AppController.php
... ... @@ -2815,12 +2815,12 @@ class AppController extends Controller
2815 2815 if ($materiel->groupes_metier_id) {
2816 2816 // Le ..!= 1 c'est parce que le groupe métier/thématique d'id 1 correspond au groupe N/A, soit aucun groupe
2817 2817 $mailsRespMetier = TableRegistry::getTableLocator()->get('Users')->find()
2818   - ->select('email')
2819   - ->where([
2820   - 'role =' => 'Responsable',
2821   - 'groupes_metier_id =' => $materiel->groupes_metier_id
2822   - ])
2823   - ->toArray();
  2818 + ->select('email')
  2819 + ->where([
  2820 + 'role =' => 'Responsable',
  2821 + 'groupes_metier_id =' => $materiel->groupes_metier_id
  2822 + ])
  2823 + ->toArray();
2824 2824 }
2825 2825  
2826 2826 //TODO: changer ça car c'est pas forcément id=1
... ... @@ -2828,12 +2828,12 @@ class AppController extends Controller
2828 2828 if ($materiel->groupes_thematique_id) {
2829 2829 // Le ..!= 1 c'est parce que le groupe métier/thématique d'id 1 correspond au groupe N/A, soit aucun groupe
2830 2830 $mailRespThematique = TableRegistry::getTableLocator()->get('Users')->find()
2831   - ->select('email')
2832   - ->where([
2833   - 'role =' => 'Responsable',
2834   - 'groupes_thematique_id =' => $materiel->groupes_thematique_id
2835   - ])
2836   - ->toArray();
  2831 + ->select('email')
  2832 + ->where([
  2833 + 'role =' => 'Responsable',
  2834 + 'groupes_thematique_id =' => $materiel->groupes_thematique_id
  2835 + ])
  2836 + ->toArray();
2837 2837 }
2838 2838  
2839 2839 if ($mailsRespMetier != [] || $mailRespThematique != []) {
... ...
tests/Fixture/CategoriesFixture.php
... ... @@ -10,11 +10,13 @@ use Cake\TestSuite\Fixture\TestFixture;
10 10 class CategoriesFixture extends TestFixture
11 11 {
12 12  
  13 + public $import = ['model' => 'Categories'];
13 14 /**
14 15 * Fields
15 16 *
16 17 * @var array
17 18 */
  19 + /*
18 20 // @codingStandardsIgnoreStart
19 21 public $fields = [
20 22 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
... ... @@ -34,6 +36,7 @@ class CategoriesFixture extends TestFixture
34 36 ],
35 37 ];
36 38 // @codingStandardsIgnoreEnd
  39 + */
37 40  
38 41 /**
39 42 * Records
... ...
tests/Fixture/ConfigurationsFixture.php
... ... @@ -10,15 +10,13 @@ use Cake\TestSuite\Fixture\TestFixture;
10 10 class ConfigurationsFixture extends TestFixture
11 11 {
12 12  
13   - //public $import = ['table' => 'materiels'];
14   - // ou encore :
15   - //public $import = ['model' => 'Materiels'];
16   -
  13 + public $import = ['model' => 'Configurations'];
17 14 /**
18 15 * Fields
19 16 *
20 17 * @var array
21 18 */
  19 + /*
22 20 // @codingStandardsIgnoreStart
23 21 public $fields = [
24 22 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
... ... @@ -43,8 +41,12 @@ class ConfigurationsFixture extends TestFixture
43 41  
44 42 'nom_groupe_thematique' => ['type' => 'string', 'length' => 45, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
45 43 'nom_groupe_metier' => ['type' => 'string', 'length' => 45, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
46   - 'envoi_mail_management_dev' => ['type' => 'boolean', 'length' => null, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null],
47   - 'sender_mail' => ['type' => 'string', 'length' => 500, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
  44 + //'envoi_mail_management_dev' => ['type' => 'boolean', 'length' => null, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null],
  45 +
  46 + 'envoi_mail' => ['type' => 'boolean', 'length' => null, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null],
  47 + 'envoi_mail_guests' => ['type' => 'boolean', 'length' => null, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null],
  48 +
  49 + 'sender_mail' => ['type' => 'string', 'length' => 500, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
48 50 'emailGuest1' => ['type' => 'string', 'length' => 45, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
49 51 'emailGuest2' => ['type' => 'string', 'length' => 45, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
50 52 'emailGuest3' => ['type' => 'string', 'length' => 45, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
... ... @@ -74,6 +76,7 @@ class ConfigurationsFixture extends TestFixture
74 76 ],
75 77 ];
76 78 // @codingStandardsIgnoreEnd
  79 + */
77 80  
78 81 /**
79 82 * Records
... ... @@ -117,8 +120,10 @@ class ConfigurationsFixture extends TestFixture
117 120 'nom_groupe_thematique' => 'Lorem ipsum dolor sit amet',
118 121 'nom_groupe_metier' => 'Lorem ipsum dolor sit amet',
119 122  
120   - 'envoi_mail_management_dev' => 1,
121   - 'sender_mail' => 'ezarear@localhost.com',
  123 + //'envoi_mail_management_dev' => 1,
  124 + 'envoi_mail' => 1,
  125 + //'envoi_mail_guests' => 0,
  126 + 'sender_mail' => 'ezarear@localhost.com',
122 127 'emailGuest1' => 'Lorem ipsum dolor sit amet',
123 128 'emailGuest2' => 'Lorem ipsum dolor sit amet',
124 129 'emailGuest3' => 'Lorem ipsum dolor sit amet',
... ...
tests/Fixture/DocumentsFixture.php
... ... @@ -10,11 +10,13 @@ use Cake\TestSuite\Fixture\TestFixture;
10 10 class DocumentsFixture extends TestFixture
11 11 {
12 12  
  13 + public $import = ['model' => 'Documents'];
13 14 /**
14 15 * Fields
15 16 *
16 17 * @var array
17 18 */
  19 + /*
18 20 // @codingStandardsIgnoreStart
19 21 public $fields = [
20 22 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
... ... @@ -41,6 +43,7 @@ class DocumentsFixture extends TestFixture
41 43 ],
42 44 ];
43 45 // @codingStandardsIgnoreEnd
  46 + */
44 47  
45 48 /**
46 49 * Records
... ...
tests/Fixture/EmpruntsFixture.php
... ... @@ -10,11 +10,13 @@ use Cake\TestSuite\Fixture\TestFixture;
10 10 class EmpruntsFixture extends TestFixture
11 11 {
12 12  
  13 + public $import = ['model' => 'Emprunts'];
13 14 /**
14 15 * Fields
15 16 *
16 17 * @var array
17 18 */
  19 + /*
18 20 // @codingStandardsIgnoreStart
19 21 public $fields = [
20 22 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
... ... @@ -48,6 +50,7 @@ class EmpruntsFixture extends TestFixture
48 50 ],
49 51 ];
50 52 // @codingStandardsIgnoreEnd
  53 + */
51 54  
52 55 /**
53 56 * Records
... ...
tests/Fixture/FakeldapusersFixture.php
... ... @@ -10,11 +10,13 @@ use Cake\TestSuite\Fixture\TestFixture;
10 10 class FakeldapusersFixture extends TestFixture
11 11 {
12 12  
  13 + public $import = ['model' => 'Fakeldapusers'];
13 14 /**
14 15 * Fields
15 16 *
16 17 * @var array
17 18 */
  19 + /*
18 20 // @codingStandardsIgnoreStart
19 21 public $fields = [
20 22 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
... ... @@ -33,6 +35,7 @@ class FakeldapusersFixture extends TestFixture
33 35 ],
34 36 ];
35 37 // @codingStandardsIgnoreEnd
  38 + */
36 39  
37 40 /**
38 41 * Records
... ...
tests/Fixture/FichemetrologiquesFixture.php
... ... @@ -3,6 +3,7 @@ namespace App\Test\Fixture;
3 3  
4 4 use Cake\TestSuite\Fixture\TestFixture;
5 5  
  6 +
6 7 /**
7 8 * FichemetrologiquesFixture
8 9 *
... ... @@ -10,12 +11,15 @@ use Cake\TestSuite\Fixture\TestFixture;
10 11 class FichemetrologiquesFixture extends TestFixture
11 12 {
12 13  
  14 + public $import = ['model' => 'Fichemetrologiques'];
  15 +
13 16 /**
14 17 * Fields
15 18 *
16 19 * @var array
17 20 */
18 21 // @codingStandardsIgnoreStart
  22 + /*
19 23 public $fields = [
20 24 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
21 25 'suivi_id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
... ... @@ -58,5 +62,7 @@ class FichemetrologiquesFixture extends TestFixture
58 62 'collation' => 'latin1_swedish_ci'
59 63 ],
60 64 ];
  65 + // @codingStandardsIgnoreEnd
  66 + */
61 67  
62 68 }
... ...
tests/Fixture/FormulesFixture.php
... ... @@ -10,11 +10,13 @@ use Cake\TestSuite\Fixture\TestFixture;
10 10 class FormulesFixture extends TestFixture
11 11 {
12 12  
  13 + public $import = ['model' => 'Formules'];
13 14 /**
14 15 * Fields
15 16 *
16 17 * @var array
17 18 */
  19 + /*
18 20 // @codingStandardsIgnoreStart
19 21 public $fields = [
20 22 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
... ... @@ -32,6 +34,7 @@ class FormulesFixture extends TestFixture
32 34 ],
33 35 ];
34 36 // @codingStandardsIgnoreEnd
  37 + */
35 38  
36 39  
37 40 }
... ...
tests/Fixture/FournisseursFixture.php
... ... @@ -10,11 +10,14 @@ use Cake\TestSuite\Fixture\TestFixture;
10 10 class FournisseursFixture extends TestFixture
11 11 {
12 12  
  13 + public $import = ['model' => 'Fournisseurs'];
  14 +
13 15 /**
14 16 * Fields
15 17 *
16 18 * @var array
17 19 */
  20 + /*
18 21 // @codingStandardsIgnoreStart
19 22 public $fields = [
20 23 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
... ... @@ -28,6 +31,7 @@ class FournisseursFixture extends TestFixture
28 31 ],
29 32 ];
30 33 // @codingStandardsIgnoreEnd
  34 + */
31 35  
32 36 /**
33 37 * Records
... ...
tests/Fixture/GroupesMetiersFixture.php
... ... @@ -10,11 +10,13 @@ use Cake\TestSuite\Fixture\TestFixture;
10 10 class GroupesMetiersFixture extends TestFixture
11 11 {
12 12  
  13 + public $import = ['model' => 'GroupesMetiers'];
13 14 /**
14 15 * Fields
15 16 *
16 17 * @var array
17 18 */
  19 + /*
18 20 // @codingStandardsIgnoreStart
19 21 public $fields = [
20 22 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
... ... @@ -29,6 +31,7 @@ class GroupesMetiersFixture extends TestFixture
29 31 ],
30 32 ];
31 33 // @codingStandardsIgnoreEnd
  34 + */
32 35  
33 36 /**
34 37 * Records
... ...
tests/Fixture/GroupesThematiquesFixture.php
... ... @@ -10,11 +10,13 @@ use Cake\TestSuite\Fixture\TestFixture;
10 10 class GroupesThematiquesFixture extends TestFixture
11 11 {
12 12  
  13 + public $import = ['model' => 'GroupesThematiques'];
13 14 /**
14 15 * Fields
15 16 *
16 17 * @var array
17 18 */
  19 + /*
18 20 // @codingStandardsIgnoreStart
19 21 public $fields = [
20 22 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
... ... @@ -29,6 +31,7 @@ class GroupesThematiquesFixture extends TestFixture
29 31 ],
30 32 ];
31 33 // @codingStandardsIgnoreEnd
  34 + */
32 35  
33 36 /**
34 37 * Records
... ...
tests/Fixture/MesuresFixture.php
... ... @@ -10,11 +10,13 @@ use Cake\TestSuite\Fixture\TestFixture;
10 10 class MesuresFixture extends TestFixture
11 11 {
12 12  
  13 + public $import = ['model' => 'Mesures'];
13 14 /**
14 15 * Fields
15 16 *
16 17 * @var array
17 18 */
  19 + /*
18 20 // @codingStandardsIgnoreStart
19 21 public $fields = [
20 22 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
... ... @@ -33,5 +35,7 @@ class MesuresFixture extends TestFixture
33 35 'collation' => 'latin1_swedish_ci'
34 36 ],
35 37 ];
  38 + // @codingStandardsIgnoreEnd
  39 + */
36 40  
37 41 }
... ...
tests/Fixture/OrganismesFixture.php
... ... @@ -10,11 +10,13 @@ use Cake\TestSuite\Fixture\TestFixture;
10 10 class OrganismesFixture extends TestFixture
11 11 {
12 12  
  13 + public $import = ['model' => 'Organismes'];
13 14 /**
14 15 * Fields
15 16 *
16 17 * @var array
17 18 */
  19 + /*
18 20 // @codingStandardsIgnoreStart
19 21 public $fields = [
20 22 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
... ... @@ -28,6 +30,7 @@ class OrganismesFixture extends TestFixture
28 30 ],
29 31 ];
30 32 // @codingStandardsIgnoreEnd
  33 + */
31 34  
32 35 /**
33 36 * Records
... ...
tests/Fixture/ProjetsFixture.php
... ... @@ -8,11 +8,29 @@ use Cake\TestSuite\Fixture\TestFixture;
8 8 */
9 9 class ProjetsFixture extends TestFixture
10 10 {
  11 +
  12 + /*
  13 + * (EP202009)
  14 + *
  15 + * Pour importer automatiquement la définition de la table projets
  16 + * (https://book.cakephp.org/3/en/development/testing.html#importing-table-information)
  17 + *
  18 + */
  19 + public $import = ['model' => 'Projets'];
  20 + /*
  21 + * Si on n'utilise pas la variable $import ci-dessus,
  22 + * alors il faut définir tous les champs utilisés,
  23 + * comme ci-dessous, avec la variable $fields,
  24 + * GALÈRE !!!
  25 + *
  26 + */
  27 +
11 28 /**
12 29 * Fields
13 30 *
14 31 * @var array
15 32 */
  33 + /*
16 34 // @codingStandardsIgnoreStart
17 35 public $fields = [
18 36 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
... ... @@ -43,6 +61,9 @@ class ProjetsFixture extends TestFixture
43 61 ],
44 62 ];
45 63 // @codingStandardsIgnoreEnd
  64 + */
  65 +
  66 +
46 67 /**
47 68 * Init method
48 69 *
... ...
tests/Fixture/SitesFixture.php
... ... @@ -10,11 +10,13 @@ use Cake\TestSuite\Fixture\TestFixture;
10 10 class SitesFixture extends TestFixture
11 11 {
12 12  
  13 + public $import = ['model' => 'Sites'];
13 14 /**
14 15 * Fields
15 16 *
16 17 * @var array
17 18 */
  19 + /*
18 20 // @codingStandardsIgnoreStart
19 21 public $fields = [
20 22 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
... ... @@ -28,6 +30,7 @@ class SitesFixture extends TestFixture
28 30 ],
29 31 ];
30 32 // @codingStandardsIgnoreEnd
  33 + */
31 34  
32 35 /**
33 36 * Records
... ...
tests/Fixture/SousCategoriesFixture.php
... ... @@ -10,11 +10,13 @@ use Cake\TestSuite\Fixture\TestFixture;
10 10 class SousCategoriesFixture extends TestFixture
11 11 {
12 12  
  13 + public $import = ['model' => 'SousCategories'];
13 14 /**
14 15 * Fields
15 16 *
16 17 * @var array
17 18 */
  19 + /*
18 20 // @codingStandardsIgnoreStart
19 21 public $fields = [
20 22 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
... ... @@ -33,6 +35,7 @@ class SousCategoriesFixture extends TestFixture
33 35 ],
34 36 ];
35 37 // @codingStandardsIgnoreEnd
  38 + */
36 39  
37 40 /**
38 41 * Records
... ...
tests/Fixture/SuivisFixture.php
... ... @@ -10,11 +10,13 @@ use Cake\TestSuite\Fixture\TestFixture;
10 10 class SuivisFixture extends TestFixture
11 11 {
12 12  
  13 + public $import = ['model' => 'Suivis'];
13 14 /**
14 15 * Fields
15 16 *
16 17 * @var array
17 18 */
  19 + /*
18 20 // @codingStandardsIgnoreStart
19 21 public $fields = [
20 22 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
... ... @@ -23,10 +25,10 @@ class SuivisFixture extends TestFixture
23 25 'date_controle' => ['type' => 'date', 'length' => null, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null],
24 26 'date_prochain_controle' => ['type' => 'date', 'length' => null, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null],
25 27 'type_suivi_id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'autoIncrement' => null],
26   - /* (EP) désormais inutiles car on prend ceux du materiel => ils sont donc "null" par défaut
  28 + /S (EP) désormais inutiles car on prend ceux du materiel => ils sont donc "null" par défaut
27 29 'groupes_metier_id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'autoIncrement' => null],
28 30 'groupes_thematique_id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'autoIncrement' => null],
29   - */
  31 + S/
30 32 'groupes_metier_id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'autoIncrement' => null],
31 33 'groupes_thematique_id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'autoIncrement' => null],
32 34 'organisme' => ['type' => 'string', 'length' => 50, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null, 'fixed' => null],
... ... @@ -57,6 +59,7 @@ class SuivisFixture extends TestFixture
57 59 ],
58 60 ];
59 61 // @codingStandardsIgnoreEnd
  62 + */
60 63  
61 64 /**
62 65 * Records
... ...
tests/Fixture/SurCategoriesFixture.php
... ... @@ -10,11 +10,13 @@ use Cake\TestSuite\Fixture\TestFixture;
10 10 class SurCategoriesFixture extends TestFixture
11 11 {
12 12  
  13 + public $import = ['model' => 'SurCategories'];
13 14 /**
14 15 * Fields
15 16 *
16 17 * @var array
17 18 */
  19 + /*
18 20 // @codingStandardsIgnoreStart
19 21 public $fields = [
20 22 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
... ... @@ -29,6 +31,7 @@ class SurCategoriesFixture extends TestFixture
29 31 ],
30 32 ];
31 33 // @codingStandardsIgnoreEnd
  34 + */
32 35  
33 36 /**
34 37 * Records
... ...
tests/Fixture/TypeDocumentsFixture.php
... ... @@ -10,11 +10,13 @@ use Cake\TestSuite\Fixture\TestFixture;
10 10 class TypeDocumentsFixture extends TestFixture
11 11 {
12 12  
  13 + public $import = ['model' => 'TypeDocuments'];
13 14 /**
14 15 * Fields
15 16 *
16 17 * @var array
17 18 */
  19 + /*
18 20 // @codingStandardsIgnoreStart
19 21 public $fields = [
20 22 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
... ... @@ -28,6 +30,7 @@ class TypeDocumentsFixture extends TestFixture
28 30 ],
29 31 ];
30 32 // @codingStandardsIgnoreEnd
  33 + */
31 34  
32 35 /**
33 36 * Records
... ...
tests/Fixture/TypeSuivisFixture.php
... ... @@ -10,11 +10,13 @@ use Cake\TestSuite\Fixture\TestFixture;
10 10 class TypeSuivisFixture extends TestFixture
11 11 {
12 12  
  13 + public $import = ['model' => 'TypeSuivis'];
13 14 /**
14 15 * Fields
15 16 *
16 17 * @var array
17 18 */
  19 + /*
18 20 // @codingStandardsIgnoreStart
19 21 public $fields = [
20 22 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
... ... @@ -28,6 +30,7 @@ class TypeSuivisFixture extends TestFixture
28 30 ],
29 31 ];
30 32 // @codingStandardsIgnoreEnd
  33 + */
31 34  
32 35 /**
33 36 * Records
... ...
tests/Fixture/UnitesFixture.php
... ... @@ -9,12 +9,14 @@ use Cake\TestSuite\Fixture\TestFixture;
9 9 */
10 10 class UnitesFixture extends TestFixture
11 11 {
12   -
  12 +
  13 + public $import = ['model' => 'Unites'];
13 14 /**
14 15 * Fields
15 16 *
16 17 * @var array
17 18 */
  19 + /*
18 20 // @codingStandardsIgnoreStart
19 21 public $fields = [
20 22 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
... ... @@ -29,6 +31,7 @@ class UnitesFixture extends TestFixture
29 31 ],
30 32 ];
31 33 // @codingStandardsIgnoreEnd
  34 + */
32 35  
33 36 /**
34 37 * Records
... ...
tests/Fixture/UsersFixture.php
... ... @@ -9,12 +9,13 @@ use Cake\TestSuite\Fixture\TestFixture;
9 9 */
10 10 class UsersFixture extends TestFixture
11 11 {
12   -
  12 + public $import = ['model' => 'Users'];
13 13 /**
14 14 * Fields
15 15 *
16 16 * @var array
17 17 */
  18 + /*
18 19 // @codingStandardsIgnoreStart
19 20 public $fields = [
20 21 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
... ... @@ -44,6 +45,7 @@ class UsersFixture extends TestFixture
44 45 ],
45 46 ];
46 47 // @codingStandardsIgnoreEnd
  48 + */
47 49  
48 50 /**
49 51 * Records
... ...
tests/Fixture/VariablesFixture.php
... ... @@ -10,11 +10,14 @@ use Cake\TestSuite\Fixture\TestFixture;
10 10 class VariablesFixture extends TestFixture
11 11 {
12 12  
  13 + public $import = ['model' => 'Variables'];
  14 +
13 15 /**
14 16 * Fields
15 17 *
16 18 * @var array
17 19 */
  20 + /*
18 21 // @codingStandardsIgnoreStart
19 22 public $fields = [
20 23 'id' => ['type' => 'integer', 'length' => 11, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'autoIncrement' => true, 'precision' => null],
... ... @@ -36,5 +39,7 @@ class VariablesFixture extends TestFixture
36 39 'collation' => 'latin1_swedish_ci'
37 40 ],
38 41 ];
  42 + // @codingStandardsIgnoreEnd
  43 + */
39 44  
40 45 }
... ...
tests/TestCase/Controller/ProjetsControllerTest_deactivated.php
... ... @@ -20,9 +20,9 @@ class ProjetsControllerTest extends TestCase
20 20 public $fixtures = [
21 21 'app.Projets',
22 22 'app.GroupesThematiques',
23   - //'app.Users',
24   - 'app.Pis',
25   - 'app.Pms',
  23 + 'app.Users',
  24 + //'app.Pis',
  25 + //'app.Pms',
26 26 'app.Materiels'
27 27 ];
28 28  
... ...