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

behat/abm_fd3/tests/acceptance/1_cablemodemCest.php

@@ -17,9 +17,9 @@ try{
 	}catch(\Exception $e){
 		$I->makeScreenshot('Add_Cablemodem/0_login');
 	}
-
-# ____________________ Base _____________________
 /*
+# ____________________ Base _____________________
+
 # Nodo
 try{
 		$I->amOnUrl('http://cablemodem.fd3.flowdat.com/admin/cablemodem/node/create');
@@ -59,7 +59,7 @@ try{
 		$I->makeScreenshot('Add_Cablemodem/3_Perfil');
 	}
 		
-*/
+
 # Modelo Cablemodem
 try{
 		$I->amOnUrl('http://cablemodem.fd3.flowdat.com/admin/cablemodem/cablemodemmodel/create');
@@ -95,11 +95,16 @@ try{
 	}catch(\Exception $e){
 		$I->makeScreenshot('Add_Cablemodem/6_CMTS');
 	}
-
+*/
 # Cablemodem
 try{
 		$I->amOnUrl('http://cablemodem.fd3.flowdat.com/admin/cablemodem/cablemodem/create');
-		$I->fillField('Cliente', 'TestFernando'."\n");
+#		$I->fillField('Cliente', 'TestFernando'."\n");
+		$I->fillField('clientId_search', 'TestFernando');
+		$I->pressKey("//*[@class='form-control ui-autocomplete-input']", WebDriverKeys::DOWN);
+		$I->wait('3');
+		$I->click("//*[@class='ui-corner-all']");
+		$I->wait('3');
 		$I->fillField('Mac','F0:E1:D2:C3:B4:A5'."\n");
 		$I->fillField('Código activación','ferNando2'."\n");		
 		$I->click('Crear y regresar al listado');

tools/mysql/freeradius/schema.sql

@@ -4,7 +4,7 @@ USE freeradius;
 CREATE TABLE IF NOT EXISTS `badusers` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
   `UserName` varchar(30) DEFAULT NULL,
-  `Date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `Date` datetime DEFAULT NULL,
   `Reason` varchar(200) DEFAULT NULL,
   `Admin` varchar(30) DEFAULT '-',
   PRIMARY KEY (`id`),
@@ -21,7 +21,7 @@ CREATE TABLE IF NOT EXISTS `badusers` (
 CREATE TABLE IF NOT EXISTS `mtotacct` (
   `MTotAcctId` bigint(21) NOT NULL AUTO_INCREMENT,
   `UserName` varchar(64) NOT NULL DEFAULT '',
-  `AcctDate` date NOT NULL DEFAULT '0000-00-00',
+  `AcctDate` date DEFAULT NULL,
   `ConnNum` bigint(12) DEFAULT NULL,
   `ConnTotDuration` bigint(12) DEFAULT NULL,
   `ConnMaxDuration` bigint(12) DEFAULT NULL,
@@ -204,7 +204,7 @@ CREATE TABLE IF NOT EXISTS `radusergroup` (
 CREATE TABLE IF NOT EXISTS `totacct` (
   `TotAcctId` bigint(21) NOT NULL AUTO_INCREMENT,
   `UserName` varchar(64) NOT NULL DEFAULT '',
-  `AcctDate` date NOT NULL DEFAULT '0000-00-00',
+  `AcctDate` date DEFAULT NULL,
   `ConnNum` bigint(12) DEFAULT NULL,
   `ConnTotDuration` bigint(12) DEFAULT NULL,
   `ConnMaxDuration` bigint(12) DEFAULT NULL,

tools/src/Release.php

@@ -270,7 +270,6 @@ class Release extends Command
                 }
                 $this->_domain = $input->getOption("domain");
                 $this->_client = $input->getOption("client");
-                $this->_dir = realpath($dir);
 
                 if (!$this->_client) {
                     $this->_client = basename(realpath($this->directory));