[tests] fix configuration of lizmap

3liz · Nov 10, 2022 · aae0c1f · aae0c1f
1 parent 02dc0b1
commit aae0c1f
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 29 deletions.
diff --git a/adresse/install/configure.php b/adresse/install/configure.php
@@ -8,6 +8,9 @@
  * @license    Mozilla Public Licence
  */
 
+/**
+ * Configurator for Lizmap 3.6+
+ */
 class adresseModuleConfigurator extends \Jelix\Installer\Module\Configurator {
 
     public function getDefaultParameters() {

diff --git a/adresse/install/install.php b/adresse/install/install.php
@@ -7,17 +7,14 @@
  *
  * @license    Mozilla Public Licence
  */
+
+/**
+ * Installer for Lizmap 3.6+
+ */
 class adresseModuleInstaller extends \Jelix\Installer\Module\Installer
 {
     public function install(\Jelix\Installer\Module\API\InstallHelpers $helpers)
     {
-        //if ($this->firstDbExec())
-        //    $this->execSQLScript('sql/install');
 
-        /*if ($this->firstExec('acl2')) {
-            jAcl2DbManager::addSubject('my.subject', 'adresse~acl.my.subject', 'subject.group.id');
-            jAcl2DbManager::addRight('admins', 'my.subject'); // for admin group
-        }
-        */
     }
 }
diff --git a/adresse/install/install_1_6.php b/adresse/install/install_1_6.php
@@ -7,18 +7,14 @@
  *
  * @license    Mozilla Public Licence
  */
+
+/**
+ * Installer for lizmap <=3.5
+ */
 class adresseModuleInstaller extends jInstallerModule
 {
     public function install()
     {
-        //if ($this->firstDbExec())
-        //    $this->execSQLScript('sql/install');
-
-        /*if ($this->firstExec('acl2')) {
-            jAcl2DbManager::addSubject('my.subject', 'adresse~acl.my.subject', 'subject.group.id');
-            jAcl2DbManager::addRight('admins', 'my.subject'); // for admin group
-        }
-        */
         // Copy CSS and JS assets
         $this->copyDirectoryContent('../www/css', jApp::wwwPath('assets/adresse/css'));
         $this->copyDirectoryContent('../www/js', jApp::wwwPath('assets/adresse/js'));

diff --git a/tests/lizmap/etc/conf/localconfig.d/localconfig.ini.php b/tests/lizmap/etc/conf/localconfig.d/localconfig.ini.php
@@ -1,2 +1,11 @@
 [modules]
 adresse.access=2
+
+[jResponseHtml]
+plugins = debugbar
+
+[mailer]
+webmasterEmail="tests@lizmap.com"
+webmasterName="Lizmap Docker"
+mailerType=file
+
diff --git a/tests/lizmap/etc/conf/profiles.d/profile.ini.php b/tests/lizmap/etc/conf/profiles.d/profile.ini.php
@@ -1,3 +1,18 @@
+[jdb]
+
+default=jauth
+jacl2_profile=jauth
+lizlog=jauth
+
+[jdb:jauth]
+driver=pgsql
+host=pgsql
+port=5432
+database=lizmap
+user=lizmap
+password="lizmap1234!"
+search_path=public
+
 [jdb:adresse]
 
 driver=pgsql
@@ -6,3 +21,5 @@
 user=lizmap
 password="lizmap1234!"
 search_path=adresse,public
+timeout=10
+
diff --git a/tests/lizmap/etc/mailconfig.ini b/tests/lizmap/etc/mailconfig.ini