Improve (#6)

Author: yoanm

features/bootstrap/AbstractContext.php

@@ -0,0 +1,21 @@
+<?php
+namespace Tests\Functional\BehatContext;
+
+use Behat\Behat\Context\Context;
+
+class AbstractContext implements Context
+{
+    protected function jsonDecode($encodedData)
+    {
+        $decoded = json_decode($encodedData, true);
+
+        if (JSON_ERROR_NONE != json_last_error()) {
+            throw new \Exception(
+                json_last_error_msg(),
+                json_last_error()
+            );
+        }
+
+        return $decoded;
+    }
+}

features/bootstrap/DemoAppContext.php

@@ -15,7 +15,7 @@
 /**
  * Defines application features from the specific context.
  */
-class DemoAppContext implements Context
+class DemoAppContext extends AbstractContext
 {
     /** @var Response|null */
     private $lastResponse;
@@ -65,8 +65,8 @@ public function thenIShouldHaveAResponseFromDemoAppWithFollowingContent($httpCod
         Assert::assertInstanceOf(Response::class, $this->lastResponse);
         // Decode payload to get ride of indentation, spacing, etc
         Assert::assertEquals(
-            json_decode($payload->getRaw(), true),
-            json_decode($this->lastResponse->getContent(), true)
+            $this->jsonDecode($payload->getRaw()),
+            $this->jsonDecode($this->lastResponse->getContent())
         );
         Assert::assertSame((int) $httpCode, $this->lastResponse->getStatusCode());
     }

features/demo_app/config_with_method_doc_created_listener/config.yaml

@@ -1,7 +1,8 @@
 framework:
-    secret: '%env(APP_SECRET)%'
+  secret: '%env(APP_SECRET)%'
 
-json_rpc_http_server: ~
+json_rpc_http_server:
+  endpoint: '/my-custom-endpoint'
 
 json_rpc_http_server_doc:
-    endpoint: '/my-custom-doc-endpoint'
+  endpoint: '/my-custom-doc-endpoint'

features/demo_app/config_with_server_doc_created_listener/config.yaml

@@ -1,7 +1,8 @@
 framework:
-    secret: '%env(APP_SECRET)%'
+  secret: '%env(APP_SECRET)%'
 
-json_rpc_http_server: ~
+json_rpc_http_server:
+  endpoint: '/my-custom-endpoint'
 
 json_rpc_http_server_doc:
-    endpoint: '/my-custom-doc-endpoint'
+  endpoint: '/my-custom-doc-endpoint'

features/demo_app/config_with_server_doc_created_listener/services.yaml

@@ -15,7 +15,7 @@ services:
   json_rpc_http_server.alias.method_resolver: '@resolver'
 
   # MethodDocCreated Listener
-  method_doc_created.listener:
+  server_doc_created.listener:
     class: DemoApp\Listener\ServerDocCreatedListener
     tags:
       - name: 'kernel.event_listener'

features/demo_app/default_config/config.yaml

@@ -1,7 +1,8 @@
 framework:
-    secret: '%env(APP_SECRET)%'
+  secret: '%env(APP_SECRET)%'
 
-json_rpc_http_server: ~
+json_rpc_http_server:
+  endpoint: '/my-custom-endpoint'
 
 json_rpc_http_server_doc:
-    endpoint: '/my-custom-doc-endpoint'
+  endpoint: '/my-custom-doc-endpoint'

tests/Common/DependencyInjection/AbstractTestClass.php

@@ -12,7 +12,6 @@
 abstract class AbstractTestClass extends AbstractExtensionTestCase
 {
     const EXPECTED_DOC_PROVIDER_TAG = 'json_rpc_server_doc.doc_provider';
-    const EXPECTED_EXTENSION_IDENTIFIER = 'json_rpc_http_server_doc';
     const EXPECTED_NORMALIZED_DOC_FINDER_SERVICE_ID = 'json_rpc_http_server_doc.finder.normalized_doc';
 
     // Public services

tests/Functional/DependencyInjection/ConfigFilesTest.php

@@ -21,16 +21,6 @@
  */
 class ConfigFilesTest extends AbstractTestClass
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected function getContainerExtensions()
-    {
-        return [
-            new JsonRpcHttpServerDocExtension()
-        ];
-    }
-
     /**
      * @dataProvider provideSDKInfraServiceIdAndClass
      * @dataProvider provideBundlePublicServiceIdAndClass

tests/Functional/DependencyInjection/JsonRpcHttpServerDocExtensionTest.php

@@ -12,17 +12,6 @@
  */
 class JsonRpcHttpServerDocExtensionTest extends AbstractTestClass
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected function getContainerExtensions()
-    {
-        return [
-            new JsonRpcHttpServerDocExtension()
-        ];
-    }
-
-
     public function testShouldBeLoadable()
     {
         $this->load();