More travis fixes

snipe · Feb 5, 2015 · c255eda · c255eda
1 parent 7f0e21d
commit c255eda
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,10 +19,10 @@ env:
 before_script:
   - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS snipeit_laravel;" -utravis; fi
   - curl -s http://getcomposer.org/installer | php
-  - cp app/config/production/database.example.php app/config/database.php
-  - cp app/config/production/mail.example.php app/config/mail.php
+  - cp app/config/testing/database.example.php app/config/testing/database.php
+  - cp app/config/testing/mail.example.php app/config/testing/mail.php
   - composer self-update
-  - composer install --dev --prefer-source --no-interaction
+  - composer install --prefer-source --no-interaction
   - php artisan key:generate --env=testing
   - php artisan migrate:install --env=testing --no-interaction -vvv
   - php artisan migrate --package cartalyst/sentry --env=testing --no-interaction -vvv

diff --git a/app/config/testing/database.example.php b/app/config/testing/database.example.php
@@ -26,7 +26,7 @@
     |
     */
 
-    'default' => 'sqlite',
+    'default' => 'mysql',
 
     /*
     |--------------------------------------------------------------------------
@@ -50,6 +50,18 @@
             'database' => ':memory:',
             'prefix'   => ''
         ),
+
+        'mysql' => array(
+            'driver'    => 'mysql',
+            'host'      => 'localhost',
+            'database'  => 'snipeit_laravel',
+            'username'  => 'travis',
+            'password'  => '',
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+        ),
+
     ),
 
     /*

diff --git a/app/config/testing/mail.example.php b/app/config/testing/mail.example.php
@@ -119,6 +119,6 @@
     |
     */
 
-    'pretend' => false,
+    'pretend' => true,
 
 );
-Original file line number
+Diff line change
@@ Expand Up / @@ -119,6 +119,6 @@ @@
         |
         */
-        'pretend' => false,
+        'pretend' => true,
     );