Merge pull request #652 from lyrixx/test-env

ruflin · ruflin · commit ee8b33fa0172 · 2014-07-12T23:07:36.000+02:00
[Test] Be able to configure ES host/port via ENV var in test env
diff --git a/changes.txt b/changes.txt
@@ -1,5 +1,8 @@
 CHANGES
 
+2014-07-12
+ - Be able to configure ES host/port via ENV var in test env
+
 2014-07-07
  - Fix FunstionScore Query random_score without seed bug. #647
 
diff --git a/test/lib/Elastica/Test/Base.php b/test/lib/Elastica/Test/Base.php
@@ -8,7 +8,10 @@ class Base extends \PHPUnit_Framework_TestCase
 {
     protected function _getClient()
     {
-        return new Client();
+        return new Client(array(
+            'host' => getenv('ES_HOST') ?: 'localhost',
+            'port' => getenv('ES_PORT') ?: 9200,
+        ));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,10 @@ class Base extends \PHPUnit_Framework_TestCase`
`8`	`8`	`{`
`9`	`9`	`protected function _getClient()`
`10`	`10`	`{`
`11`		`- return new Client();`
	`11`	`+ return new Client(array(`
	`12`	`+ 'host' => getenv('ES_HOST') ?: 'localhost',`
	`13`	`+ 'port' => getenv('ES_PORT') ?: 9200,`
	`14`	`+ ));`
`12`	`15`	`}`
`13`	`16`
`14`	`17`	`/**`