Merge branch 'master' of bitbucket.org:ikflowdat/installer

behat/abm_fd3/tests/acceptance/2_deleteCMCest.php

@@ -3,7 +3,7 @@ use Codeception\Util\Locator;
 
 # comando para correr el test: php ./vendor/bin/codecept run --steps tests/acceptance/2_deleteCest.php
 
-class deleteCest
+class deleteCMCest
 {
 	public function frontpageWorks(AcceptanceTester $I)
 	{

behat/abm_fd3/tests/acceptance/2_deleteDHCPCest.php

@@ -3,7 +3,7 @@ use Codeception\Util\Locator;
 
 # comando para correr el test: php ./vendor/bin/codecept run --steps tests/acceptance/2_deleteCest.php
 
-class deleteCest
+class deleteDHCPCest
 {
 	public function frontpageWorks(AcceptanceTester $I)
 	{

behat/testScreenshot/tests/acceptance/1ScreenLogCest.php

@@ -13,7 +13,7 @@ $directorio = '01_login/';
 		$I->amOnPage('/');
 		$I->see('Nombre de usuario');
 		$I->fillField('_username', 'admin');
-		$I->fillField('_password', 'adminpass');
+		$I->fillField('_password', 'admin');
 
 		shell_exec('mkdir -p ./tests/_output/debug/' . $head . "/" . $directorio);
 		$I->makeScreenshot($head . "/" . $directorio . '1log');

behat/testScreenshot/tests/acceptance/2ScreenBaseCest.php

@@ -11,13 +11,13 @@ class ScreenBaseCest
 		$I->amOnPage('/');
 		$I->see('Nombre de usuario');
 		$I->fillField('_username', 'admin');
-		$I->fillField('_password', 'adminpass');
+		$I->fillField('_password', 'admin');
 		$I->click('_submit');
 		$I->wait('5');
 
 $directorio = '02_base/';
 shell_exec('mkdir -p ./tests/_output/debug/' . $head . "/" . $directorio);
-
+try{
 #screen dash
 $I->makeScreenshot($head."/".$directorio.'2dash');
 		$I->scrollTo(['css' => 'h3.box-title'], 0, 0);
@@ -25,59 +25,64 @@ $I->makeScreenshot($head."/".$directorio.'2dash1');
 		$I->scrollTo(['css' => 'h3.box-title'], 0, 600);
 $I->makeScreenshot($head."/".$directorio.'2dash2');
 
-#Screen lista Codigo Auth
-		$I->amOnUrl('http://base.fd3.flowdat.com/admin/base/oauthserver/authcode/list');
-$I->makeScreenshot($head."/".$directorio.'3codauth');
-		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 0);
-$I->makeScreenshot($head."/".$directorio.'3codauth1');
-
-#Screen lista Cliente Auth
-		$I->amOnUrl('http://base.fd3.flowdat.com/admin/base/oauthserver/oauthclient/list');
-$I->makeScreenshot($head."/".$directorio.'4cliauth');
+}
+catch(\Exception $e){
+}
 
-#Screen lista Tokens Acceso
-		$I->amOnUrl('http://base.fd3.flowdat.com/admin/base/oauthserver/accesstoken/list');
-$I->makeScreenshot($head."/".$directorio.'5tokenacceso');
-		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 0);
-$I->makeScreenshot($head."/".$directorio.'5tokenacceso1');
-		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 600);
-$I->makeScreenshot($head."/".$directorio.'5tokenacceso2');
-
-#Screen lista Tokens de Refresco
-		$I->amOnUrl('http://base.fd3.flowdat.com/admin/base/oauthserver/refreshtoken/list');
-$I->makeScreenshot($head."/".$directorio.'6tokenref');
-		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 0);
-$I->makeScreenshot($head."/".$directorio.'6tokenref1');
-		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 600);
-$I->makeScreenshot($head."/".$directorio.'6tokenref2');
 
 #Screen lista Workflows
+try{
 		$I->amOnUrl('http://base.fd3.flowdat.com/admin/workflow/workflow/list');
 $I->makeScreenshot($head."/".$directorio.'7workflow');
+}
+catch(\Exception $e){
+}
 
 #Screen lista Workflows Acciones
