feat(install): set default user for cli_install

Signed-off-by: Domingo Oropeza <[email protected]>
fusioninventory · Sep 14, 2018 · 9ab17b5 · 9ab17b5
1 parent 38b8641
commit 9ab17b5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/phpunit/0_Install/FusinvInstallTest.php b/phpunit/0_Install/FusinvInstallTest.php
@@ -95,9 +95,9 @@ public function testForceInstall() {
    function install($force = false) {
       $output     = [];
       $returncode = 0;
-      $command = "php -f ".FUSINV_ROOT. "/scripts/cli_install.php -- --as-user 'glpi'";
+      $command = "php -f ".FUSINV_ROOT. "/scripts/cli_install.php";
       if ($force) {
-         $command.= " --force-install";
+         $command.= " -- --as-user 'glpi' --force-install";
       }
       exec($command, $output, $returncode);
       $this->assertEquals(0, $returncode,

diff --git a/scripts/cli_install.php b/scripts/cli_install.php
@@ -104,9 +104,14 @@
    die("GLPI not installed\n");
 }
 
+$user = new User();
 if (!is_null($args['--as-user'])) {
-   $user = new User();
    $user->getFromDBbyName($args['--as-user']);
+} elseif(is_null($args['--as-user'])) {
+   $user->getFromDBbyName('glpi');
+}
+
+if(!$user->isNewItem()){
    $auth = new Auth();
    $auth->auth_succeded = true;
    $auth->user = $user;