fix tests

Author: tonydspaniard

src/GeoCoder.php

@@ -40,6 +40,7 @@ public function init()
 
     /**
      * Sets the service to use for geocoding
+     *
      * @param BaseService $service
      */
     public function setService(BaseService $service)
@@ -66,8 +67,11 @@ public function getPluginName()
 
     /**
      * Registers plugin asset bundle
+     *
      * @param \yii\web\View $view
-     * @return mixed
+     *
+     * @return $this
+     * @codeCoverageIgnore
      */
     public function registerAssetBundle($view)
     {
@@ -83,9 +87,12 @@ public function registerAssetBundle($view)
     public function encode()
     {
 
-        $this->clientOptions = ArrayHelper::merge([
-            'showMarker' => true
-        ], $this->clientOptions);
+        $this->clientOptions = ArrayHelper::merge(
+            [
+                'showMarker' => true
+            ],
+            $this->clientOptions
+        );
 
         $this->clientOptions['geocoder'] = $this->getService()->getJs();
 

src/ServiceBing.php

@@ -36,6 +36,7 @@ public function init()
 
     /**
      * @inheritdoc
+     * @codeCoverageIgnore
      */
     public function registerAssetBundle($view)
     {

src/ServiceMapQuest.php

@@ -36,6 +36,7 @@ public function init()
 
     /**
      * @inheritdoc
+     * @codeCoverageIgnore
      */
     public function registerAssetBundle($view)
     {

src/ServiceNominatim.php

@@ -35,6 +35,7 @@ class ServiceNominatim extends BaseService
 
     /**
      * @inheritdoc
+     * @codeCoverageIgnore
      */
     public function registerAssetBundle($view)
     {

tests/functional/GeoCoderTest.php

@@ -10,38 +10,44 @@
 
 class GeoCoderTest extends TestCase
 {
-   public function testNominatimEncode() {
+   public function testNominatim() {
        $nominatim = new ServiceNominatim();
        $geocoder = new GeoCoder([
+           'name' => 'testName',
            'service' => $nominatim
        ]);
        $this->assertEquals($nominatim, $geocoder->getService());
        $content = $geocoder->encode();
-       file_put_contents(__DIR__ . '/data/service.nominatim.bin', $content);
+
        $this->assertEquals('plugin:geocoder', $geocoder->getPluginName());
        $this->assertEquals(file_get_contents(__DIR__ . '/data/service.nominatim.bin'), $content);
    }
 
-    public function testBingEncode() {
+    public function testBing() {
         $bing = new ServiceBing(['key' => 'bogus-key']);
         $geocoder = new GeoCoder([
             'service' => $bing
         ]);
         $this->assertEquals($bing, $geocoder->getService());
         $content = $geocoder->encode();
-        file_put_contents(__DIR__ . '/data/service.bing.bin', $content);
+
         $this->assertEquals(file_get_contents(__DIR__ . '/data/service.bing.bin'), $content);
+        $this->setExpectedException('yii\base\InvalidConfigException');
+        $quest = new ServiceBing();
     }
 
-    public function testMapQuestEncode() {
+    public function testMapQuest() {
         $quest = new ServiceMapQuest(['key' => 'bogus-key']);
         $geocoder = new GeoCoder([
             'service' => $quest
         ]);
         $this->assertEquals($quest, $geocoder->getService());
         $content = $geocoder->encode();
-        file_put_contents(__DIR__ . '/data/service.mapquest.bin', $content);
+
         $this->assertEquals(file_get_contents(__DIR__ . '/data/service.mapquest.bin'), $content);
+
+        $this->setExpectedException('yii\base\InvalidConfigException');
+        $quest = new ServiceMapQuest();
     }
 
 }

tests/functional/data/service.nominatim.bin

@@ -1 +1 @@
-new L.Control.Geocoder({"showMarker":true,"geocoder":L.Control.Geocoder.nominatim({"serviceUrl":"http://nominatim.openstreetmap.org/","geocodingQueryParams":"{}","reverseQueryParams":"{}"})}).addTo()
+var testName = new L.Control.Geocoder({"showMarker":true,"geocoder":L.Control.Geocoder.nominatim({"serviceUrl":"http://nominatim.openstreetmap.org/","geocodingQueryParams":"{}","reverseQueryParams":"{}"})}).addTo();