Browse Source

Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

Angel Fernando Quiroz Campos 8 years ago
parent
commit
9061179704
2 changed files with 6 additions and 2 deletions
  1. 4 0
      .travis.yml
  2. 2 2
      tests/behat/behat.yml

+ 4 - 0
.travis.yml

@@ -1,3 +1,6 @@
+services:
+  - mysql
+
 language: php
 
 php:
@@ -35,6 +38,7 @@ before_install:
   - sudo a2enmod rewrite
   - sudo a2ensite $VHOST_CONF
   - sudo service apache2 restart
+  - echo mysql --version
   # Install additional PHP packages (check http://docs.travis-ci.com/user/ci-environment/#CI-environment-OS
   # for pre-installed packages)
   #- sudo apt-get install -qq php5-imagick

+ 2 - 2
tests/behat/behat.yml

@@ -1,11 +1,11 @@
 default:
     extensions:
         Behat\MinkExtension:
-          base_url: http://localhost/
+          base_url: http://my.chamilo.net
           goutte: ~
           selenium2: ~
     suites:
         default:
             paths: [ %paths.base%/features ]
     formatters:
-        pretty: ~
+        pretty: true