+try{
 		$I->amOnUrl('http://base.fd3.flowdat.com/admin/workflow/action/list');
 $I->makeScreenshot($head."/".$directorio.'8acciones');
+}
+catch(\Exception $e){
+}
 
 #Screen lista Alertas
+try{
 		$I->amOnUrl('http://base.fd3.flowdat.com/admin/alert/alert/list');
 $I->makeScreenshot($head."/".$directorio.'9alertas');
+}
+catch(\Exception $e){
+}
 
 #Screen lista Tipos de Alertas
+try{
 		$I->amOnUrl('http://base.fd3.flowdat.com/admin/alert/alerttype/list');
 $I->makeScreenshot($head."/".$directorio.'10tipoalertas');
 		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 0);
 $I->makeScreenshot($head."/".$directorio.'10tipoalertas1');
+}
+catch(\Exception $e){
+}
 
 #Screen lista Usuarios
+try{
 		$I->amOnUrl('http://base.fd3.flowdat.com/admin/user/list');
 $I->makeScreenshot($head."/".$directorio.'11usuarios');
+}
+catch(\Exception $e){
+	
+}
 
 #Screen lista Grupos
+try{
 		$I->amOnUrl('http://base.fd3.flowdat.com/admin/group/list');
 $I->makeScreenshot($head."/".$directorio.'12grupos');
-
+}
+catch(\Exception $e){
+	
+}
 #Screen lista Clientes
+try{
 		$I->amOnUrl('http://base.fd3.flowdat.com/admin/client/client/list');
 $I->makeScreenshot($head."/".$directorio.'13clientes');
 		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 0);
@@ -86,8 +91,12 @@ $I->makeScreenshot($head."/".$directorio.'13clientes1');
 $I->makeScreenshot($head."/".$directorio.'13clientes2');
 		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 1200);
 $I->makeScreenshot($head."/".$directorio.'13clientes3');
-
+}
+catch(\Exception $e){
+	
+}
 #Screen lista Dispositivos
+try{
 		$I->amOnUrl('http://base.fd3.flowdat.com/admin/license/device/list');
 $I->makeScreenshot($head."/".$directorio.'14dispositivos');
 		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 0);
@@ -98,6 +107,11 @@ $I->makeScreenshot($head."/".$directorio.'14dispositivos2');
 $I->makeScreenshot($head."/".$directorio.'14dispositivos3');
 		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 1800);
 $I->makeScreenshot($head."/".$directorio.'14dispositivos4');
+}
+catch(\Exception $e){
+	
+}
+
 
 	}
 

behat/testScreenshot/tests/acceptance/3ScreenFTTHCest.php

@@ -12,20 +12,28 @@ $directorio = '03_ftth/';
 shell_exec('mkdir -p ./tests/_output/debug/' . $head . "/" . $directorio);
 
 #log in
+try{
 		$I->amOnPage('/');
 		$I->see('Nombre de usuario');
 		$I->fillField('_username', 'admin');
-		$I->fillField('_password', 'adminpass');
+		$I->fillField('_password', 'admin');
 		$I->click('_submit');
 		$I->wait('3');
+}
+catch(\Exception $e){
+}
 
 #Screen lista Dash FTTH
+try{
 		$I->amOnUrl('http://ftth.fd3.flowdat.com/admin/dashboard');
 $I->makeScreenshot($head."/".$directorio.'15dashftth');
 		$I->scrollTo(['css' => 'h3.box-title'], 0, 0);
 $I->makeScreenshot($head."/".$directorio.'15dashftth1');
-
+}
+catch(\Exception $e){
+}
 #Screen lista ONU
+try{
 		$I->amOnUrl('http://ftth.fd3.flowdat.com/admin/ftth/onu/list');
 $I->makeScreenshot($head."/".$directorio.'16ONU');
 		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 0);
@@ -36,34 +44,49 @@ $I->makeScreenshot($head."/".$directorio.'16ONU2');
 $I->makeScreenshot($head."/".$directorio.'16ONU3');
 		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 1800);
 $I->makeScreenshot($head."/".$directorio.'16ONU4');
-
+}
+catch(\Exception $e){
+}
 #Screen lista OLT
