File tree 4 files changed +10
-6
lines changed
4 files changed +10
-6
lines changed Original file line number Diff line number Diff line change @@ -8,8 +8,7 @@ before_script:
8
8
- composer install --no-dev
9
9
- mysql -u root -e 'create database glpitest;'
10
10
- php tools/cliinstall.php --lang=en_US --db=glpitest --user=root --tests
11
- - cp tests/config_db.php config/
12
- - php -S localhost:8088 > /dev/null 2>&1 &
11
+ - php -S localhost:8088 tests/router.php &>/dev/null &
13
12
14
13
script :
15
14
- mysql -u root -e 'select version();'
Original file line number Diff line number Diff line change 16
16
<php >
17
17
<const name =" GLPI_CONFIG_DIR" value =" ./tests" />
18
18
<const name =" GLPI_LOG_DIR" value =" ./tests/files/_log" />
19
+ <const name =" GLPI_URI" value =" http://localhost:8088" />
19
20
</php >
20
21
</phpunit >
Original file line number Diff line number Diff line change @@ -137,10 +137,10 @@ function loadDataset() {
137
137
$ CFG_GLPI ['root_doc ' ] = '/glpi ' ;
138
138
139
139
// need to set theses in DB, because tests for API use http call and this bootstrap file is not called
140
- Config::setConfigurationValues ('core ' , ['url_base ' => ' http://localhost:8088 ' ,
141
- 'url_base_api ' => ' http://localhost:8088 /apirest.php ' ]);
142
- $ CFG_GLPI ['url_base ' ] = ' http://localhost:8088 ' ;
143
- $ CFG_GLPI ['url_base_api ' ] = ' http://localhost:8088 /apirest.php ' ;
140
+ Config::setConfigurationValues ('core ' , ['url_base ' => GLPI_URI ,
141
+ 'url_base_api ' => GLPI_URI . ' /apirest.php ' ]);
142
+ $ CFG_GLPI ['url_base ' ] = GLPI_URI ;
143
+ $ CFG_GLPI ['url_base_api ' ] = GLPI_URI . ' /apirest.php ' ;
144
144
145
145
@mkdir (GLPI_LOG_DIR , 0755 , true );
146
146
Original file line number Diff line number Diff line change
1
+ <?php
2
+ define ('GLPI_CONFIG_DIR ' , __DIR__ );
3
+
4
+ return false ;
You can’t perform that action at this time.
0 commit comments