added db config to travis.yml

koenpunt · koenpunt · commit 10cebb3353ff · 2013-04-23T22:30:52.000+02:00
Password for db users

postgres password change

enabled php memcache module

Removed PHP test suites (AllTests, AllValidationsTest)
Added test/helpers/config.php as bootstrap file
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,15 @@
+before_script:
+  - echo 'extension = "memcache.so"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - mysql -e "USE mysql;UPDATE user SET password=PASSWORD('password') WHERE user='root';FLUSH PRIVILEGES;"
+  - mysql -e 'CREATE DATABASE phpar_test;'
+  - psql -c 'CREATE DATABASE phpar_test;' -U postgres
+  - psql -c "ALTER USER postgres WITH PASSWORD 'password';" -U postgres
+
+services:
+  - memcache
+
+env: PHPAR_MYSQL=mysql://root:password@127.0.0.1/phpar_test PHPAR_PGSQL=pgsql://postgres:password@127.0.0.1/phpar_test
+
 language: php
 php:
   - 5.3
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,7 +1,2 @@
-<phpunit>
-  <testSuites>
-    <testSuite name="default">
-      <directory>test/</directory>
-    </testSuite>
-  </testSuites>
+<phpunit bootstrap="test/helpers/config.php">
 </phpunit>
diff --git a/test/ActiveRecordCacheTest.php b/test/ActiveRecordCacheTest.php
@@ -1,6 +1,4 @@
 <?php
-include 'helpers/config.php';
-
 use ActiveRecord\Cache;
 
 class ActiveRecordCacheTest extends DatabaseTest
diff --git a/test/ActiveRecordFindTest.php b/test/ActiveRecordFindTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 
 class ActiveRecordFindTest extends DatabaseTest
 {
diff --git a/test/ActiveRecordTest.php b/test/ActiveRecordTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 
 class ActiveRecordTest extends DatabaseTest
 {
diff --git a/test/ActiveRecordWriteTest.php b/test/ActiveRecordWriteTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 use ActiveRecord\DateTime;
 
 class DirtyAuthor extends ActiveRecord\Model
diff --git a/test/AllTests.php b/test/AllTests.php
diff --git a/test/AllValidationsTest.php b/test/AllValidationsTest.php
diff --git a/test/CacheTest.php b/test/CacheTest.php
@@ -1,6 +1,4 @@
 <?php
-include 'helpers/config.php';
-
 use ActiveRecord\Cache;
 
 class CacheTest extends SnakeCase_PHPUnit_Framework_TestCase
diff --git a/test/CallbackTest.php b/test/CallbackTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 
 class CallBackTest extends DatabaseTest
 {
diff --git a/test/ColumnTest.php b/test/ColumnTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 
 use ActiveRecord\Column;
 use ActiveRecord\DateTime;
diff --git a/test/ConfigTest.php b/test/ConfigTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 
 use ActiveRecord\Config;
 use ActiveRecord\ConfigException;
diff --git a/test/ConnectionManagerTest.php b/test/ConnectionManagerTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 
 use ActiveRecord\Config;
 use ActiveRecord\ConnectionManager;
diff --git a/test/ConnectionTest.php b/test/ConnectionTest.php
@@ -1,7 +1,6 @@
 <?php
 use ActiveRecord\Connection;
 
-include 'helpers/config.php';
 
 // Only use this to test static methods in Connection that are not specific
 // to any database adapter.
diff --git a/test/DateFormatTest.php b/test/DateFormatTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 
 class DateFormatTest extends DatabaseTest
 {
diff --git a/test/DateTimeTest.php b/test/DateTimeTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 use ActiveRecord\DateTime as DateTime;
 use ActiveRecord\DatabaseException;
 
diff --git a/test/ExpressionsTest.php b/test/ExpressionsTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 require_once __DIR__ . '/../lib/Expressions.php';
 
 use ActiveRecord\Expressions;
diff --git a/test/HasManyThroughTest.php b/test/HasManyThroughTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 include 'helpers/foo.php';
 
 use foo\bar\biz\User;
diff --git a/test/InflectorTest.php b/test/InflectorTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 require_once __DIR__ . '/../lib/Inflector.php';
 
 class InflectorTest extends SnakeCase_PHPUnit_Framework_TestCase
diff --git a/test/ModelCallbackTest.php b/test/ModelCallbackTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 
 class ModelCallbackTest extends DatabaseTest
 {
diff --git a/test/MysqlAdapterTest.php b/test/MysqlAdapterTest.php
@@ -1,7 +1,6 @@
 <?php
 use ActiveRecord\Column;
 
-include 'helpers/config.php';
 require_once __DIR__ . '/../lib/adapters/MysqlAdapter.php';
 
 class MysqlAdapterTest extends AdapterTest
diff --git a/test/OciAdapterTest.php b/test/OciAdapterTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 require_once __DIR__ . '/../lib/adapters/OciAdapter.php';
 
 class OciAdapterTest extends AdapterTest
diff --git a/test/PgsqlAdapterTest.php b/test/PgsqlAdapterTest.php
@@ -1,7 +1,6 @@
 <?php
 use ActiveRecord\Column;
 
-include 'helpers/config.php';
 require_once __DIR__ . '/../lib/adapters/PgsqlAdapter.php';
 
 class PgsqlAdapterTest extends AdapterTest
diff --git a/test/RelationshipTest.php b/test/RelationshipTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 
 class NotModel {};
 
diff --git a/test/SQLBuilderTest.php b/test/SQLBuilderTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 
 use ActiveRecord\SQLBuilder;
 use ActiveRecord\Table;
diff --git a/test/SerializationTest.php b/test/SerializationTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 require_once __DIR__ . '/../lib/Serialization.php';
 
 use ActiveRecord\DateTime;
diff --git a/test/SqliteAdapterTest.php b/test/SqliteAdapterTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 require_once __DIR__ . '/../lib/adapters/SqliteAdapter.php';
 
 class SqliteAdapterTest extends AdapterTest
diff --git a/test/UtilsTest.php b/test/UtilsTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 
 use ActiveRecord as AR;
 
diff --git a/test/ValidatesFormatOfTest.php b/test/ValidatesFormatOfTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 
 class BookFormat extends ActiveRecord\Model
 {
diff --git a/test/ValidatesInclusionAndExclusionOfTest.php b/test/ValidatesInclusionAndExclusionOfTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 
 class BookExclusion extends ActiveRecord\Model
 {
diff --git a/test/ValidatesLengthOfTest.php b/test/ValidatesLengthOfTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 
 class BookLength extends ActiveRecord\Model
 {
diff --git a/test/ValidatesNumericalityOfTest.php b/test/ValidatesNumericalityOfTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 
 class BookNumericality extends ActiveRecord\Model
 {
diff --git a/test/ValidatesPresenceOfTest.php b/test/ValidatesPresenceOfTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 
 class BookPresence extends ActiveRecord\Model
 {
diff --git a/test/ValidationsTest.php b/test/ValidationsTest.php
@@ -1,5 +1,4 @@
 <?php
-include 'helpers/config.php';
 
 use ActiveRecord as AR;
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`<?php`
`2`		`-include 'helpers/config.php';`
`3`	`2`
`4`	`3`	`class ActiveRecordFindTest extends DatabaseTest`
`5`	`4`	`{`