+try{
 		$I->amOnUrl('http://ftth.fd3.flowdat.com/admin/ftth/olt/list');
 $I->makeScreenshot($head."/".$directorio.'17OLT');
 		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 0);
 $I->makeScreenshot($head."/".$directorio.'17OLT1');
-
+}
+catch(\Exception $e){
+}
 #Screen lista Modelo OLT
+try{
 		$I->amOnUrl('http://ftth.fd3.flowdat.com/admin/ftth/oltmodel/list');
 $I->makeScreenshot($head."/".$directorio.'18mOLT');
 		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 0);
 $I->makeScreenshot($head."/".$directorio.'18mOLT1');
-
+}
+catch(\Exception $e){
+}
 #Screen lista Modelo ONU
+try{
 		$I->amOnUrl('http://ftth.fd3.flowdat.com/admin/ftth/onumodel/list');
 $I->makeScreenshot($head."/".$directorio.'19mONU');
 		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 0);
 $I->makeScreenshot($head."/".$directorio.'19mONU1');
-
+}
+catch(\Exception $e){
+}
 #Screen lista Perfiles
+try{
 		$I->amOnUrl('http://ftth.fd3.flowdat.com/admin/ftth/profile/list');
 $I->makeScreenshot($head."/".$directorio.'20perfiles');
 		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 0);
 $I->makeScreenshot($head."/".$directorio.'20perfiles1');
 		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 600);
 $I->makeScreenshot($head."/".$directorio.'20perfiles2');
-
+}
+catch(\Exception $e){
+}
 #Screen lista NAP
+try{
 		$I->amOnUrl('http://ftth.fd3.flowdat.com/admin/ftth/nap/list');
 $I->makeScreenshot($head."/".$directorio.'21NAP');
 		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 0);
@@ -80,27 +103,38 @@ $I->makeScreenshot($head."/".$directorio.'21NAP5');
 $I->makeScreenshot($head."/".$directorio.'21NAP5');
 		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 3600);
 $I->makeScreenshot($head."/".$directorio.'21NAP6');
-
+}
+catch(\Exception $e){
+}
 #Screen lista Workflow FTTH
+try{
 		$I->amOnUrl('http://ftth.fd3.flowdat.com/admin/workflow/workflow/list');
 $I->makeScreenshot($head."/".$directorio.'22workflowftth');
 		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 0);
 $I->makeScreenshot($head."/".$directorio.'22workflowftth1');
-
+}
+catch(\Exception $e){
+}
 #Screen lista Acciones FTTH
+try{
 		$I->amOnUrl('http://ftth.fd3.flowdat.com/admin/workflow/action/list');
 $I->makeScreenshot($head."/".$directorio.'23accionftth');
 		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 0);
 $I->makeScreenshot($head."/".$directorio.'23accionftth1');
-
+}
+catch(\Exception $e){
+}
 #Screen lista Template FTTH
+try{
 		$I->amOnUrl('http://ftth.fd3.flowdat.com/admin/template/template/list');
 $I->makeScreenshot($head."/".$directorio.'24templateftth');
 		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 0);
 $I->makeScreenshot($head."/".$directorio.'24templateftth1');
 		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 600);
 $I->makeScreenshot($head."/".$directorio.'24templateftth2');
-
+}
+catch(\Exception $e){
+}
 	}
 
 }

behat/testScreenshot/tests/acceptance/4ScreenMapCest.php

@@ -14,41 +14,73 @@ shell_exec('mkdir -p ./tests/_output/debug/' . $head . "/" . $directorio);
 		$I->amOnUrl('http://base.fd3.flowdat.com/login');
 		$I->see('Nombre de usuario');
 		$I->fillField('_username', 'admin');
-		$I->fillField('_password', 'adminpass');
+		$I->fillField('_password', 'admin');
 		$I->click('_submit');
 		$I->wait('3');
 
 #Screen lista Dash Maps
+try{
 		$I->amOnUrl('http://mapas.fd3.flowdat.com/admin/dashboard');
 $I->makeScreenshot($head."/".$directorio.'25dashmap');
 		$I->scrollTo(['css' => 'h3.box-title'], 0, 0);
 $I->makeScreenshot($head."/".$directorio.'25dashmap1');
+}
+catch(\Exception $e){
+}
 
 #Screen lista Listado Mapas
