diff --git a/package.json b/package.json
index b495eac5f813bb2d19ff7c003e71c8e1919af7a6..be4e1fa77e1d52aa8c88b998bf8739a08a5d43ee 100644
--- a/package.json
+++ b/package.json
@@ -19,21 +19,21 @@
"author": "Maarch",
"license": "GPL-3.0",
"dependencies": {
- "@angular/animations": "^7.1.0",
+ "@angular/animations": "^7.1.1",
"@angular/cdk": "^7.0.4",
- "@angular/common": "^7.1.0",
- "@angular/compiler": "^7.1.0",
- "@angular/core": "^7.1.0",
- "@angular/forms": "^7.1.0",
- "@angular/http": "^7.1.0",
+ "@angular/common": "^7.1.1",
+ "@angular/compiler": "^7.1.1",
+ "@angular/core": "^7.1.1",
+ "@angular/forms": "^7.1.1",
+ "@angular/http": "^7.1.1",
"@angular/material": "^7.0.4",
- "@angular/platform-browser": "^7.1.0",
- "@angular/platform-browser-dynamic": "^7.1.0",
- "@angular/router": "^7.1.0",
+ "@angular/platform-browser": "^7.1.1",
+ "@angular/platform-browser-dynamic": "^7.1.1",
+ "@angular/router": "^7.1.1",
"@fortawesome/fontawesome-free": "^5.4.1",
"@ngrx/store": "^6.1.0",
"@ngrx/store-devtools": "^6.1.0",
- "angular2-draggable": "^2.1.8",
+ "angular2-draggable": "^2.1.9",
"angular2-signaturepad": "^2.8.0",
"core-js": "^2.5.4",
"exif-js": "^2.3.0",
@@ -41,7 +41,7 @@
"interactjs": "^1.4.0-alpha.16",
"jquery": "^3.3.1",
"ng2-pdf-viewer": "^5.2.2",
- "ngx-cookie-service": "^2.0.0",
+ "ngx-cookie-service": "^2.0.2",
"ngx-scroll-event": "^1.0.8",
"pdfjs-dist": "^2.0.943",
"rxjs": "^6.0.0",
@@ -51,8 +51,8 @@
"devDependencies": {
"@angular-devkit/build-angular": "^0.8.8",
"@angular/cli": "^6.2.8",
- "@angular/compiler-cli": "^7.1.0",
- "@angular/language-service": "^7.1.0",
+ "@angular/compiler-cli": "^7.1.1",
+ "@angular/language-service": "^7.1.1",
"@types/hammerjs": "^2.0.36",
"@types/jasmine": "^2.8.12",
"@types/jasminewd2": "^2.0.5",
diff --git a/test/unitTests/app/user/UserControllerTest.php b/test/unitTests/app/user/UserControllerTest.php
index c1102348efabf922be27fecdf2b48ca23d0d8cfb..12b39fd8b7adeeda3a35a75cc8616a503fe1b1e2 100755
--- a/test/unitTests/app/user/UserControllerTest.php
+++ b/test/unitTests/app/user/UserControllerTest.php
@@ -12,6 +12,58 @@ use PHPUnit\Framework\TestCase;
class UserControllerTest extends TestCase
{
private static $signatureId = null;
+ private static $userId = null;
+
+ public function testCreateUser()
+ {
+ $userController = new \User\controllers\UserController();
+
+ $environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'POST']);
+ $request = \Slim\Http\Request::createFromEnvironment($environment);
+
+ $aArgs = [
+ 'firstname' => 'Prénom',
+ 'lastname' => 'Nom',
+ 'email' => 'email@test.fr'
+ ];
+
+ $fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
+ $response = $userController->create($fullRequest, new \Slim\Http\Response());
+ $responseBody = json_decode((string)$response->getBody());
+
+ $this->assertNotEmpty($responseBody->user);
+ $this->assertInternalType('int', $responseBody->user->id);
+ $this->assertSame('email@test.fr', $responseBody->user->email);
+ $this->assertSame('Prénom', $responseBody->user->firstname);
+ $this->assertSame('Nom', $responseBody->user->lastname);
+ self::$userId = $responseBody->user->id;
+ var_dump(self::$userId);
+
+ //Mail missing
+ $aArgs = [
+ 'firstname' => 'Prénom',
+ 'lastname' => 'Nom'
+ ];
+
+ $fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
+ $response = $userController->create($fullRequest, new \Slim\Http\Response());
+ $responseBody = json_decode((string)$response->getBody());
+
+ $this->assertSame('email is empty or format is not correct', $responseBody->errors);
+
+ //Mail wrong format
+ $aArgs = [
+ 'firstname' => 'Prénom',
+ 'lastname' => 'Nom',
+ 'email' => 'emailtest.fr'
+ ];
+
+ $fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
+ $response = $userController->create($fullRequest, new \Slim\Http\Response());
+ $responseBody = json_decode((string)$response->getBody());
+
+ $this->assertSame('email is empty or format is not correct', $responseBody->errors);
+ }
public function testGet()
{
@@ -34,13 +86,13 @@ class UserControllerTest extends TestCase
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
$request = \Slim\Http\Request::createFromEnvironment($environment);
- $response = $userController->getById($request, new \Slim\Http\Response(), ['id' => 1]);
+ $response = $userController->getById($request, new \Slim\Http\Response(), ['id' => self::$userId]);
$responseBody = json_decode((string)$response->getBody());
- $this->assertSame(1, $responseBody->user->id);
- $this->assertSame('jjane@maarch.com', $responseBody->user->email);
- $this->assertSame('Jenny', $responseBody->user->firstname);
- $this->assertSame('JANE', $responseBody->user->lastname);
+ $this->assertSame(self::$userId, $responseBody->user->id);
+ $this->assertSame('email@test.fr', $responseBody->user->email);
+ $this->assertSame('Prénom', $responseBody->user->firstname);
+ $this->assertSame('Nom', $responseBody->user->lastname);
$response = $userController->getById($request, new \Slim\Http\Response(), ['id' => -1]);
$responseBody = json_decode((string)$response->getBody());
@@ -61,13 +113,13 @@ class UserControllerTest extends TestCase
];
$fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
- $response = $userController->update($fullRequest, new \Slim\Http\Response(), ['id' => 1]);
+ $response = $userController->update($fullRequest, new \Slim\Http\Response(), ['id' => self::$userId]);
$responseBody = json_decode((string)$response->getBody());
$this->assertInternalType('array', $responseBody->user);
$this->assertNotEmpty($responseBody->user);
- $response = $userController->getById($request, new \Slim\Http\Response(), ['id' => 1]);
+ $response = $userController->getById($request, new \Slim\Http\Response(), ['id' => self::$userId]);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Jolly', $responseBody->user->firstname);
@@ -79,13 +131,13 @@ class UserControllerTest extends TestCase
];
$fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
- $response = $userController->update($fullRequest, new \Slim\Http\Response(), ['id' => 1]);
+ $response = $userController->update($fullRequest, new \Slim\Http\Response(), ['id' => self::$userId]);
$responseBody = json_decode((string)$response->getBody());
$this->assertInternalType('array', $responseBody->user);
$this->assertNotEmpty($responseBody->user);
- $response = $userController->getById($request, new \Slim\Http\Response(), ['id' => 1]);
+ $response = $userController->getById($request, new \Slim\Http\Response(), ['id' => self::$userId]);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Jenny', $responseBody->user->firstname);
@@ -105,7 +157,7 @@ class UserControllerTest extends TestCase
];
$fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
- $response = $userController->createSignature($fullRequest, new \Slim\Http\Response(), ['id' => 1]);
+ $response = $userController->createSignature($fullRequest, new \Slim\Http\Response(), ['id' => self::$userId]);
$responseBody = json_decode((string)$response->getBody());
$this->assertInternalType('int', $responseBody->signatureId);
@@ -119,7 +171,7 @@ class UserControllerTest extends TestCase
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
$request = \Slim\Http\Request::createFromEnvironment($environment);
- $response = $userController->getSignatures($request, new \Slim\Http\Response(), ['id' => 1]);
+ $response = $userController->getSignatures($request, new \Slim\Http\Response(), ['id' => self::$userId]);
$responseBody = json_decode((string)$response->getBody());
$this->assertInternalType('array', $responseBody->signatures);
@@ -133,9 +185,15 @@ class UserControllerTest extends TestCase
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
$request = \Slim\Http\Request::createFromEnvironment($environment);
- $response = $userController->deleteSignature($request, new \Slim\Http\Response(), ['id' => 1, 'signatureId' => self::$signatureId]);
+ $response = $userController->deleteSignature($request, new \Slim\Http\Response(), ['id' => self::$userId, 'signatureId' => self::$signatureId]);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('success', $responseBody->success);
+
+ \SrcCore\models\DatabaseModel::delete([
+ 'table' => 'users',
+ 'where' => 'id = ?',
+ 'data' => self::$signatureId
+ ]);
}
}
diff --git a/test/unitTests/define.php b/test/unitTests/define.php
index ef5d7187740ddd8d11ec0636e0f54b66c5f810e7..bf6fdae3e86fbb7348cf7cd4bb502dc24e5fd526 100755
--- a/test/unitTests/define.php
+++ b/test/unitTests/define.php
@@ -9,7 +9,7 @@
require_once 'vendor/autoload.php';
-$id = 1;
+$id = 2;
$_SERVER['CONFIG_DIR'] = "/var/www/html/MaarchParapheur/config/";
class httpRequestCustom