Permalink
Browse files

Update .travis.yml

  • Loading branch information...
1 parent 20a9d3c commit 65c69763f07df1a9aac8c341e527745991929108 @k1LoW k1LoW committed Feb 28, 2013
Showing with 8 additions and 6 deletions.
  1. +6 −1 .travis.yml
  2. +2 −5 Test/Case/Datasource/MongodbSourceTest.php
View
@@ -6,13 +6,18 @@ php:
services:
- mongodb
+env:
+ - CAKEPHP=2.2.5
+ - CAKEPHP=2.2.7
+ - CAKEPHP=2.3.0
+
before_script:
- mongo mongo_test --eval 'db.addUser("travis", "test");'
- wget http://pecl.php.net/get/mongo-1.2.9.tgz
- tar xfz mongo-1.2.9.tgz
- sh -c "cd mongo-1.2.9 && phpize && ./configure && make && sudo make install"
- echo "extension=mongo.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
- - wget https://github.com/cakephp/cakephp/tarball/2.2.2 -O cake.tar.gz
+ - wget https://github.com/cakephp/cakephp/tarball/$CAKEPHP -O cake.tar.gz
- tar xf cake.tar.gz
- mv cakephp-cakephp-* ./cakephp
- mkdir -p ./cakephp/app/Plugin/Mongodb
@@ -117,7 +117,7 @@ class MongodbSourceTest extends CakeTestCase {
'host' => 'localhost',
'login' => '',
'password' => '',
- 'database' => 'mongodatabase',
+ 'database' => 'test_mongo',
'port' => 27017,
'prefix' => '',
'persistent' => true,
@@ -150,6 +150,7 @@ public function setUp() {
$this->mongodb = ConnectionManager::getDataSource($this->Post->useDbConfig);
$this->mongodb->connect();
+
}
/**
@@ -888,12 +889,8 @@ public function testUpdateWithoutMongoSchemaProperty() {
$saveResult = $this->MongoArticle->save($saveData);
$postId = $this->MongoArticle->id;
-<<<<<<< HEAD
- $MongoArticle->create();
-=======
//using $set operator
$this->MongoArticle->create();
->>>>>>> radig/cake2.2
$updatedata = array(
'id' => $postId,
'title' => 'test3',

0 comments on commit 65c6976

Please sign in to comment.