+try{
 		$I->amOnUrl('http://mapas.fd3.flowdat.com/admin/map/map/list');
 $I->makeScreenshot($head."/".$directorio.'26listmap');
 		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 0);
 $I->makeScreenshot($head."/".$directorio.'26listmap1');
+}
+catch(\Exception $e){
+}
 
 #Screen lista Listado Capas
-		$I->amOnUrl('http://mapas.fd3.flowdat.com/admin/map/layer/list');
+try{
+		$I->amOnUrl('http://mapas.fd3.flowdat.com/admin/map/wmslayer/list');
 $I->makeScreenshot($head."/".$directorio.'27listcap');
 		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 0);
 $I->makeScreenshot($head."/".$directorio.'27listcap1');
+}
+catch(\Exception $e){
+}
 
 #Screen lista Listado Vectores
+try{
 		$I->amOnUrl('http://mapas.fd3.flowdat.com/admin/map/vector/list');
 $I->makeScreenshot($head."/".$directorio.'28listvec');
 		$I->scrollTo(['id' => 'list_batch_checkbox'], 0, 0);
 $I->makeScreenshot($head."/".$directorio.'28listvec1');
+}
+catch(\Exception $e){
+}
 
 #Screen lista Listado Objetos
-		$I->amOnUrl('http://mapas.fd3.flowdat.com/admin/map/objectclass/list');
+try{
+		$I->amOnUrl('http://mapas.fd3.flowdat.com/admin/map/mapobject/list');
 $I->makeScreenshot($head."/".$directorio.'29listobj');
+}
+catch(\Exception $e){
+}
 
-#Screen lista Listado Contenedores
-		$I->amOnUrl('http://mapas.fd3.flowdat.com/admin/map/iolinkrel/list');
-$I->makeScreenshot($head."/".$directorio.'30listcon');
+#Screen lista tipos de objetos
+try{
+		$I->amOnUrl('http://mapas.fd3.flowdat.com/admin/map/objecttype/list');
+$I->makeScreenshot($head."/".$directorio.'30listipobj');
+}
+catch(\Exception $e){
+}
+
+#Screen lista Listado Categorias
+try{
+		$I->amOnUrl('http://mapas.fd3.flowdat.com/admin/map/category/list');
+$I->makeScreenshot($head."/".$directorio.'31listcat');
+}
+catch(\Exception $e){
+}
 
 	}
 

behat/testScreenshot/tests/acceptance/5minioUpdateCest.php

@@ -62,16 +62,16 @@ $s3 = new Aws\S3\S3Client([
             			],
 			]);
 	
-		$head = shell_exec('git rev-parse HEAD~1');
-		$head = substr($head,0,-1);
+		$head1 = shell_exec('git rev-parse HEAD~1');
+		$head1 = substr($head1,0,-1);
 
 		for ($i = 0; $i < 4; $i++)
 		{
 			$dir = $directorioA[$i];
-			shell_exec('mkdir -p ./tests/to_compare/' . $head . "/" . $dir);
+			shell_exec('mkdir -p ./tests/to_compare/' . $head1 . "/" . $dir);
 		}
 
