add discovery functional tests when discovery is forced or disabled (#184)

Author: fbourigault

Tests/Functional/DiscoveredClientsTest.php

@@ -71,9 +71,32 @@ public function testDiscoveredAsyncClientWithProfilingEnabled()
         $this->assertEquals('auto_discovered_async', NSA::getProperty($plugins[0], 'client'));
     }
 
-    private function getContainer($debug)
+    public function testDisabledDiscovery()
     {
-        static::bootKernel(['debug' => $debug]);
+        $container = $this->getContainer(true, 'discovery_disabled');
+
+        $this->assertFalse($container->has('httplug.auto_discovery.auto_discovered_client'));
+        $this->assertFalse($container->has('httplug.auto_discovery.auto_discovered_async'));
+        $this->assertFalse($container->has('httplug.strategy'));
+    }
+
+    public function testForcedDiscovery()
+    {
+        $container = $this->getContainer(true, 'discovery_forced');
+
+        $this->assertFalse($container->has('httplug.auto_discovery.auto_discovered_client'));
+        $this->assertFalse($container->has('httplug.auto_discovery.auto_discovered_async'));
+        $this->assertTrue($container->has('httplug.strategy'));
+
+        $strategy = $container->get('httplug.strategy');
+
+        $this->assertEquals($container->get('httplug.client.acme'), NSA::getProperty($strategy, 'client'));
+        $this->assertEquals($container->get('httplug.client.acme'), NSA::getProperty($strategy, 'asyncClient'));
+    }
+
+    private function getContainer($debug, $environment = 'test')
+    {
+        static::bootKernel(['debug' => $debug, 'environment' => $environment]);
 
         return static::$kernel->getContainer();
     }

Tests/Resources/app/AppKernel.php

@@ -28,9 +28,10 @@ public function registerBundles()
      */
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $this->isDebug()
-            ? $loader->load(__DIR__.'/config/config_debug.yml')
-            : $loader->load(__DIR__.'/config/config.yml');
+        $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
+        if ($this->isDebug()) {
+            $loader->load(__DIR__.'/config/config_debug.yml');
+        }
     }
 
     /**

Tests/Resources/app/config/config_debug.yml

@@ -1,5 +1,2 @@
-imports:
-    - { resource: config.yml }
-
 framework:
     profiler: ~

Tests/Resources/app/config/config_discovery_disabled.yml

@@ -0,0 +1,7 @@
+imports:
+    - { resource: config_test.yml }
+
+httplug:
+    discovery:
+        client: ~
+        async_client: ~

Tests/Resources/app/config/config_discovery_forced.yml

@@ -0,0 +1,7 @@
+imports:
+    - { resource: config_test.yml }
+
+httplug:
+    discovery:
+        client: httplug.client.acme
+        async_client: httplug.client.acme