mbi...@adullact.net
unread,Mar 18, 2019, 6:15:09 AM3/18/19Sign in to reply to author
Sign in to forward
You do not have permission to delete messages in this group
Sign in to report message
Either email addresses are anonymous for this group or you need the view member email addresses permission to view the original message
to openmairi...@googlegroups.com
Author: mbideau
Date: 2019-03-14 16:34:52 +0100 (Thu, 14 Mar 2019)
New Revision: 2511
Added:
branches/1.6.0-develop_2_nouveaux_cf_visite/app/php/
Modified:
branches/1.6.0-develop_2_nouveaux_cf_visite/
branches/1.6.0-develop_2_nouveaux_cf_visite/obj/openaria.class.php
branches/1.6.0-develop_2_nouveaux_cf_visite/tests/000_test_unitaire.php
branches/1.6.0-develop_2_nouveaux_cf_visite/tests/005_sig.robot
branches/1.6.0-develop_2_nouveaux_cf_visite/tests/010_test_digitalizedDocument.php
branches/1.6.0-develop_2_nouveaux_cf_visite/tests/070_programmation.robot
branches/1.6.0-develop_2_nouveaux_cf_visite/tests/binary_files/geoaria_tests.class.php
Log:
Rebase de la branche d'int?\195?\169gration '1.6.0-develop' vers la branche de d?\195?\169veloppement '1.6.0-develop_2_nouveaux_cf_visite'
Index: branches/1.6.0-develop_2_nouveaux_cf_visite
===================================================================
--- branches/1.6.0-develop_2_nouveaux_cf_visite 2019-03-14 15:25:25 UTC (rev 2510)
+++ branches/1.6.0-develop_2_nouveaux_cf_visite 2019-03-14 15:34:52 UTC (rev 2511)
Property changes on: branches/1.6.0-develop_2_nouveaux_cf_visite
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
/branches/1.4.0-develop-fmwk-4.8:2274-2298
/branches/1.4.0-develop-typesecondaire:2248-2271
/branches/1.5.0-develop:2368-2409
-/branches/1.6.0-develop:2444-2469
+/branches/1.6.0-develop:2444-2510
/branches/bug_identifiant_sig_voie:2160-2166
/branches/bug_test_annee:2034-2039
/branches/contraintes_merge_fields:1801-1822
## -26,4 +26,5 ##
/branches/suivi_docs_gen:2043-2060
/branches/trunk_bug_dc_contacts:2165-2171
/branches/trunk_evo_OM_4.6:2168-2201
-/branches/trunk_sur_fmwk_4.9.0:2345-2368
\ No newline at end of property
+/branches/trunk_sur_fmwk_4.9.0:2345-2368
+/trunk:2496,2499-2500,2507
\ No newline at end of property
Modified: branches/1.6.0-develop_2_nouveaux_cf_visite/obj/openaria.class.php
===================================================================
--- branches/1.6.0-develop_2_nouveaux_cf_visite/obj/openaria.class.php 2019-03-14 15:25:25 UTC (rev 2510)
+++ branches/1.6.0-develop_2_nouveaux_cf_visite/obj/openaria.class.php 2019-03-14 15:34:52 UTC (rev 2511)
@@ -34,8 +34,8 @@
get_include_path().PATH_SEPARATOR.implode(
PATH_SEPARATOR,
array(
- getcwd()."/../php/pear",
- getcwd()."/../php/db",
+ getcwd()."/../app/php/pear",
+ getcwd()."/../app/php/db",
getcwd()."/../php/fpdf",
getcwd()."/../php/phpmailer",
getcwd()."/../php/tcpdf",
Modified: branches/1.6.0-develop_2_nouveaux_cf_visite/tests/000_test_unitaire.php
===================================================================
--- branches/1.6.0-develop_2_nouveaux_cf_visite/tests/000_test_unitaire.php 2019-03-14 15:25:25 UTC (rev 2510)
+++ branches/1.6.0-develop_2_nouveaux_cf_visite/tests/000_test_unitaire.php 2019-03-14 15:34:52 UTC (rev 2511)
@@ -9,7 +9,7 @@
/**
* Cette classe permet de tester unitairement les fonctions de l'application.
*/
-class General extends PHPUnit_Framework_TestCase {
+class General extends PHPUnit\Framework\TestCase {
/**
* Méthode lancée en début de traitement
Modified: branches/1.6.0-develop_2_nouveaux_cf_visite/tests/005_sig.robot
===================================================================
--- branches/1.6.0-develop_2_nouveaux_cf_visite/tests/005_sig.robot 2019-03-14 15:25:25 UTC (rev 2510)
+++ branches/1.6.0-develop_2_nouveaux_cf_visite/tests/005_sig.robot 2019-03-14 15:34:52 UTC (rev 2511)
@@ -477,7 +477,7 @@
Valid Message Should Contain Cliquez ici pour le dessiner.
${etab02_code} = Get Text css=#code
Click Element css=#link_dessin_emprise_sig
- @{URL} = Create List ${PROJECT_URL}app/geoaria_redirection_test.html?context=etab_emprise&id=${etab02_code}&couche=
+ @{URL} = Create List ${PROJECT_URL}app/geoaria_redirection_test.html?context=etab_emprise&id=${etab02_code}
Sélectionner la fenêtre et vérifier l'URL puis fermer la fenêtre Test Redirection SIG ${URL} false
# Récupération du code de l'établissement
Modified: branches/1.6.0-develop_2_nouveaux_cf_visite/tests/010_test_digitalizedDocument.php
===================================================================
--- branches/1.6.0-develop_2_nouveaux_cf_visite/tests/010_test_digitalizedDocument.php 2019-03-14 15:25:25 UTC (rev 2510)
+++ branches/1.6.0-develop_2_nouveaux_cf_visite/tests/010_test_digitalizedDocument.php 2019-03-14 15:34:52 UTC (rev 2511)
@@ -18,7 +18,7 @@
*
* Lors de l'envoi de la commande ajouter --bootstrap bootstrap.php
*/
-class DigitalizedDocumentTest extends PHPUnit_Framework_TestCase {
+class DigitalizedDocumentTest extends PHPUnit\Framework\TestCase {
/**
* Instance de la classe digitalizedDocument.
@@ -126,7 +126,7 @@
*
* @param Exception $e Exception a lever.
*/
- public function onNotSuccessfulTest($e) {
+ public function onNotSuccessfulTest(Throwable $e) {
echo 'Line '.$e->getLine().' : '.$e->getMessage()."\r\n";
parent::onNotSuccessfulTest($e);
Modified: branches/1.6.0-develop_2_nouveaux_cf_visite/tests/070_programmation.robot
===================================================================
--- branches/1.6.0-develop_2_nouveaux_cf_visite/tests/070_programmation.robot 2019-03-14 15:25:25 UTC (rev 2510)
+++ branches/1.6.0-develop_2_nouveaux_cf_visite/tests/070_programmation.robot 2019-03-14 15:34:52 UTC (rev 2511)
@@ -359,9 +359,7 @@
Open PDF ${OM_PDF_TITLE}
Wait Until Keyword Succeeds ${TIMEOUT} ${RETRY_INTERVAL} Page Should Contain Visite le
PDF Page Number Should Contain 1 Visite le 27 septembre 2014 (27/09/2014), qui est un samedi
- Next Page PDF # force loading the content of the page
PDF Page Number Should Contain 2 Visite le 25 septembre 2014 (25/09/2014), qui est un jeudi
- Next Page PDF # force loading the content of the page
PDF Page Number Should Contain 3 Visite le 25 septembre 2014 (25/09/2014), qui est un jeudi
Close PDF
Modified: branches/1.6.0-develop_2_nouveaux_cf_visite/tests/binary_files/geoaria_tests.class.php
===================================================================
--- branches/1.6.0-develop_2_nouveaux_cf_visite/tests/binary_files/geoaria_tests.class.php 2019-03-14 15:25:25 UTC (rev 2510)
+++ branches/1.6.0-develop_2_nouveaux_cf_visite/tests/binary_files/geoaria_tests.class.php 2019-03-14 15:34:52 UTC (rev 2511)
@@ -400,7 +400,7 @@
touch($flag_path);
}
// sinon on ne retourne que l'url
- return $url.'?context=etab_emprise&id='.$data['id'].'&couche='.$data['type'].'';
+ return $url.'?context=etab_emprise&id='.$data['id'];
}