-		$iterator = $s3->getIterator('ListObjects', array('Bucket'=> "testbucket",'Prefix'=> $head));
+		$iterator = $s3->getIterator('ListObjects', array('Bucket'=> "testbucket",'Prefix'=> $head1));
 
 		foreach ($iterator as $object) 
 		{

behat/testScreenshot/tests/acceptance/6compareCest.php

@@ -53,7 +53,9 @@ $AUTH_TOKEN="umxTgNpdzUS4egXqpZvGmmYrpLWApANHBKUcciMk";
 $MESSAGE1="Inicio Commit ID: " . $head;
 $MESSAGE2="Fin Commit ID: " . $head;
 
-shell_exec('curl -H "Content-Type: application/json" -X POST -d "{\"color\": \"purple\", \"message_format\": \"text\", \"message\": \"' . $MESSAGE1 . '\" }" https://api.hipchat.com/v2/room/' . $ROOM_ID . '/notification?auth_token=' . $AUTH_TOKEN);
+shell_exec('curl -X POST -H "Content-Type: application/json" -H "Authorization: Bearer qGKQBdZpcRFxPCwoHYZI" -d \'{"body":{"version":1,"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","text":"'.$MESSAGE1.'"}]}]}}\' --url "https://api.atlassian.com/site/9a250d57-9fd5-44d1-b514-e8664f32952e/conversation/7a10296d-521a-4b7b-a927-8bd8275bdf86/message"');
+
+# shell_exec('curl -H "Content-Type: application/json" -X POST -d "{\"color\": \"purple\", \"message_format\": \"text\", \"message\": \"' . $MESSAGE1 . '\" }" https://api.hipchat.com/v2/room/' . $ROOM_ID . '/notification?auth_token=' . $AUTH_TOKEN);
 
 	$directorioA = array('01_login/','02_base/','03_ftth/','04_map/');
 	for ($i = 0; $i < 4; $i++)
@@ -78,12 +80,37 @@ shell_exec('curl -H "Content-Type: application/json" -X POST -d "{\"color\": \"p
 			    'Bucket' => 'comparaciones',
 			    'Key'    => $fecha . "_" . $hora . "_" . $head . '/' . $dir . $archivo
 				));
-			shell_exec('curl -H "Content-Type: multipart/related; boundary=boundary123456" -F "file=@tests/comp/' . $fecha . '_' . $hora . '_' . $head . '/' . $dir . $archivo.'" -X POST https://api.hipchat.com/v2/room/'.$ROOM_ID.'/share/file?auth_token='.$AUTH_TOKEN);
+				
+$token = 'qGKQBdZpcRFxPCwoHYZI';
+
+$cloudId = '9a250d57-9fd5-44d1-b514-e8664f32952e';
+
+$conversationId = '7a10296d-521a-4b7b-a927-8bd8275bdf86';
+
+$filename = 'tests/comp/' . $fecha . '_' . $hora . '_' . $head . '/' . $dir . $archivo;
+
+$path = '/home/iksop/Escritorio/te/installer/behat/testScreenshot/'.$filename;
+
+$command = "curl --request POST --header 'Authorization: Bearer {$token}' --header 'Accept: application/json' --header 'Content-Type: application/octet-stream' --url 'https://api.atlassian.com/site/{$cloudId}/conversation/{$conversationId}/media?name={$filename}' --data-binary '@{$path}'";
+
+#var_dump($command);
+
+$upload = shell_exec($command);
+
+#var_dump($upload);
+
+$upload = json_decode($upload, true);
+
+$message = shell_exec("curl -X POST -H 'Content-Type: application/json' -H 'Authorization: Bearer {$token}' -d '{\"body\":{\"version\":1,\"type\":\"doc\",\"content\":[{\"type\":\"mediaGroup\",\"content\":[{\"type\":\"media\",\"attrs\":{\"type\":\"file\",\"id\":\"{$upload['data']['id']}\",\"collection\":\"{$conversationId}\"}}]}]}}' --url 'https://api.atlassian.com/site/{$cloudId}/conversation/{$conversationId}/message'");
+
+#var_dump($message);
+
 			}
 		}
 			echo "Directorio de comparación '" . $dir . "' actualizado. Fecha: " . $fecha . "_" . $hora . " Commit: " . $head . "\n" ;			
 	}
-shell_exec('curl -H "Content-Type: application/json" -X POST -d "{\"color\": \"purple\", \"message_format\": \"text\", \"message\": \"' . $MESSAGE2 . '\" }" https://api.hipchat.com/v2/room/' . $ROOM_ID . '/notification?auth_token=' . $AUTH_TOKEN);
- 
-	}
+
+shell_exec('curl -X POST -H "Content-Type: application/json" -H "Authorization: Bearer qGKQBdZpcRFxPCwoHYZI" -d \'{"body":{"version":1,"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","text":"'.$MESSAGE2.'"}]}]}}\' --url "https://api.atlassian.com/site/9a250d57-9fd5-44d1-b514-e8664f32952e/conversation/7a10296d-521a-4b7b-a927-8bd8275bdf86/message"');
+
+ 	}
 }