Browse Source

parameters.yml.dist updated

Guillermo Espinoza 7 years ago
parent
commit
2d248475e4

+ 1 - 6
.drone.yml

@@ -36,23 +36,19 @@ pipeline:
 
       - chmod 0400 keys/bitbucket.id_rsa
       - eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa
+      - cp app/config/parameters.yml.dist app/config/parameters.yml
       - cp app/config/bundles/ik/device-bundle/parameters.yml.drone app/config/bundles/ik/device-bundle/parameters.yml
       - cp app/config/bundles/ik/base-admin-bundle/parameters.yml.dist app/config/bundles/ik/base-admin-bundle/parameters.yml
-      # - cp app/config/bundles/ik/webservice-bundle/parameters.yml.dist app/config/bundles/ik/webservice-bundle/parameters.yml
       - composer install -n --no-progress
       - composer dump-autoload --optimize
       - chmod 0777 -R var/logs var/cache var/sessions
       - php bin/console doctrine:schema:update --force -vvv --env=test
-      # - php bin/console cache:clear --no-warmup
       - touch var/logs/test.log
-
       - tail -f var/logs/*.log &
-      # - bin/console server:run --help --end=prod
       - bin/console server:run --env=test &
       - vendor/phpunit/phpunit/phpunit -c phpunit.xml.dist
 
  docker:
-   privileged: true
    repo : docker.infra.flowdat.com/fd3/cablemodem
    image: plugins/docker
    email: luciano@interlink.com.ar
@@ -63,7 +59,6 @@ pipeline:
      branch: master
 
  docker_tag:
-  privileged: true
   repo : docker.infra.flowdat.com/fd3/cablemodem
   image: plugins/docker
   email: luciano@interlink.com.ar

+ 7 - 6
app/config/parameters.yml.dist

@@ -20,18 +20,19 @@ parameters:
 
     jms_serializer.camel_case_naming_strategy.class: JMS\Serializer\Naming\IdenticalPropertyNamingStrategy
 
-    # amqp queue config
-    rabbit_mq.host:     'amqp'
+    # RabbitMQ parameters
+    rabbit_mq.host:     127.0.0.1
     rabbit_mq.port:     5672
     rabbit_mq.user:     'guest'
     rabbit_mq.password: 'guest'
     rabbit_mq.vhost:    '/'
 
-    db_session_host: mysql
-    db_session_port: ~
+    db_session_host: 127.0.0.1
+    db_session_port: null
     db_session_name: fd_session
     db_session_user: root
-    db_session_password: 235r2342gtfsw
+    db_session_password: null
+
     env(HOST_AMQP): amqp
     env(AMQP_KEY): cablemodem
 
@@ -42,4 +43,4 @@ parameters:
     nginx_name: nginx-proxy
 
     # App Dummy URL
-    env(HOST_DUMMY): http://www.flowdat.com/
+    env(HOST_DUMMY): http://www.flowdat.com/

+ 0 - 8
src/CablemodemBundle/tests/CMTSRESTControllerTest.php

@@ -104,8 +104,6 @@ class CMTSRESTControllerTest extends WebTestCaseBase
      */
     private function generateGET($uri = null, $data = null)
     {
-        // $this->initDefault($this->obtainDataWebService());
-        // $this->initDefault();
         if ($uri == null) {
             $uri = $this->getUri();
         }
@@ -117,8 +115,6 @@ class CMTSRESTControllerTest extends WebTestCaseBase
         }
 
         $this->getClient()->request('GET', $uri . $this->generateFilters($data));
-        // var_dump('generateGET');
-        // var_dump($uri . $this->generateFilters($data));
 
         return $this->getClient()->getResponse();
     }
@@ -144,7 +140,6 @@ class CMTSRESTControllerTest extends WebTestCaseBase
      */
     public function testPOST()
     {
-        // $this->initDefault($this->obtainDataWebService());
         $this->initDefault();
 
         // seteo los datos del listener
@@ -154,7 +149,6 @@ class CMTSRESTControllerTest extends WebTestCaseBase
         // obtengo la respuesta
         $response = $this->getClient()->getResponse();
 
-        // var_dump($this->getClient()->getResponse());
         $this->assertEquals(201, $response->getStatusCode(), "Error en la respuesta http.");
     }
 
@@ -169,8 +163,6 @@ class CMTSRESTControllerTest extends WebTestCaseBase
         // obtengo la respuesta
         $response = $this->generateGET();
 
-        // var_dump($response);
-
         // verifco el resultado
         $this->assertEquals(200, $response->getStatusCode(), "Error en la respuesta http.");
         $this->assertJson($response->getContent(), "No se obtuvo un objeto json.");