Split, refactor and fix some tests (#447)

* Separate integration tests and refactor the YamlRunnerTest class

* Fix some tests on elasticsearch 5.0

* Fix typo

* Revert pipeline, add local skipping list, support features and add endpoint mapping

Author: joelwurtz

.travis.yml

@@ -44,6 +44,7 @@ before_script:
 
 script:
   - vendor/bin/phpunit $PHPUNIT_FLAGS
+  - vendor/bin/phpunit -c phpunit-integration.xml $PHPUNIT_FLAGS
 
 after_script:
   - if [ $TRAVIS_PHP_VERSION = '7.0' ]; then php vendor/bin/coveralls; fi

composer.json

@@ -17,9 +17,11 @@
   "require-dev": {
     "phpunit/phpunit": "~4.7",
     "mockery/mockery": "0.9.4",
-    "symfony/yaml": "2.4.3 as 2.4.2",
+    "symfony/yaml": "^2.8",
+    "symfony/finder": "^2.8",
     "cpliakas/git-wrapper": "~1.0",
-    "sami/sami": "~3.2"
+    "sami/sami": "~3.2",
+    "doctrine/inflector": "^1.1"
   },
   "suggest": {
     "ext-curl": "*",
@@ -34,11 +36,5 @@
     "psr-4": {
       "Elasticsearch\\Tests\\":      "tests/Elasticsearch/Tests/"
     }
-  },
-  "repositories": [
-    {
-      "type": "vcs",
-      "url": "https://github.com/polyfractal/Yaml"
-    }
-  ]
+  }
 }

phpunit-integration.xml

@@ -0,0 +1,23 @@
+<phpunit
+        bootstrap="tests/bootstrap.php"
+        colors="true"
+        convertNoticesToExceptions="true"
+        convertWarningsToExceptions="true"
+        convertErrorsToExceptions="true"
+        syntaxCheck="true"
+        verbose="true"
+>
+    <php>
+        <env name="ES_TEST_HOST" value="http://localhost:9200"/>
+    </php>
+    <testsuites>
+        <testsuite>
+            <file>tests/Elasticsearch/Tests/YamlRunnerTest.php</file>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
+</phpunit>

phpunit.xml

@@ -13,6 +13,7 @@
     <testsuites>
         <testsuite>
             <directory>tests</directory>
+            <exclude>tests/Elasticsearch/Tests/YamlRunnerTest.php</exclude>
         </testsuite>
     </testsuites>
     <filter>

src/Elasticsearch/Endpoints/Cluster/AllocationExplain.php

@@ -47,7 +47,8 @@ public function getURI()
     public function getParamWhitelist()
     {
         return array(
-            'include_yes_decisions'
+            'include_yes_decisions',
+            'include_disk_info',
         );
     }
 

src/Elasticsearch/Endpoints/Cluster/Health.php

@@ -44,6 +44,7 @@ public function getParamWhitelist()
             'wait_for_nodes',
             'wait_for_relocating_shards',
             'wait_for_status',
+            'wait_for_events',
         );
     }
 

src/Elasticsearch/Endpoints/Indices/Create.php

@@ -62,7 +62,8 @@ public function getParamWhitelist()
         return array(
             'timeout',
             'master_timeout',
-            'update_all_types'
+            'update_all_types',
+            'wait_for_active_shards'
         );
     }
 

src/Elasticsearch/Endpoints/Indices/Rollover.php

@@ -94,7 +94,8 @@ public function getParamWhitelist()
     {
         return array(
             'timeout',
-            'master_timeout'
+            'master_timeout',
+            'wait_for_active_shards',
         );
     }
 

src/Elasticsearch/Endpoints/Ingest/Pipeline/Get.php

@@ -27,6 +27,7 @@ public function getURI()
                 'id is required for GetPipeline'
             );
         }
+
         $id = $this->id;
         $uri = "/_ingest/pipeline/$id";